From c95211e572360eecfa0216eed33b35694101a5c5 Mon Sep 17 00:00:00 2001 From: David Schwartz Date: Wed, 4 Sep 2013 12:48:13 -0700 Subject: [PATCH] Change tx_account to an account_tx switch. --- modules/ripple_app/rpc/RPCHandler.cpp | 16 ++++++++++++---- modules/ripple_app/rpc/RPCHandler.h | 5 +++-- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/modules/ripple_app/rpc/RPCHandler.cpp b/modules/ripple_app/rpc/RPCHandler.cpp index 93c1973a3..abd3934b5 100644 --- a/modules/ripple_app/rpc/RPCHandler.cpp +++ b/modules/ripple_app/rpc/RPCHandler.cpp @@ -1940,6 +1940,15 @@ Json::Value RPCHandler::doLedger (Json::Value params, LoadType* loadType, Applic return ret; } +// Temporary switching code until the old account_tx is removed +Json::Value RPCHandler::doAccountTxSwitch (Json::Value params, LoadType* loadType, Application::ScopedLockType& masterLockHolder) +{ + if (params.isMember("offset") || params.isMember("count") || params.isMember("descending") || + params.isMember("ledger_max") || params.isMember("ledger_min")) + return doAccountTxOld(params, loadType, masterLockHolder); + return doAccountTx(params, loadType, masterLockHolder); +} + // { // account: account, // ledger_index_min: ledger_index, @@ -1950,7 +1959,7 @@ Json::Value RPCHandler::doLedger (Json::Value params, LoadType* loadType, Applic // offset: integer, // optional, defaults to 0 // limit: integer // optional // } -Json::Value RPCHandler::doAccountTransactions (Json::Value params, LoadType* loadType, Application::ScopedLockType& masterLockHolder) +Json::Value RPCHandler::doAccountTxOld (Json::Value params, LoadType* loadType, Application::ScopedLockType& masterLockHolder) { RippleAddress raAccount; uint32 offset = params.isMember ("offset") ? params["offset"].asUInt () : 0; @@ -2100,7 +2109,7 @@ Json::Value RPCHandler::doAccountTransactions (Json::Value params, LoadType* loa // fwd_marker: opaque, // optional, resume forward // rev_marker: opaque // optional, resume reverse // } -Json::Value RPCHandler::doTxAccount (Json::Value params, LoadType* loadType, Application::ScopedLockType& masterLockHolder) +Json::Value RPCHandler::doAccountTx (Json::Value params, LoadType* loadType, Application::ScopedLockType& masterLockHolder) { RippleAddress raAccount; int limit = params.isMember ("limit") ? params["limit"].asUInt () : -1; @@ -3754,7 +3763,7 @@ Json::Value RPCHandler::doCommand (const Json::Value& params, int iRole, LoadTyp { "account_info", &RPCHandler::doAccountInfo, false, optCurrent }, { "account_lines", &RPCHandler::doAccountLines, false, optCurrent }, { "account_offers", &RPCHandler::doAccountOffers, false, optCurrent }, - { "account_tx", &RPCHandler::doAccountTransactions, false, optNetwork }, + { "account_tx", &RPCHandler::doAccountTxSwitch, false, optNetwork }, { "book_offers", &RPCHandler::doBookOffers, false, optCurrent }, { "connect", &RPCHandler::doConnect, true, optNone }, { "consensus_info", &RPCHandler::doConsensusInfo, true, optNone }, @@ -3789,7 +3798,6 @@ Json::Value RPCHandler::doCommand (const Json::Value& params, int iRole, LoadTyp { "stop", &RPCHandler::doStop, true, optNone }, { "transaction_entry", &RPCHandler::doTransactionEntry, false, optCurrent }, { "tx", &RPCHandler::doTx, false, optNetwork }, - { "tx_account", &RPCHandler::doTxAccount, false, optNetwork }, { "tx_history", &RPCHandler::doTxHistory, false, optNone }, { "unl_add", &RPCHandler::doUnlAdd, true, optNone }, diff --git a/modules/ripple_app/rpc/RPCHandler.h b/modules/ripple_app/rpc/RPCHandler.h index 8e78723a1..153e4b883 100644 --- a/modules/ripple_app/rpc/RPCHandler.h +++ b/modules/ripple_app/rpc/RPCHandler.h @@ -84,7 +84,9 @@ private: Json::Value doAccountInfo (Json::Value params, LoadType* loadType, Application::ScopedLockType& mlh); Json::Value doAccountLines (Json::Value params, LoadType* loadType, Application::ScopedLockType& mlh); Json::Value doAccountOffers (Json::Value params, LoadType* loadType, Application::ScopedLockType& mlh); - Json::Value doAccountTransactions (Json::Value params, LoadType* loadType, Application::ScopedLockType& mlh); + Json::Value doAccountTx (Json::Value params, LoadType* loadType, Application::ScopedLockType& mlh); + Json::Value doAccountTxSwitch (Json::Value params, LoadType* loadType, Application::ScopedLockType& mlh); + Json::Value doAccountTxOld (Json::Value params, LoadType* loadType, Application::ScopedLockType& mlh); Json::Value doBookOffers (Json::Value params, LoadType* loadType, Application::ScopedLockType& mlh); Json::Value doConnect (Json::Value params, LoadType* loadType, Application::ScopedLockType& mlh); Json::Value doConsensusInfo (Json::Value params, LoadType* loadType, Application::ScopedLockType& mlh); @@ -122,7 +124,6 @@ private: Json::Value doSubscribe (Json::Value params, LoadType* loadType, Application::ScopedLockType& mlh); Json::Value doTransactionEntry (Json::Value params, LoadType* loadType, Application::ScopedLockType& mlh); Json::Value doTx (Json::Value params, LoadType* loadType, Application::ScopedLockType& mlh); - Json::Value doTxAccount (Json::Value params, LoadType* loadType, Application::ScopedLockType& mlh); Json::Value doTxHistory (Json::Value params, LoadType* loadType, Application::ScopedLockType& mlh); Json::Value doUnlAdd (Json::Value params, LoadType* loadType, Application::ScopedLockType& mlh); Json::Value doUnlDelete (Json::Value params, LoadType* loadType, Application::ScopedLockType& mlh);