diff options
author | MarcoFalke <falke.marco@gmail.com> | 2019-02-25 14:54:22 -0500 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2019-02-25 23:47:36 -0500 |
commit | 9999879f56c88ca2837f5d18e6688917ba96e9e2 (patch) | |
tree | f2284c5ba4f9e9ece6e000ae18d28d187fe6f38f /src | |
parent | fa9ff8fe212ae40a1ef4980455bf916bc044fee2 (diff) |
refactor: Use RPCHelpMan::IsValidNumArgs in getrawtransaction
Diffstat (limited to 'src')
-rw-r--r-- | src/rpc/rawtransaction.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp index f5543f63f6..d19afaa8a1 100644 --- a/src/rpc/rawtransaction.cpp +++ b/src/rpc/rawtransaction.cpp @@ -6,8 +6,8 @@ #include <chain.h> #include <coins.h> #include <compat/byteswap.h> -#include <consensus/validation.h> #include <consensus/tx_verify.h> +#include <consensus/validation.h> #include <core_io.h> #include <index/txindex.h> #include <init.h> @@ -67,9 +67,7 @@ static void TxToJSON(const CTransaction& tx, const uint256 hashBlock, UniValue& static UniValue getrawtransaction(const JSONRPCRequest& request) { - if (request.fHelp || request.params.size() < 1 || request.params.size() > 3) - throw std::runtime_error( - RPCHelpMan{ + const RPCHelpMan help{ "getrawtransaction", "\nReturn the raw transaction data.\n" @@ -147,7 +145,11 @@ static UniValue getrawtransaction(const JSONRPCRequest& request) + HelpExampleCli("getrawtransaction", "\"mytxid\" false \"myblockhash\"") + HelpExampleCli("getrawtransaction", "\"mytxid\" true \"myblockhash\"") }, - }.ToString()); + }; + + if (request.fHelp || !help.IsValidNumArgs(request.params.size())) { + throw std::runtime_error(help.ToString()); + } bool in_active_chain = true; uint256 hash = ParseHashV(request.params[0], "parameter 1"); |