From 7e45c1773034281e52380e05960e202aa2c98029 Mon Sep 17 00:00:00 2001 From: Tom Ritchford Date: Fri, 6 Jun 2014 18:31:54 -0400 Subject: [PATCH] Rename ledger_get to ledger_request. --- src/ripple/module/app/main/Main.cpp | 2 +- src/ripple/module/app/rpc/RPCHandler.cpp | 2 +- src/ripple/module/app/rpc/RPCHandler.h | 2 +- src/ripple/module/net/rpc/RPCCall.cpp | 2 +- .../module/rpc/handlers/{LedgerGet.cpp => LedgerRequest.cpp} | 2 +- src/ripple/unity/rpcx.cpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename src/ripple/module/rpc/handlers/{LedgerGet.cpp => LedgerRequest.cpp} (98%) diff --git a/src/ripple/module/app/main/Main.cpp b/src/ripple/module/app/main/Main.cpp index 0873bd3957..e537f5c8f0 100644 --- a/src/ripple/module/app/main/Main.cpp +++ b/src/ripple/module/app/main/Main.cpp @@ -88,7 +88,7 @@ void printHelp (const po::options_description& desc) " ledger_accept\n" " ledger_closed\n" " ledger_current\n" - " ledger_get \n" + " ledger_request \n" " ledger_header \n" " logrotate \n" " peers\n" diff --git a/src/ripple/module/app/rpc/RPCHandler.cpp b/src/ripple/module/app/rpc/RPCHandler.cpp index 260f8b5b7c..5dc6ec848d 100644 --- a/src/ripple/module/app/rpc/RPCHandler.cpp +++ b/src/ripple/module/app/rpc/RPCHandler.cpp @@ -137,8 +137,8 @@ Json::Value RPCHandler::doCommand (const Json::Value& params, int iRole, Resourc { "ledger_current", &RPCHandler::doLedgerCurrent, false, optCurrent }, { "ledger_data", &RPCHandler::doLedgerData, false, optCurrent }, { "ledger_entry", &RPCHandler::doLedgerEntry, false, optCurrent }, - { "ledger_get", &RPCHandler::doLedgerGet, true, optNone }, { "ledger_header", &RPCHandler::doLedgerHeader, false, optCurrent }, + { "ledger_request", &RPCHandler::doLedgerRequest, true, optNone }, { "log_level", &RPCHandler::doLogLevel, true, optNone }, { "logrotate", &RPCHandler::doLogRotate, true, optNone }, // { "nickname_info", &RPCHandler::doNicknameInfo, false, optCurrent }, diff --git a/src/ripple/module/app/rpc/RPCHandler.h b/src/ripple/module/app/rpc/RPCHandler.h index 47387b84e6..4421ad57c4 100644 --- a/src/ripple/module/app/rpc/RPCHandler.h +++ b/src/ripple/module/app/rpc/RPCHandler.h @@ -87,8 +87,8 @@ private: Json::Value doLedgerCurrent (Json::Value params, Resource::Charge& loadType, Application::ScopedLockType& mlh); Json::Value doLedgerData (Json::Value params, Resource::Charge& loadType, Application::ScopedLockType& mlh); Json::Value doLedgerEntry (Json::Value params, Resource::Charge& loadType, Application::ScopedLockType& mlh); - Json::Value doLedgerGet (Json::Value params, Resource::Charge& loadType, Application::ScopedLockType& mlh); Json::Value doLedgerHeader (Json::Value params, Resource::Charge& loadType, Application::ScopedLockType& mlh); + Json::Value doLedgerRequest (Json::Value params, Resource::Charge& loadType, Application::ScopedLockType& mlh); Json::Value doLogLevel (Json::Value params, Resource::Charge& loadType, Application::ScopedLockType& mlh); Json::Value doLogRotate (Json::Value params, Resource::Charge& loadType, Application::ScopedLockType& mlh); Json::Value doNicknameInfo (Json::Value params, Resource::Charge& loadType, Application::ScopedLockType& mlh); diff --git a/src/ripple/module/net/rpc/RPCCall.cpp b/src/ripple/module/net/rpc/RPCCall.cpp index aa90d997ef..e956fc488f 100644 --- a/src/ripple/module/net/rpc/RPCCall.cpp +++ b/src/ripple/module/net/rpc/RPCCall.cpp @@ -813,8 +813,8 @@ public: { "ledger_closed", &RPCParser::parseAsIs, 0, 0 }, { "ledger_current", &RPCParser::parseAsIs, 0, 0 }, // { "ledger_entry", &RPCParser::parseLedgerEntry, -1, -1 }, - { "ledger_get", &RPCParser::parseLedgerId, 1, 1 }, { "ledger_header", &RPCParser::parseLedgerId, 1, 1 }, + { "ledger_request", &RPCParser::parseLedgerId, 1, 1 }, { "log_level", &RPCParser::parseLogLevel, 0, 2 }, { "logrotate", &RPCParser::parseAsIs, 0, 0 }, // { "nickname_info", &RPCParser::parseNicknameInfo, 1, 1 }, diff --git a/src/ripple/module/rpc/handlers/LedgerGet.cpp b/src/ripple/module/rpc/handlers/LedgerRequest.cpp similarity index 98% rename from src/ripple/module/rpc/handlers/LedgerGet.cpp rename to src/ripple/module/rpc/handlers/LedgerRequest.cpp index 62d69cb1f8..c386fb5e1e 100644 --- a/src/ripple/module/rpc/handlers/LedgerGet.cpp +++ b/src/ripple/module/rpc/handlers/LedgerRequest.cpp @@ -24,7 +24,7 @@ namespace ripple { // ledger_hash : // ledger_index : // } -Json::Value RPCHandler::doLedgerGet ( +Json::Value RPCHandler::doLedgerRequest ( Json::Value params, Resource::Charge&, Application::ScopedLockType& masterLockHolder) diff --git a/src/ripple/unity/rpcx.cpp b/src/ripple/unity/rpcx.cpp index 1aa99f0a60..0b5ed0ea7c 100644 --- a/src/ripple/unity/rpcx.cpp +++ b/src/ripple/unity/rpcx.cpp @@ -54,8 +54,8 @@ #include #include #include -#include #include +#include #include #include #include