Rename GetHelpString to GetRpcArg

The new name should hopefully reflect the purpose of the function
better.

Signed-off-by: Dzutte <dzutte.tomsk@gmail.com>
This commit is contained in:
Dzutte 2021-11-05 11:48:39 -07:00
parent 85537e4532
commit ed9cf45a30

View File

@ -35,7 +35,7 @@ extern UniValue sendrawtransaction(const JSONRPCRequest& request);
class CWallet; class CWallet;
#endif//ENABLE_WALLET #endif//ENABLE_WALLET
static RPCArg GetHelpString(const std::string& strParamName) static RPCArg GetRpcArg(const std::string& strParamName)
{ {
static const std::map<std::string, RPCArg> mapParamHelp = { static const std::map<std::string, RPCArg> mapParamHelp = {
{"collateralAddress", {"collateralAddress",
@ -327,15 +327,15 @@ static void protx_register_fund_help(CWallet* const pwallet)
"is fully deployed.\n" "is fully deployed.\n"
+ HelpRequiringPassphrase(pwallet) + "\n", + HelpRequiringPassphrase(pwallet) + "\n",
{ {
GetHelpString("collateralAddress"), GetRpcArg("collateralAddress"),
GetHelpString("ipAndPort"), GetRpcArg("ipAndPort"),
GetHelpString("ownerAddress"), GetRpcArg("ownerAddress"),
GetHelpString("operatorPubKey_register"), GetRpcArg("operatorPubKey_register"),
GetHelpString("votingAddress_register"), GetRpcArg("votingAddress_register"),
GetHelpString("operatorReward"), GetRpcArg("operatorReward"),
GetHelpString("payoutAddress_register"), GetRpcArg("payoutAddress_register"),
GetHelpString("fundAddress"), GetRpcArg("fundAddress"),
GetHelpString("submit"), GetRpcArg("submit"),
}, },
RPCResults{ RPCResults{
{"if \"submit\" is not set or set to true", {"if \"submit\" is not set or set to true",
@ -358,16 +358,16 @@ static void protx_register_help(CWallet* const pwallet)
"transaction output spendable by this wallet. It must also not be used by any other masternode.\n" "transaction output spendable by this wallet. It must also not be used by any other masternode.\n"
+ HelpRequiringPassphrase(pwallet) + "\n", + HelpRequiringPassphrase(pwallet) + "\n",
{ {
GetHelpString("collateralHash"), GetRpcArg("collateralHash"),
GetHelpString("collateralIndex"), GetRpcArg("collateralIndex"),
GetHelpString("ipAndPort"), GetRpcArg("ipAndPort"),
GetHelpString("ownerAddress"), GetRpcArg("ownerAddress"),
GetHelpString("operatorPubKey_register"), GetRpcArg("operatorPubKey_register"),
GetHelpString("votingAddress_register"), GetRpcArg("votingAddress_register"),
GetHelpString("operatorReward"), GetRpcArg("operatorReward"),
GetHelpString("payoutAddress_register"), GetRpcArg("payoutAddress_register"),
GetHelpString("feeSourceAddress"), GetRpcArg("feeSourceAddress"),
GetHelpString("submit"), GetRpcArg("submit"),
}, },
RPCResults{ RPCResults{
{"if \"submit\" is not set or set to true", {"if \"submit\" is not set or set to true",
@ -389,15 +389,15 @@ static void protx_register_prepare_help()
"with the private key that corresponds to collateralAddress to prove collateral ownership.\n" "with the private key that corresponds to collateralAddress to prove collateral ownership.\n"
"The prepared transaction will also contain inputs and outputs to cover fees.\n", "The prepared transaction will also contain inputs and outputs to cover fees.\n",
{ {
GetHelpString("collateralHash"), GetRpcArg("collateralHash"),
GetHelpString("collateralIndex"), GetRpcArg("collateralIndex"),
GetHelpString("ipAndPort"), GetRpcArg("ipAndPort"),
GetHelpString("ownerAddress"), GetRpcArg("ownerAddress"),
GetHelpString("operatorPubKey_register"), GetRpcArg("operatorPubKey_register"),
GetHelpString("votingAddress_register"), GetRpcArg("votingAddress_register"),
GetHelpString("operatorReward"), GetRpcArg("operatorReward"),
GetHelpString("payoutAddress_register"), GetRpcArg("payoutAddress_register"),
GetHelpString("feeSourceAddress"), GetRpcArg("feeSourceAddress"),
}, },
RPCResult{ RPCResult{
"{ (json object)\n" "{ (json object)\n"
@ -640,11 +640,11 @@ static void protx_update_service_help(CWallet* const pwallet)
"If this is done for a masternode that got PoSe-banned, the ProUpServTx will also revive this masternode.\n" "If this is done for a masternode that got PoSe-banned, the ProUpServTx will also revive this masternode.\n"
+ HelpRequiringPassphrase(pwallet) + "\n", + HelpRequiringPassphrase(pwallet) + "\n",
{ {
GetHelpString("proTxHash"), GetRpcArg("proTxHash"),
GetHelpString("ipAndPort"), GetRpcArg("ipAndPort"),
GetHelpString("operatorKey"), GetRpcArg("operatorKey"),
GetHelpString("operatorPayoutAddress"), GetRpcArg("operatorPayoutAddress"),
GetHelpString("feeSourceAddress"), GetRpcArg("feeSourceAddress"),
}, },
RPCResult{ RPCResult{
"\"txid\" (string) The transaction id.\n" "\"txid\" (string) The transaction id.\n"
@ -739,11 +739,11 @@ static void protx_update_registrar_help(CWallet* const pwallet)
"The owner key of the masternode must be known to your wallet.\n" "The owner key of the masternode must be known to your wallet.\n"
+ HelpRequiringPassphrase(pwallet) + "\n", + HelpRequiringPassphrase(pwallet) + "\n",
{ {
GetHelpString("proTxHash"), GetRpcArg("proTxHash"),
GetHelpString("operatorPubKey_update"), GetRpcArg("operatorPubKey_update"),
GetHelpString("votingAddress_update"), GetRpcArg("votingAddress_update"),
GetHelpString("payoutAddress_update"), GetRpcArg("payoutAddress_update"),
GetHelpString("feeSourceAddress"), GetRpcArg("feeSourceAddress"),
}, },
RPCResult{ RPCResult{
"\"txid\" (string) The transaction id.\n" "\"txid\" (string) The transaction id.\n"
@ -832,10 +832,10 @@ static void protx_revoke_help(CWallet* const pwallet)
"to the masternode owner.\n" "to the masternode owner.\n"
+ HelpRequiringPassphrase(pwallet) + "\n", + HelpRequiringPassphrase(pwallet) + "\n",
{ {
GetHelpString("proTxHash"), GetRpcArg("proTxHash"),
GetHelpString("operatorKey"), GetRpcArg("operatorKey"),
GetHelpString("reason"), GetRpcArg("reason"),
GetHelpString("feeSourceAddress"), GetRpcArg("feeSourceAddress"),
}, },
RPCResult{ RPCResult{
"\"txid\" (string) The transaction id.\n" "\"txid\" (string) The transaction id.\n"
@ -1093,7 +1093,7 @@ static void protx_info_help()
RPCHelpMan{"protx info", RPCHelpMan{"protx info",
"\nReturns detailed information about a deterministic masternode.\n", "\nReturns detailed information about a deterministic masternode.\n",
{ {
GetHelpString("proTxHash"), GetRpcArg("proTxHash"),
}, },
RPCResult{ RPCResult{
"{ (json object) Details about a specific deterministic masternode\n" "{ (json object) Details about a specific deterministic masternode\n"