RPC client: Simplify command line string-to-JSON-value conversion code
By default, all command line parameters are converted into JSON string values. There is no need to manually specify the incoming type. A binary decision "parse as string or JSON?" is all that's necessary. Convert to a simple class, initialized at runtime startup, which offers a quick lookup to answer "parse as JSON?" conversion question. Future parameter conversions need only to indicate the method name and zero-based index of the parameter needing JSON parsing.
This commit is contained in:
Jeff Garzik
parent
236ae8665e
commit
e35b37b1b8
1 changed files with 102 additions and 77 deletions
|
|
@ -3,6 +3,7 @@
|
||||||
// Distributed under the MIT/X11 software license, see the accompanying
|
// Distributed under the MIT/X11 software license, see the accompanying
|
||||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||||
|
|
||||||
|
#include <set>
|
||||||
#include "rpcclient.h"
|
#include "rpcclient.h"
|
||||||
|
|
||||||
#include "rpcprotocol.h"
|
#include "rpcprotocol.h"
|
||||||
|
|
@ -15,94 +16,118 @@
|
||||||
using namespace std;
|
using namespace std;
|
||||||
using namespace json_spirit;
|
using namespace json_spirit;
|
||||||
|
|
||||||
template<typename T>
|
class CRPCConvertParam
|
||||||
void ConvertTo(Value& value, bool fAllowNull=false)
|
|
||||||
{
|
{
|
||||||
if (fAllowNull && value.type() == null_type)
|
public:
|
||||||
return;
|
std::string methodName; // method whose params want conversion
|
||||||
if (value.type() == str_type)
|
int paramIdx; // 0-based idx of param to convert
|
||||||
|
};
|
||||||
|
|
||||||
|
static const CRPCConvertParam vRPCConvertParams[] =
|
||||||
{
|
{
|
||||||
// reinterpret string as unquoted json value
|
{ "stop", 0 },
|
||||||
Value value2;
|
{ "getaddednodeinfo", 0 },
|
||||||
string strJSON = value.get_str();
|
{ "setgenerate", 0 },
|
||||||
if (!read_string(strJSON, value2))
|
{ "setgenerate", 1 },
|
||||||
throw runtime_error(string("Error parsing JSON:")+strJSON);
|
{ "getnetworkhashps", 0 },
|
||||||
ConvertTo<T>(value2, fAllowNull);
|
{ "getnetworkhashps", 1 },
|
||||||
value = value2;
|
{ "sendtoaddress", 1 },
|
||||||
|
{ "settxfee", 0 },
|
||||||
|
{ "getreceivedbyaddress", 1 },
|
||||||
|
{ "getreceivedbyaccount", 1 },
|
||||||
|
{ "listreceivedbyaddress", 0 },
|
||||||
|
{ "listreceivedbyaddress", 1 },
|
||||||
|
{ "listreceivedbyaccount", 0 },
|
||||||
|
{ "listreceivedbyaccount", 1 },
|
||||||
|
{ "getbalance", 1 },
|
||||||
|
{ "getblockhash", 0 },
|
||||||
|
{ "move", 2 },
|
||||||
|
{ "move", 3 },
|
||||||
|
{ "sendfrom", 2 },
|
||||||
|
{ "sendfrom", 3 },
|
||||||
|
{ "listtransactions", 1 },
|
||||||
|
{ "listtransactions", 2 },
|
||||||
|
{ "listaccounts", 0 },
|
||||||
|
{ "walletpassphrase", 1 },
|
||||||
|
{ "getblocktemplate", 0 },
|
||||||
|
{ "listsinceblock", 1 },
|
||||||
|
{ "sendmany", 1 },
|
||||||
|
{ "sendmany", 2 },
|
||||||
|
{ "addmultisigaddress", 0 },
|
||||||
|
{ "addmultisigaddress", 1 },
|
||||||
|
{ "createmultisig", 0 },
|
||||||
|
{ "createmultisig", 1 },
|
||||||
|
{ "listunspent", 0 },
|
||||||
|
{ "listunspent", 1 },
|
||||||
|
{ "listunspent", 2 },
|
||||||
|
{ "getblock", 1 },
|
||||||
|
{ "getrawtransaction", 1 },
|
||||||
|
{ "createrawtransaction", 0 },
|
||||||
|
{ "createrawtransaction", 1 },
|
||||||
|
{ "signrawtransaction", 1 },
|
||||||
|
{ "signrawtransaction", 2 },
|
||||||
|
{ "sendrawtransaction", 1 },
|
||||||
|
{ "gettxout", 1 },
|
||||||
|
{ "gettxout", 2 },
|
||||||
|
{ "lockunspent", 0 },
|
||||||
|
{ "lockunspent", 1 },
|
||||||
|
{ "importprivkey", 2 },
|
||||||
|
{ "verifychain", 0 },
|
||||||
|
{ "verifychain", 1 },
|
||||||
|
{ "keypoolrefill", 0 },
|
||||||
|
{ "getrawmempool", 0 },
|
||||||
|
{ "estimatefee", 0 },
|
||||||
|
{ "estimatepriority", 0 },
|
||||||
|
};
|
||||||
|
|
||||||
|
class CRPCConvertTable
|
||||||
|
{
|
||||||
|
private:
|
||||||
|
std::set<std::pair<std::string, int> > members;
|
||||||
|
|
||||||
|
public:
|
||||||
|
CRPCConvertTable();
|
||||||
|
|
||||||
|
bool convert(const std::string& method, int idx) {
|
||||||
|
return (members.count(std::make_pair(method, idx)) > 0);
|
||||||
}
|
}
|
||||||
else
|
};
|
||||||
|
|
||||||
|
CRPCConvertTable::CRPCConvertTable()
|
||||||
{
|
{
|
||||||
value = value.get_value<T>();
|
const unsigned int n_elem =
|
||||||
|
(sizeof(vRPCConvertParams) / sizeof(vRPCConvertParams[0]));
|
||||||
|
|
||||||
|
for (unsigned int i = 0; i < n_elem; i++) {
|
||||||
|
members.insert(std::make_pair(vRPCConvertParams[i].methodName,
|
||||||
|
vRPCConvertParams[i].paramIdx));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static CRPCConvertTable rpcCvtTable;
|
||||||
|
|
||||||
// Convert strings to command-specific RPC representation
|
// Convert strings to command-specific RPC representation
|
||||||
Array RPCConvertValues(const std::string &strMethod, const std::vector<std::string> &strParams)
|
Array RPCConvertValues(const std::string &strMethod, const std::vector<std::string> &strParams)
|
||||||
{
|
{
|
||||||
Array params;
|
Array params;
|
||||||
BOOST_FOREACH(const std::string ¶m, strParams)
|
|
||||||
params.push_back(param);
|
|
||||||
|
|
||||||
int n = params.size();
|
for (unsigned int idx = 0; idx < strParams.size(); idx++) {
|
||||||
|
const std::string& strVal = strParams[idx];
|
||||||
|
|
||||||
//
|
// insert string value directly
|
||||||
// Special case non-string parameter types
|
if (!rpcCvtTable.convert(strMethod, idx)) {
|
||||||
//
|
params.push_back(strVal);
|
||||||
if (strMethod == "stop" && n > 0) ConvertTo<bool>(params[0]);
|
}
|
||||||
if (strMethod == "getaddednodeinfo" && n > 0) ConvertTo<bool>(params[0]);
|
|
||||||
if (strMethod == "setgenerate" && n > 0) ConvertTo<bool>(params[0]);
|
// parse string as JSON, insert bool/number/object/etc. value
|
||||||
if (strMethod == "setgenerate" && n > 1) ConvertTo<int64_t>(params[1]);
|
else {
|
||||||
if (strMethod == "getnetworkhashps" && n > 0) ConvertTo<int64_t>(params[0]);
|
Value jVal;
|
||||||
if (strMethod == "getnetworkhashps" && n > 1) ConvertTo<int64_t>(params[1]);
|
if (!read_string(strVal, jVal))
|
||||||
if (strMethod == "sendtoaddress" && n > 1) ConvertTo<double>(params[1]);
|
throw runtime_error(string("Error parsing JSON:")+strVal);
|
||||||
if (strMethod == "settxfee" && n > 0) ConvertTo<double>(params[0]);
|
params.push_back(jVal);
|
||||||
if (strMethod == "getreceivedbyaddress" && n > 1) ConvertTo<int64_t>(params[1]);
|
}
|
||||||
if (strMethod == "getreceivedbyaccount" && n > 1) ConvertTo<int64_t>(params[1]);
|
|
||||||
if (strMethod == "listreceivedbyaddress" && n > 0) ConvertTo<int64_t>(params[0]);
|
}
|
||||||
if (strMethod == "listreceivedbyaddress" && n > 1) ConvertTo<bool>(params[1]);
|
|
||||||
if (strMethod == "listreceivedbyaccount" && n > 0) ConvertTo<int64_t>(params[0]);
|
|
||||||
if (strMethod == "listreceivedbyaccount" && n > 1) ConvertTo<bool>(params[1]);
|
|
||||||
if (strMethod == "getbalance" && n > 1) ConvertTo<int64_t>(params[1]);
|
|
||||||
if (strMethod == "getblockhash" && n > 0) ConvertTo<int64_t>(params[0]);
|
|
||||||
if (strMethod == "move" && n > 2) ConvertTo<double>(params[2]);
|
|
||||||
if (strMethod == "move" && n > 3) ConvertTo<int64_t>(params[3]);
|
|
||||||
if (strMethod == "sendfrom" && n > 2) ConvertTo<double>(params[2]);
|
|
||||||
if (strMethod == "sendfrom" && n > 3) ConvertTo<int64_t>(params[3]);
|
|
||||||
if (strMethod == "listtransactions" && n > 1) ConvertTo<int64_t>(params[1]);
|
|
||||||
if (strMethod == "listtransactions" && n > 2) ConvertTo<int64_t>(params[2]);
|
|
||||||
if (strMethod == "listaccounts" && n > 0) ConvertTo<int64_t>(params[0]);
|
|
||||||
if (strMethod == "walletpassphrase" && n > 1) ConvertTo<int64_t>(params[1]);
|
|
||||||
if (strMethod == "prioritisetransaction" && n > 1) ConvertTo<double>(params[1]);
|
|
||||||
if (strMethod == "prioritisetransaction" && n > 2) ConvertTo<int64_t>(params[2]);
|
|
||||||
if (strMethod == "getblocktemplate" && n > 0) ConvertTo<Object>(params[0]);
|
|
||||||
if (strMethod == "listsinceblock" && n > 1) ConvertTo<int64_t>(params[1]);
|
|
||||||
if (strMethod == "sendmany" && n > 1) ConvertTo<Object>(params[1]);
|
|
||||||
if (strMethod == "sendmany" && n > 2) ConvertTo<int64_t>(params[2]);
|
|
||||||
if (strMethod == "addmultisigaddress" && n > 0) ConvertTo<int64_t>(params[0]);
|
|
||||||
if (strMethod == "addmultisigaddress" && n > 1) ConvertTo<Array>(params[1]);
|
|
||||||
if (strMethod == "createmultisig" && n > 0) ConvertTo<int64_t>(params[0]);
|
|
||||||
if (strMethod == "createmultisig" && n > 1) ConvertTo<Array>(params[1]);
|
|
||||||
if (strMethod == "listunspent" && n > 0) ConvertTo<int64_t>(params[0]);
|
|
||||||
if (strMethod == "listunspent" && n > 1) ConvertTo<int64_t>(params[1]);
|
|
||||||
if (strMethod == "listunspent" && n > 2) ConvertTo<Array>(params[2]);
|
|
||||||
if (strMethod == "getblock" && n > 1) ConvertTo<bool>(params[1]);
|
|
||||||
if (strMethod == "getrawtransaction" && n > 1) ConvertTo<int64_t>(params[1]);
|
|
||||||
if (strMethod == "createrawtransaction" && n > 0) ConvertTo<Array>(params[0]);
|
|
||||||
if (strMethod == "createrawtransaction" && n > 1) ConvertTo<Object>(params[1]);
|
|
||||||
if (strMethod == "signrawtransaction" && n > 1) ConvertTo<Array>(params[1], true);
|
|
||||||
if (strMethod == "signrawtransaction" && n > 2) ConvertTo<Array>(params[2], true);
|
|
||||||
if (strMethod == "sendrawtransaction" && n > 1) ConvertTo<bool>(params[1], true);
|
|
||||||
if (strMethod == "gettxout" && n > 1) ConvertTo<int64_t>(params[1]);
|
|
||||||
if (strMethod == "gettxout" && n > 2) ConvertTo<bool>(params[2]);
|
|
||||||
if (strMethod == "lockunspent" && n > 0) ConvertTo<bool>(params[0]);
|
|
||||||
if (strMethod == "lockunspent" && n > 1) ConvertTo<Array>(params[1]);
|
|
||||||
if (strMethod == "importprivkey" && n > 2) ConvertTo<bool>(params[2]);
|
|
||||||
if (strMethod == "verifychain" && n > 0) ConvertTo<int64_t>(params[0]);
|
|
||||||
if (strMethod == "verifychain" && n > 1) ConvertTo<int64_t>(params[1]);
|
|
||||||
if (strMethod == "keypoolrefill" && n > 0) ConvertTo<int64_t>(params[0]);
|
|
||||||
if (strMethod == "getrawmempool" && n > 0) ConvertTo<bool>(params[0]);
|
|
||||||
if (strMethod == "estimatefee" && n > 0) ConvertTo<boost::int64_t>(params[0]);
|
|
||||||
if (strMethod == "estimatepriority" && n > 0) ConvertTo<boost::int64_t>(params[0]);
|
|
||||||
|
|
||||||
return params;
|
return params;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue