ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-22 12:05:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor RPC get_counts.

Browse Source
This commit is contained in:
Arthur Britto
2012-12-03 22:28:50 -08:00
parent a7f3e1f8cc
commit b51daf0942
3 changed files with 38 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/cpp/ripple/CallRPC.cpp
View File

@@ -126,11 +126,23 @@ Json::Value RPCParser::parseConnect(const Json::Value& jvParams)
return jvRequest; return jvRequest;
} }
// Return an error for attemping to subscribe/unsubscribe via RPC.
Json::Value RPCParser::parseEvented(const Json::Value& jvParams) Json::Value RPCParser::parseEvented(const Json::Value& jvParams)
{ {
return rpcError(rpcNO_EVENTS); return rpcError(rpcNO_EVENTS);
} }
// get_counts [<min_count>]
Json::Value RPCParser::parseGetCounts(const Json::Value& jvParams)
{
Json::Value jvRequest(Json::objectValue);
if (jvParams.size())
jvRequest["min_count"] = jvParams[0u].asUInt();
return jvRequest;
}
// ledger [id|ledger_current|ledger_closed] [full] // ledger [id|ledger_current|ledger_closed] [full]
Json::Value RPCParser::parseLedger(const Json::Value& jvParams) Json::Value RPCParser::parseLedger(const Json::Value& jvParams)
{ {
@@ -314,27 +326,27 @@ Json::Value RPCParser::parseCommand(std::string strMethod, Json::Value jvParams)
{ "account_info", &RPCParser::parseAccountInfo, 1, 2 }, { "account_info", &RPCParser::parseAccountInfo, 1, 2 },
{ "account_tx", &RPCParser::parseAccountTransactions, 2, 3 }, { "account_tx", &RPCParser::parseAccountTransactions, 2, 3 },
{ "connect", &RPCParser::parseConnect, 1, 2 }, { "connect", &RPCParser::parseConnect, 1, 2 },
// { "get_counts", &RPCParser::doGetCounts, 0, 1, true, false, optNone }, { "get_counts", &RPCParser::parseGetCounts, 0, 1 },
{ "ledger", &RPCParser::parseLedger, 0, 2 }, { "ledger", &RPCParser::parseLedger, 0, 2 },
{ "ledger_accept", &RPCParser::parseAsIs, 0, 0 }, { "ledger_accept", &RPCParser::parseAsIs, 0, 0 },
{ "ledger_closed", &RPCParser::parseAsIs, 0, 0 }, { "ledger_closed", &RPCParser::parseAsIs, 0, 0 },
{ "ledger_current", &RPCParser::parseAsIs, 0, 0 }, { "ledger_current", &RPCParser::parseAsIs, 0, 0 },
// { "ledger_entry", &RPCParser::doLedgerEntry, -1, -1, false, false, optCurrent }, // { "ledger_entry", &RPCParser::parseLedgerEntry, -1, -1, false, false, optCurrent },
// { "ledger_header", &RPCParser::doLedgerHeader, -1, -1, false, false, optCurrent }, // { "ledger_header", &RPCParser::parseLedgerHeader, -1, -1, false, false, optCurrent },
// { "log_level", &RPCParser::doLogLevel, 0, 2, true, false, optNone }, // { "log_level", &RPCParser::parseLogLevel, 0, 2, true, false, optNone },
{ "logrotate", &RPCParser::parseAsIs, 0, 0 }, { "logrotate", &RPCParser::parseAsIs, 0, 0 },
// { "nickname_info", &RPCParser::doNicknameInfo, 1, 1, false, false, optCurrent }, // { "nickname_info", &RPCParser::parseNicknameInfo, 1, 1, false, false, optCurrent },
// { "owner_info", &RPCParser::doOwnerInfo, 1, 2, false, false, optCurrent }, // { "owner_info", &RPCParser::parseOwnerInfo, 1, 2, false, false, optCurrent },
{ "peers", &RPCParser::parseAsIs, 0, 0 }, { "peers", &RPCParser::parseAsIs, 0, 0 },
// { "profile", &RPCParser::doProfile, 1, 9, false, false, optCurrent }, // { "profile", &RPCParser::parseProfile, 1, 9, false, false, optCurrent },
{ "ripple_lines_get", &RPCParser::parseRippleLinesGet, 1, 2 }, { "ripple_lines_get", &RPCParser::parseRippleLinesGet, 1, 2 },
// { "ripple_path_find", &RPCParser::doRipplePathFind, -1, -1, false, false, optCurrent }, // { "ripple_path_find", &RPCParser::parseRipplePathFind, -1, -1, false, false, optCurrent },
{ "submit", &RPCParser::parseSubmit, 2, 2 }, { "submit", &RPCParser::parseSubmit, 2, 2 },
{ "server_info", &RPCParser::parseAsIs, 0, 0 }, { "server_info", &RPCParser::parseAsIs, 0, 0 },
{ "stop", &RPCParser::parseAsIs, 0, 0 }, { "stop", &RPCParser::parseAsIs, 0, 0 },
// { "transaction_entry", &RPCParser::doTransactionEntry, -1, -1, false, false, optCurrent }, // { "transaction_entry", &RPCParser::parseTransactionEntry, -1, -1, false, false, optCurrent },
// { "tx", &RPCParser::doTx, 1, 1, true, false, optNone }, // { "tx", &RPCParser::parseTx, 1, 1, true, false, optNone },
// { "tx_history", &RPCParser::doTxHistory, 1, 1, false, false, optNone }, // { "tx_history", &RPCParser::parseTxHistory, 1, 1, false, false, optNone },
// //
{ "unl_add", &RPCParser::parseUnlAdd, 1, 2 }, { "unl_add", &RPCParser::parseUnlAdd, 1, 2 },
{ "unl_delete", &RPCParser::parseUnlDelete, 1, 1 }, { "unl_delete", &RPCParser::parseUnlDelete, 1, 1 },
@@ -352,10 +364,10 @@ Json::Value RPCParser::parseCommand(std::string strMethod, Json::Value jvParams)
{ "wallet_seed", &RPCParser::parseWalletSeed, 0, 1 }, { "wallet_seed", &RPCParser::parseWalletSeed, 0, 1 },
// XXX Unnecessary commands which should be removed. // XXX Unnecessary commands which should be removed.
// { "login", &RPCParser::doLogin, 2, 2, true, false, optNone }, // { "login", &RPCParser::parseLogin, 2, 2, true, false, optNone },
// { "data_delete", &RPCParser::doDataDelete, 1, 1, true, false, optNone }, // { "data_delete", &RPCParser::parseDataDelete, 1, 1, true, false, optNone },
// { "data_fetch", &RPCParser::doDataFetch, 1, 1, true, false, optNone }, // { "data_fetch", &RPCParser::parseDataFetch, 1, 1, true, false, optNone },
// { "data_store", &RPCParser::doDataStore, 2, 2, true, false, optNone }, // { "data_store", &RPCParser::parseDataStore, 2, 2, true, false, optNone },
// Evented methods // Evented methods
{ "subscribe", &RPCParser::parseEvented, -1, -1 }, { "subscribe", &RPCParser::parseEvented, -1, -1 },

1
src/cpp/ripple/CallRPC.h
View File

@@ -16,6 +16,7 @@ protected:
Json::Value parseAsIs(const Json::Value& jvParams); Json::Value parseAsIs(const Json::Value& jvParams);
Json::Value parseConnect(const Json::Value& jvParams); Json::Value parseConnect(const Json::Value& jvParams);
Json::Value parseEvented(const Json::Value& jvParams); Json::Value parseEvented(const Json::Value& jvParams);
Json::Value parseGetCounts(const Json::Value& jvParams);
Json::Value parseLedger(const Json::Value& jvParams); Json::Value parseLedger(const Json::Value& jvParams);
Json::Value parseRippleLinesGet(const Json::Value& jvParams); Json::Value parseRippleLinesGet(const Json::Value& jvParams);
Json::Value parseSubmit(const Json::Value& jvParams); Json::Value parseSubmit(const Json::Value& jvParams);

14
src/cpp/ripple/RPCHandler.cpp
View File

@@ -1454,17 +1454,23 @@ Json::Value RPCHandler::doLogin(Json::Value params)
} }
} }
Json::Value RPCHandler::doGetCounts(Json::Value params) // {
// min_count: <number> // optional, defaults to 10
// }
Json::Value RPCHandler::doGetCounts(Json::Value jvRequest)
{ {
int minCount = 10; int minCount = 10;
if (params.size() > 0)
minCount = params[0u].asInt(); if (jvRequest.isMember("min_count"))
minCount = jvRequest["min_count"].asUInt();
std::vector<InstanceType::InstanceCount> count = InstanceType::getInstanceCounts(minCount); std::vector<InstanceType::InstanceCount> count = InstanceType::getInstanceCounts(minCount);
Json::Value ret(Json::objectValue); Json::Value ret(Json::objectValue);
BOOST_FOREACH(InstanceType::InstanceCount& it, count) BOOST_FOREACH(InstanceType::InstanceCount& it, count)
ret[it.first] = it.second; ret[it.first] = it.second;
return ret; return ret;
} }
@@ -2184,7 +2190,7 @@ Json::Value RPCHandler::doCommand(Json::Value& jvParams, int iRole)
{ "account_info", &RPCHandler::doAccountInfo, -1, -1, false, false, optCurrent }, { "account_info", &RPCHandler::doAccountInfo, -1, -1, false, false, optCurrent },
{ "account_tx", &RPCHandler::doAccountTransactions, -1, -1, false, false, optNetwork }, { "account_tx", &RPCHandler::doAccountTransactions, -1, -1, false, false, optNetwork },
{ "connect", &RPCHandler::doConnect, 1, 2, true, false, optNone }, { "connect", &RPCHandler::doConnect, 1, 2, true, false, optNone },
{ "get_counts", &RPCHandler::doGetCounts, 0, 1, true, false, optNone }, { "get_counts", &RPCHandler::doGetCounts, -1, -1, true, false, optNone },
{ "ledger", &RPCHandler::doLedger, -1, -1, false, false, optNetwork }, { "ledger", &RPCHandler::doLedger, -1, -1, false, false, optNetwork },
{ "ledger_accept", &RPCHandler::doLedgerAccept, -1, -1, true, false, optCurrent }, { "ledger_accept", &RPCHandler::doLedgerAccept, -1, -1, true, false, optCurrent },
{ "ledger_closed", &RPCHandler::doLedgerClosed, -1, -1, false, false, optClosed }, { "ledger_closed", &RPCHandler::doLedgerClosed, -1, -1, false, false, optClosed },