rpc: Use IsValidNumArgs over hardcoded size checks
This commit is contained in:
parent
c033c4b5ce
commit
fa965e03c7
1 changed files with 11 additions and 8 deletions
|
@ -1033,9 +1033,7 @@ UniValue signrawtransaction(const JSONRPCRequest& request)
|
||||||
|
|
||||||
static UniValue sendrawtransaction(const JSONRPCRequest& request)
|
static UniValue sendrawtransaction(const JSONRPCRequest& request)
|
||||||
{
|
{
|
||||||
if (request.fHelp || request.params.size() < 1 || request.params.size() > 2)
|
const RPCHelpMan help{"sendrawtransaction",
|
||||||
throw std::runtime_error(
|
|
||||||
RPCHelpMan{"sendrawtransaction",
|
|
||||||
"\nSubmits raw transaction (serialized, hex-encoded) to local node and network.\n"
|
"\nSubmits raw transaction (serialized, hex-encoded) to local node and network.\n"
|
||||||
"\nAlso see createrawtransaction and signrawtransactionwithkey calls.\n",
|
"\nAlso see createrawtransaction and signrawtransactionwithkey calls.\n",
|
||||||
{
|
{
|
||||||
|
@ -1055,7 +1053,11 @@ static UniValue sendrawtransaction(const JSONRPCRequest& request)
|
||||||
"\nAs a JSON-RPC call\n"
|
"\nAs a JSON-RPC call\n"
|
||||||
+ HelpExampleRpc("sendrawtransaction", "\"signedhex\"")
|
+ HelpExampleRpc("sendrawtransaction", "\"signedhex\"")
|
||||||
},
|
},
|
||||||
}.ToString());
|
};
|
||||||
|
|
||||||
|
if (request.fHelp || !help.IsValidNumArgs(request.params.size())) {
|
||||||
|
throw std::runtime_error(help.ToString());
|
||||||
|
}
|
||||||
|
|
||||||
RPCTypeCheck(request.params, {
|
RPCTypeCheck(request.params, {
|
||||||
UniValue::VSTR,
|
UniValue::VSTR,
|
||||||
|
@ -1095,9 +1097,7 @@ static UniValue sendrawtransaction(const JSONRPCRequest& request)
|
||||||
|
|
||||||
static UniValue testmempoolaccept(const JSONRPCRequest& request)
|
static UniValue testmempoolaccept(const JSONRPCRequest& request)
|
||||||
{
|
{
|
||||||
if (request.fHelp || request.params.size() < 1 || request.params.size() > 2) {
|
const RPCHelpMan help{"testmempoolaccept",
|
||||||
throw std::runtime_error(
|
|
||||||
RPCHelpMan{"testmempoolaccept",
|
|
||||||
"\nReturns result of mempool acceptance tests indicating if raw transaction (serialized, hex-encoded) would be accepted by mempool.\n"
|
"\nReturns result of mempool acceptance tests indicating if raw transaction (serialized, hex-encoded) would be accepted by mempool.\n"
|
||||||
"\nThis checks if the transaction violates the consensus or policy rules.\n"
|
"\nThis checks if the transaction violates the consensus or policy rules.\n"
|
||||||
"\nSee sendrawtransaction call.\n",
|
"\nSee sendrawtransaction call.\n",
|
||||||
|
@ -1130,7 +1130,10 @@ static UniValue testmempoolaccept(const JSONRPCRequest& request)
|
||||||
"\nAs a JSON-RPC call\n"
|
"\nAs a JSON-RPC call\n"
|
||||||
+ HelpExampleRpc("testmempoolaccept", "[\"signedhex\"]")
|
+ HelpExampleRpc("testmempoolaccept", "[\"signedhex\"]")
|
||||||
},
|
},
|
||||||
}.ToString());
|
};
|
||||||
|
|
||||||
|
if (request.fHelp || !help.IsValidNumArgs(request.params.size())) {
|
||||||
|
throw std::runtime_error(help.ToString());
|
||||||
}
|
}
|
||||||
|
|
||||||
RPCTypeCheck(request.params, {
|
RPCTypeCheck(request.params, {
|
||||||
|
|
Loading…
Reference in a new issue