Remove redundant check for unknown commands in masternode RPC (#2279)

This commit is contained in:
Alexander Block 2018-09-10 12:23:42 +02:00 committed by UdjinM6
parent ad6c2893c0
commit c3d6b06518

View File

@ -878,16 +878,9 @@ UniValue masternode(const JSONRPCRequest& request)
throw JSONRPCError(RPC_INVALID_PARAMETER, "DEPRECATED, please use start-all instead"); throw JSONRPCError(RPC_INVALID_PARAMETER, "DEPRECATED, please use start-all instead");
#endif // ENABLE_WALLET #endif // ENABLE_WALLET
if ((request.fHelp && strCommand.empty()) || if (request.fHelp && strCommand.empty()) {
( masternode_help();
#ifdef ENABLE_WALLET }
strCommand != "start-alias" && strCommand != "start-all" && strCommand != "start-missing" &&
strCommand != "start-disabled" && strCommand != "outputs" &&
#endif // ENABLE_WALLET
strCommand != "list" && strCommand != "list-conf" && strCommand != "count" &&
strCommand != "debug" && strCommand != "current" && strCommand != "winner" && strCommand != "winners" && strCommand != "genkey" &&
strCommand != "connect" && strCommand != "status" && strCommand != "check"))
masternode_help();
if (strCommand == "list") { if (strCommand == "list") {
return masternode_list(request); return masternode_list(request);
@ -925,9 +918,10 @@ UniValue masternode(const JSONRPCRequest& request)
return masternode_winners(request); return masternode_winners(request);
} else if (strCommand == "check") { } else if (strCommand == "check") {
return masternode_check(request); return masternode_check(request);
} else {
masternode_help();
return UniValue::VNULL; // avoid compiler warnings
} }
throw std::runtime_error("invalid command: " + strCommand);
} }
UniValue masternodelist(const JSONRPCRequest& request) UniValue masternodelist(const JSONRPCRequest& request)