ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-28 06:55:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor RPC account_tx.

Browse Source
This commit is contained in:
Arthur Britto
2012-12-02 17:21:03 -08:00
parent f3bbe07572
commit 318c7d15cb
3 changed files with 70 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,14 +51,14 @@ std::string EncodeBase64(const std::string& s)
return result; return result;
} }
Json::Value RPCParser::parseAsIs(const Json::Value &params) Json::Value RPCParser::parseAsIs(const Json::Value& jvParams)
{ {
return Json::Value(Json::objectValue); return Json::Value(Json::objectValue);
} }
// account_info <account>|<nickname>|<account_public_key> // account_info <account>|<nickname>|<account_public_key>
// account_info <seed>|<pass_phrase>|<key> [<index>] // account_info <seed>|<pass_phrase>|<key> [<index>]
Json::Value RPCParser::parseAccountInfo(const Json::Value &jvParams) Json::Value RPCParser::parseAccountInfo(const Json::Value& jvParams)
{ {
Json::Value jvRequest(Json::objectValue); Json::Value jvRequest(Json::objectValue);
std::string strIdent = jvParams[0u].asString(); std::string strIdent = jvParams[0u].asString();
@@ -76,6 +76,43 @@ Json::Value RPCParser::parseAccountInfo(const Json::Value &jvParams)
return jvRequest; return jvRequest;
} }
// account_tx <account> <minledger> <maxledger>
// account_tx <account> <ledger>
Json::Value RPCParser::parseAccountTransactions(const Json::Value& jvParams)
{
Json::Value jvRequest(Json::objectValue);
RippleAddress raAccount;
if (jvParams.size() < 2 || jvParams.size() > 3)
return rpcError(rpcINVALID_PARAMS);
if (!raAccount.setAccountID(jvParams[0u].asString()))
return rpcError(rpcACT_MALFORMED);
// YYY This could be more strict and report casting errors.
if (jvParams.size() == 2)
{
jvRequest["ledger"] = jvParams[1u].asUInt();
}
else
{
uint32 uLedgerMin = jvParams[1u].asUInt();
uint32 uLedgerMax = jvParams[2u].asUInt();
if ((uLedgerMax < uLedgerMin) || (uLedgerMax == 0))
{
return rpcError(rpcLGR_IDXS_INVALID);
}
jvRequest["ledger_min"] = uLedgerMin;
jvRequest["ledger_max"] = uLedgerMax;
}
jvRequest["account"] = raAccount.humanAccountID();
return jvRequest;
}
// Convert a rpc method and params to a request. // Convert a rpc method and params to a request.
// <-- { method: xyz, params: [... ] } or { error: ..., ... } // <-- { method: xyz, params: [... ] } or { error: ..., ... }
Json::Value RPCParser::parseCommand(std::string strMethod, Json::Value jvParams) Json::Value RPCParser::parseCommand(std::string strMethod, Json::Value jvParams)
@@ -92,10 +129,10 @@ Json::Value RPCParser::parseCommand(std::string strMethod, Json::Value jvParams)
// Request-response methods // Request-response methods
// - Returns an error, or the request. // - Returns an error, or the request.
// - To modify the method, provide a new method in the request. // - To modify the method, provide a new method in the request.
{ "accept_ledger", &RPCParser::parseAsIs, 0, 0 }, { "accept_ledger", &RPCParser::parseAsIs, 0, 0 },
{ "account_info", &RPCParser::parseAccountInfo, 1, 2 }, { "account_info", &RPCParser::parseAccountInfo, 1, 2 },
{ "account_tx", &RPCParser::parseAccountTransactions, 2, 3 },
#if 0 #if 0
{ "account_tx", &RPCParser::doAccountTransactions, 2, 3, false, false, optNetwork },
{ "connect", &RPCParser::doConnect, 1, 2, true, false, optNone }, { "connect", &RPCParser::doConnect, 1, 2, true, false, optNone },
{ "data_delete", &RPCParser::doDataDelete, 1, 1, true, false, optNone }, { "data_delete", &RPCParser::doDataDelete, 1, 1, true, false, optNone },
{ "data_fetch", &RPCParser::doDataFetch, 1, 1, true, false, optNone }, { "data_fetch", &RPCParser::doDataFetch, 1, 1, true, false, optNone },
@@ -209,7 +246,8 @@ int commandLineRPC(const std::vector<std::string>& vCmd)
if (jvOutput.isMember("error")) if (jvOutput.isMember("error"))
{ {
jvOutput["rpc"] = jvRpc; jvOutput["rpc"] = jvRpc; // How the command was seen as method + params.
jvOutput["request"] = jvRequest; // How the command was translated.
} }
} }

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

@@ -11,8 +11,9 @@ class RPCParser
protected: protected:
typedef Json::Value (RPCParser::*parseFuncPtr)(const Json::Value &jvParams); typedef Json::Value (RPCParser::*parseFuncPtr)(const Json::Value &jvParams);
Json::Value parseAsIs(const Json::Value &jvParams); Json::Value parseAsIs(const Json::Value& jvParams);
Json::Value parseAccountInfo(const Json::Value &jvParams); Json::Value parseAccountInfo(const Json::Value& jvParams);
Json::Value parseAccountTransactions(const Json::Value& jvParams);
public: public:
Json::Value parseCommand(std::string strMethod, Json::Value jvParams); Json::Value parseCommand(std::string strMethod, Json::Value jvParams);

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

@@ -1198,34 +1198,36 @@ Json::Value RPCHandler::doLedger(Json::Value params)
return ret; return ret;
} }
// account_tx <account> <minledger> <maxledger> // { account: <account>, ledger: <integer> }
// account_tx <account> <ledger> // { account: <account>, ledger_min: <integer>, ledger_max: <integer> }
Json::Value RPCHandler::doAccountTransactions(Json::Value params) Json::Value RPCHandler::doAccountTransactions(Json::Value jvRequest)
{ {
std::string param; RippleAddress raAccount;
uint32 minLedger, maxLedger; uint32 minLedger;
uint32 maxLedger;
if (!extractString(param, params, 0)) if (!jvRequest.isMember("account"))
return rpcError(rpcINVALID_PARAMS); return rpcError(rpcINVALID_PARAMS);
RippleAddress account; if (!raAccount.setAccountID(jvRequest["account"].asString()))
if (!account.setAccountID(param))
return rpcError(rpcACT_MALFORMED); return rpcError(rpcACT_MALFORMED);
if (!extractString(param, params, 1)) if (jvRequest.isMember("ledger"))
return rpcError(rpcLGR_IDX_MALFORMED); {
minLedger = maxLedger = jvRequest["ledger"].asUInt();
minLedger = lexical_cast_s<uint32>(param); }
else if (jvRequest.isMember("ledger_min") && jvRequest.isMember("ledger_max"))
if ((params.size() == 3) && extractString(param, params, 2)) {
maxLedger = lexical_cast_s<uint32>(param); minLedger = jvRequest["ledger_min"].asUInt();
maxLedger = jvRequest["ledger_max"].asUInt();
}
else else
maxLedger = minLedger; {
return rpcError(rpcLGR_IDX_MALFORMED);
}
if ((maxLedger < minLedger) || (maxLedger == 0)) if ((maxLedger < minLedger) || (maxLedger == 0))
{ {
std::cerr << "minL=" << minLedger << ", maxL=" << maxLedger << std::endl;
return rpcError(rpcLGR_IDXS_INVALID); return rpcError(rpcLGR_IDXS_INVALID);
} }
@@ -1233,9 +1235,9 @@ Json::Value RPCHandler::doAccountTransactions(Json::Value params)
try try
{ {
#endif #endif
std::vector< std::pair<Transaction::pointer, TransactionMetaSet::pointer> > txns = mNetOps->getAccountTxs(account, minLedger, maxLedger); std::vector< std::pair<Transaction::pointer, TransactionMetaSet::pointer> > txns = mNetOps->getAccountTxs(raAccount, minLedger, maxLedger);
Json::Value ret(Json::objectValue); Json::Value ret(Json::objectValue);
ret["account"] = account.humanAccountID(); ret["account"] = raAccount.humanAccountID();
Json::Value ledgers(Json::arrayValue); Json::Value ledgers(Json::arrayValue);
// uint32 currentLedger = 0; // uint32 currentLedger = 0;
@@ -2180,7 +2182,7 @@ Json::Value RPCHandler::doCommand(Json::Value& jvParams, int iRole)
// Request-response methods // Request-response methods
{ "accept_ledger", &RPCHandler::doAcceptLedger, -1, -1, true, false, optCurrent }, { "accept_ledger", &RPCHandler::doAcceptLedger, -1, -1, true, false, optCurrent },
{ "account_info", &RPCHandler::doAccountInfo, -1, -1, false, false, optCurrent }, { "account_info", &RPCHandler::doAccountInfo, -1, -1, false, false, optCurrent },
{ "account_tx", &RPCHandler::doAccountTransactions, 2, 3, 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 },
{ "data_delete", &RPCHandler::doDataDelete, 1, 1, true, false, optNone }, { "data_delete", &RPCHandler::doDataDelete, 1, 1, true, false, optNone },
{ "data_fetch", &RPCHandler::doDataFetch, 1, 1, true, false, optNone }, { "data_fetch", &RPCHandler::doDataFetch, 1, 1, true, false, optNone },