diff --git a/Builds/VisualStudio2013/RippleD.vcxproj b/Builds/VisualStudio2013/RippleD.vcxproj index dc8eae323b..b3cbfa7dd8 100644 --- a/Builds/VisualStudio2013/RippleD.vcxproj +++ b/Builds/VisualStudio2013/RippleD.vcxproj @@ -3065,259 +3065,334 @@ - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - - True - - - - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True + + True + True + + + - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True @@ -3330,21 +3405,26 @@ - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True @@ -3723,6 +3803,8 @@ + True + True ..\..\src\secp256k1;%(AdditionalIncludeDirectories) diff --git a/Builds/VisualStudio2013/RippleD.vcxproj.filters b/Builds/VisualStudio2013/RippleD.vcxproj.filters index 2de94b1bac..7313be4274 100644 --- a/Builds/VisualStudio2013/RippleD.vcxproj.filters +++ b/Builds/VisualStudio2013/RippleD.vcxproj.filters @@ -3843,12 +3843,6 @@ ripple\rpc\handlers - - ripple\rpc\handlers - - - ripple\rpc\handlers - ripple\rpc\handlers @@ -3867,6 +3861,12 @@ ripple\rpc\handlers + + ripple\rpc\handlers + + + ripple\rpc\handlers + ripple\rpc\handlers diff --git a/SConstruct b/SConstruct index 35e4bdd020..54ce548fc6 100644 --- a/SConstruct +++ b/SConstruct @@ -56,7 +56,7 @@ The following environment variables modify the build environment: If set, used to detect a toolchain. BOOST_ROOT - Path to the boost directory. + Path to the boost directory. OPENSSL_ROOT Path to the openssl directory. @@ -673,6 +673,7 @@ def get_classic_sources(): append_sources(result, *list_sources('src/ripple/overlay', '.cpp')) append_sources(result, *list_sources('src/ripple/peerfinder', '.cpp')) append_sources(result, *list_sources('src/ripple/protocol', '.cpp')) + append_sources(result, *list_sources('src/ripple/rpc', '.cpp')) append_sources(result, *list_sources('src/ripple/shamap', '.cpp')) append_sources(result, *list_sources('src/ripple/test', '.cpp')) @@ -709,6 +710,7 @@ def get_unity_sources(): 'src/ripple/unity/peerfinder.cpp', 'src/ripple/unity/json.cpp', 'src/ripple/unity/protocol.cpp', + 'src/ripple/unity/rpcx.cpp', 'src/ripple/unity/shamap.cpp', 'src/ripple/unity/test.cpp', ) @@ -837,7 +839,6 @@ for tu_style in ['classic', 'unity']: 'src/ripple/unity/protobuf.cpp', 'src/ripple/unity/ripple.proto.cpp', 'src/ripple/unity/resource.cpp', - 'src/ripple/unity/rpcx.cpp', 'src/ripple/unity/server.cpp', 'src/ripple/unity/validators.cpp', 'src/ripple/unity/websocket02.cpp' @@ -959,4 +960,3 @@ def do_count(target, source, env): print "Total unit test lines: %d" % lines PhonyTargets(env, count = do_count) - diff --git a/src/ripple/json/JsonPropertyStream.h b/src/ripple/json/JsonPropertyStream.h index 31a2921374..584c8f9fb6 100644 --- a/src/ripple/json/JsonPropertyStream.h +++ b/src/ripple/json/JsonPropertyStream.h @@ -20,6 +20,7 @@ #ifndef RIPPLE_JSON_JSONPROPERTYSTREAM_H_INCLUDED #define RIPPLE_JSON_JSONPROPERTYSTREAM_H_INCLUDED +#include #include namespace ripple { diff --git a/src/ripple/overlay/ClusterNodeStatus.h b/src/ripple/overlay/ClusterNodeStatus.h index d51106ddf4..7e88c5e7ed 100644 --- a/src/ripple/overlay/ClusterNodeStatus.h +++ b/src/ripple/overlay/ClusterNodeStatus.h @@ -20,6 +20,9 @@ #ifndef RIPPLE_APP_PEERS_CLUSTERNODESTATUS_H_INCLUDED #define RIPPLE_APP_PEERS_CLUSTERNODESTATUS_H_INCLUDED +#include +#include + namespace ripple { class ClusterNodeStatus @@ -29,10 +32,12 @@ public: ClusterNodeStatus() : mLoadFee(0), mReportTime(0) { ; } - explicit ClusterNodeStatus(std::string const& name) : mNodeName(name), mLoadFee(0), mReportTime(0) + explicit ClusterNodeStatus(std::string const& name) : + mNodeName(name), mLoadFee(0), mReportTime(0) { ; } - ClusterNodeStatus(std::string const& name, std::uint32_t fee, std::uint32_t rtime) : + ClusterNodeStatus( + std::string const& name, std::uint32_t fee, std::uint32_t rtime) : mNodeName(name), mLoadFee(fee), mReportTime(rtime) diff --git a/src/ripple/protocol/JsonFields.h b/src/ripple/protocol/JsonFields.h index 8c69cc7625..660a978f15 100644 --- a/src/ripple/protocol/JsonFields.h +++ b/src/ripple/protocol/JsonFields.h @@ -27,7 +27,7 @@ namespace jss { // JSON static strings -#define JSS(x) const Json::StaticString x ( #x ) +#define JSS(x) const ::Json::StaticString x ( #x ) /* The "StaticString" field names are used instead of string literals to optimize the performance of accessing members of Json::Value objects. diff --git a/src/ripple/rpc/handlers/AccountCurrenciesHandler.cpp b/src/ripple/rpc/handlers/AccountCurrenciesHandler.cpp index b4ceeac13b..9964be1d8a 100644 --- a/src/ripple/rpc/handlers/AccountCurrenciesHandler.cpp +++ b/src/ripple/rpc/handlers/AccountCurrenciesHandler.cpp @@ -18,9 +18,13 @@ //============================================================================== #include +#include +#include +#include +#include +#include #include #include -#include namespace ripple { diff --git a/src/ripple/rpc/handlers/AccountInfo.cpp b/src/ripple/rpc/handlers/AccountInfo.cpp index 7406bc9cd0..e35730eb80 100644 --- a/src/ripple/rpc/handlers/AccountInfo.cpp +++ b/src/ripple/rpc/handlers/AccountInfo.cpp @@ -18,9 +18,17 @@ //============================================================================== #include + #include +#include +#include +#include #include +#include #include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/AccountLines.cpp b/src/ripple/rpc/handlers/AccountLines.cpp index 0c3670d314..bb87a65d4d 100644 --- a/src/ripple/rpc/handlers/AccountLines.cpp +++ b/src/ripple/rpc/handlers/AccountLines.cpp @@ -19,9 +19,16 @@ #include #include -#include #include +#include +#include +#include +#include #include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/AccountObjects.cpp b/src/ripple/rpc/handlers/AccountObjects.cpp index 8e56a35111..4b3a728f7e 100644 --- a/src/ripple/rpc/handlers/AccountObjects.cpp +++ b/src/ripple/rpc/handlers/AccountObjects.cpp @@ -18,10 +18,19 @@ //============================================================================== #include +#include #include -#include +#include +#include +#include #include +#include +#include +#include +#include #include +#include +#include #include #include diff --git a/src/ripple/rpc/handlers/AccountOffers.cpp b/src/ripple/rpc/handlers/AccountOffers.cpp index ca6e5ba28f..fe25791eef 100644 --- a/src/ripple/rpc/handlers/AccountOffers.cpp +++ b/src/ripple/rpc/handlers/AccountOffers.cpp @@ -19,6 +19,15 @@ #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/rpc/handlers/AccountTx.cpp b/src/ripple/rpc/handlers/AccountTx.cpp index 76fd995223..1ac8f0cf3b 100644 --- a/src/ripple/rpc/handlers/AccountTx.cpp +++ b/src/ripple/rpc/handlers/AccountTx.cpp @@ -18,10 +18,20 @@ //============================================================================== #include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include namespace ripple { diff --git a/src/ripple/rpc/handlers/AccountTxOld.cpp b/src/ripple/rpc/handlers/AccountTxOld.cpp index 8c21d253e0..61342269d1 100644 --- a/src/ripple/rpc/handlers/AccountTxOld.cpp +++ b/src/ripple/rpc/handlers/AccountTxOld.cpp @@ -18,6 +18,16 @@ //============================================================================== #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/rpc/handlers/AccountTxSwitch.cpp b/src/ripple/rpc/handlers/AccountTxSwitch.cpp index 57608138ec..2c7757829c 100644 --- a/src/ripple/rpc/handlers/AccountTxSwitch.cpp +++ b/src/ripple/rpc/handlers/AccountTxSwitch.cpp @@ -18,9 +18,17 @@ //============================================================================== #include +#include +#include +#include +#include +#include namespace ripple { +Json::Value doAccountTxOld (RPC::Context&); + Json::Value doAccountTx (RPC::Context&); + // Temporary switching code until the old account_tx is removed Json::Value doAccountTxSwitch (RPC::Context& context) { diff --git a/src/ripple/rpc/handlers/BlackList.cpp b/src/ripple/rpc/handlers/BlackList.cpp index ba6b4b3eca..d93826dc1a 100644 --- a/src/ripple/rpc/handlers/BlackList.cpp +++ b/src/ripple/rpc/handlers/BlackList.cpp @@ -18,7 +18,10 @@ //============================================================================== #include +#include +#include #include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/BookOffers.cpp b/src/ripple/rpc/handlers/BookOffers.cpp index 5c338f8d6b..edf9a3fe19 100644 --- a/src/ripple/rpc/handlers/BookOffers.cpp +++ b/src/ripple/rpc/handlers/BookOffers.cpp @@ -18,7 +18,17 @@ //============================================================================== #include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/CanDelete.cpp b/src/ripple/rpc/handlers/CanDelete.cpp index 1d1017b656..22ffa5b46f 100644 --- a/src/ripple/rpc/handlers/CanDelete.cpp +++ b/src/ripple/rpc/handlers/CanDelete.cpp @@ -18,7 +18,12 @@ //============================================================================== #include +#include +#include +#include #include +#include +#include #include #include #include diff --git a/src/ripple/rpc/handlers/Connect.cpp b/src/ripple/rpc/handlers/Connect.cpp index 2009b1a869..89d8f30874 100644 --- a/src/ripple/rpc/handlers/Connect.cpp +++ b/src/ripple/rpc/handlers/Connect.cpp @@ -18,7 +18,14 @@ //============================================================================== #include +#include +#include +#include #include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/rpc/handlers/ConsensusInfo.cpp b/src/ripple/rpc/handlers/ConsensusInfo.cpp index d5902ccea8..fc79163278 100644 --- a/src/ripple/rpc/handlers/ConsensusInfo.cpp +++ b/src/ripple/rpc/handlers/ConsensusInfo.cpp @@ -18,6 +18,11 @@ //============================================================================== #include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/rpc/handlers/Feature.cpp b/src/ripple/rpc/handlers/Feature.cpp index f28c547452..ec90b3126c 100644 --- a/src/ripple/rpc/handlers/Feature.cpp +++ b/src/ripple/rpc/handlers/Feature.cpp @@ -18,32 +18,16 @@ //============================================================================== #include +#include #include +#include +#include +#include +#include #include namespace ripple { -static void textTime ( - std::string& text, int& seconds, const char* unitName, int unitVal) -{ - int i = seconds / unitVal; - - if (i == 0) - return; - - seconds -= unitVal * i; - - if (!text.empty ()) - text += ", "; - - text += beast::lexicalCastThrow (i); - text += " "; - text += unitName; - - if (i > 1) - text += "s"; -} - Json::Value doFeature (RPC::Context& context) { if (!context.params.isMember (jss::feature)) diff --git a/src/ripple/rpc/handlers/FetchInfo.cpp b/src/ripple/rpc/handlers/FetchInfo.cpp index 724658daef..7b57ffc26d 100644 --- a/src/ripple/rpc/handlers/FetchInfo.cpp +++ b/src/ripple/rpc/handlers/FetchInfo.cpp @@ -18,6 +18,10 @@ //============================================================================== #include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/GatewayBalances.cpp b/src/ripple/rpc/handlers/GatewayBalances.cpp index 87768a146b..f24f0eceaf 100644 --- a/src/ripple/rpc/handlers/GatewayBalances.cpp +++ b/src/ripple/rpc/handlers/GatewayBalances.cpp @@ -19,9 +19,14 @@ #include #include +#include +#include +#include +#include +#include +#include #include #include -#include namespace ripple { diff --git a/src/ripple/rpc/handlers/GetCounts.cpp b/src/ripple/rpc/handlers/GetCounts.cpp index acabe8d59e..cbab419b54 100644 --- a/src/ripple/rpc/handlers/GetCounts.cpp +++ b/src/ripple/rpc/handlers/GetCounts.cpp @@ -18,15 +18,45 @@ //============================================================================== #include -#include #include #include -#include +#include +#include +#include #include +#include +#include +#include +#include #include +#include +#include +#include namespace ripple { +static +void textTime ( + std::string& text, int& seconds, const char* unitName, int unitVal) +{ + int i = seconds / unitVal; + + if (i == 0) + return; + + seconds -= unitVal * i; + + if (!text.empty ()) + text += ", "; + + text += std::to_string(i); + text += " "; + text += unitName; + + if (i > 1) + text += "s"; +} + // { // min_count: // optional, defaults to 10 // } diff --git a/src/ripple/rpc/handlers/Handlers.h b/src/ripple/rpc/handlers/Handlers.h index 44bc746358..880f16cf1d 100644 --- a/src/ripple/rpc/handlers/Handlers.h +++ b/src/ripple/rpc/handlers/Handlers.h @@ -20,6 +20,8 @@ #ifndef RIPPLE_RPC_HANDLERS_HANDLERS_H_INCLUDED #define RIPPLE_RPC_HANDLERS_HANDLERS_H_INCLUDED +#include + namespace ripple { Json::Value doAccountCurrencies (RPC::Context&); diff --git a/src/ripple/rpc/handlers/Internal.cpp b/src/ripple/rpc/handlers/Internal.cpp index 46cbe8d4a0..16064ea64d 100644 --- a/src/ripple/rpc/handlers/Internal.cpp +++ b/src/ripple/rpc/handlers/Internal.cpp @@ -18,7 +18,15 @@ //============================================================================== #include +#include +#include +#include +#include +#include +#include +#include #include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/LedgerAccept.cpp b/src/ripple/rpc/handlers/LedgerAccept.cpp index c0641425f4..101e491fa2 100644 --- a/src/ripple/rpc/handlers/LedgerAccept.cpp +++ b/src/ripple/rpc/handlers/LedgerAccept.cpp @@ -18,6 +18,15 @@ //============================================================================== #include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/rpc/handlers/LedgerCleanerHandler.cpp b/src/ripple/rpc/handlers/LedgerCleanerHandler.cpp index 6aebf773ff..ae5a509add 100644 --- a/src/ripple/rpc/handlers/LedgerCleanerHandler.cpp +++ b/src/ripple/rpc/handlers/LedgerCleanerHandler.cpp @@ -18,6 +18,11 @@ //============================================================================== #include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/LedgerClosed.cpp b/src/ripple/rpc/handlers/LedgerClosed.cpp index 5f64aaad1c..ed22619f88 100644 --- a/src/ripple/rpc/handlers/LedgerClosed.cpp +++ b/src/ripple/rpc/handlers/LedgerClosed.cpp @@ -18,6 +18,11 @@ //============================================================================== #include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/LedgerCurrent.cpp b/src/ripple/rpc/handlers/LedgerCurrent.cpp index 25050712bd..43e89802f0 100644 --- a/src/ripple/rpc/handlers/LedgerCurrent.cpp +++ b/src/ripple/rpc/handlers/LedgerCurrent.cpp @@ -18,6 +18,12 @@ //============================================================================== #include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/LedgerData.cpp b/src/ripple/rpc/handlers/LedgerData.cpp index c2daf9fd9a..cd03532064 100644 --- a/src/ripple/rpc/handlers/LedgerData.cpp +++ b/src/ripple/rpc/handlers/LedgerData.cpp @@ -18,6 +18,12 @@ //============================================================================== #include +#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/rpc/handlers/LedgerEntry.cpp b/src/ripple/rpc/handlers/LedgerEntry.cpp index 5fc38a782c..dffb254abb 100644 --- a/src/ripple/rpc/handlers/LedgerEntry.cpp +++ b/src/ripple/rpc/handlers/LedgerEntry.cpp @@ -19,7 +19,15 @@ #include #include +#include +#include +#include +#include +#include #include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/Ledger.cpp b/src/ripple/rpc/handlers/LedgerHandler.cpp similarity index 93% rename from src/ripple/rpc/handlers/Ledger.cpp rename to src/ripple/rpc/handlers/LedgerHandler.cpp index 8b62fe6fb5..9190005c6b 100644 --- a/src/ripple/rpc/handlers/Ledger.cpp +++ b/src/ripple/rpc/handlers/LedgerHandler.cpp @@ -18,11 +18,15 @@ //============================================================================== #include +#include #include +#include #include #include #include -#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/rpc/handlers/Ledger.h b/src/ripple/rpc/handlers/LedgerHandler.h similarity index 91% rename from src/ripple/rpc/handlers/Ledger.h rename to src/ripple/rpc/handlers/LedgerHandler.h index 60e4e7476e..3561270a68 100644 --- a/src/ripple/rpc/handlers/Ledger.h +++ b/src/ripple/rpc/handlers/LedgerHandler.h @@ -20,9 +20,16 @@ #ifndef RIPPLE_RPC_HANDLERS_LEDGER_H_INCLUDED #define RIPPLE_RPC_HANDLERS_LEDGER_H_INCLUDED +#include #include +#include +#include #include #include +#include +#include +#include +#include #include namespace Json { @@ -32,6 +39,8 @@ class Object; namespace ripple { namespace RPC { +struct Context; + // ledger [id|index|current|closed] [full] // { // ledger: 'current' | 'closed' | | , // optional diff --git a/src/ripple/rpc/handlers/LedgerHeader.cpp b/src/ripple/rpc/handlers/LedgerHeader.cpp index 49e2d0ee0d..8be13dce72 100644 --- a/src/ripple/rpc/handlers/LedgerHeader.cpp +++ b/src/ripple/rpc/handlers/LedgerHeader.cpp @@ -19,6 +19,10 @@ #include #include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/LedgerRequest.cpp b/src/ripple/rpc/handlers/LedgerRequest.cpp index 73bf951806..e4a02d6b49 100644 --- a/src/ripple/rpc/handlers/LedgerRequest.cpp +++ b/src/ripple/rpc/handlers/LedgerRequest.cpp @@ -20,6 +20,12 @@ #include #include #include +#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/rpc/handlers/LogLevel.cpp b/src/ripple/rpc/handlers/LogLevel.cpp index 476972a925..071a2ec211 100644 --- a/src/ripple/rpc/handlers/LogLevel.cpp +++ b/src/ripple/rpc/handlers/LogLevel.cpp @@ -18,6 +18,12 @@ //============================================================================== #include +#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/rpc/handlers/LogRotate.cpp b/src/ripple/rpc/handlers/LogRotate.cpp index e7dd9d4683..cf70bf3c8b 100644 --- a/src/ripple/rpc/handlers/LogRotate.cpp +++ b/src/ripple/rpc/handlers/LogRotate.cpp @@ -18,10 +18,12 @@ //============================================================================== #include +#include +#include namespace ripple { -Json::Value doLogRotate (RPC::Context& context) +Json::Value doLogRotate (RPC::Context&) { return RPC::makeObjectValue (deprecatedLogs().rotate()); } diff --git a/src/ripple/rpc/handlers/NoRippleCheck.cpp b/src/ripple/rpc/handlers/NoRippleCheck.cpp index 7ba096d268..8f4b083f20 100644 --- a/src/ripple/rpc/handlers/NoRippleCheck.cpp +++ b/src/ripple/rpc/handlers/NoRippleCheck.cpp @@ -19,9 +19,17 @@ #include #include -#include #include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/OwnerInfo.cpp b/src/ripple/rpc/handlers/OwnerInfo.cpp index c13c7cedf3..dc3eb83e9f 100644 --- a/src/ripple/rpc/handlers/OwnerInfo.cpp +++ b/src/ripple/rpc/handlers/OwnerInfo.cpp @@ -18,6 +18,13 @@ //============================================================================== #include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/PathFind.cpp b/src/ripple/rpc/handlers/PathFind.cpp index a212684959..f342f790f7 100644 --- a/src/ripple/rpc/handlers/PathFind.cpp +++ b/src/ripple/rpc/handlers/PathFind.cpp @@ -18,7 +18,15 @@ //============================================================================== #include +#include +#include +#include #include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/Peers.cpp b/src/ripple/rpc/handlers/Peers.cpp index 4c32e2f24f..c65458f586 100644 --- a/src/ripple/rpc/handlers/Peers.cpp +++ b/src/ripple/rpc/handlers/Peers.cpp @@ -18,13 +18,19 @@ //============================================================================== #include +#include #include #include +#include #include namespace ripple { -Json::Value doPeers (RPC::Context& context) +namespace RPC { +struct Context; +} + +Json::Value doPeers (RPC::Context&) { Json::Value jvResult (Json::objectValue); diff --git a/src/ripple/rpc/handlers/Ping.cpp b/src/ripple/rpc/handlers/Ping.cpp index 0235783a66..4be9d56f63 100644 --- a/src/ripple/rpc/handlers/Ping.cpp +++ b/src/ripple/rpc/handlers/Ping.cpp @@ -18,10 +18,15 @@ //============================================================================== #include +#include namespace ripple { -Json::Value doPing (RPC::Context& context) +namespace RPC { +struct Context; +} // RPC + +Json::Value doPing (RPC::Context&) { return Json::Value (Json::objectValue); } diff --git a/src/ripple/rpc/handlers/Print.cpp b/src/ripple/rpc/handlers/Print.cpp index 99409ac18d..1f237183c8 100644 --- a/src/ripple/rpc/handlers/Print.cpp +++ b/src/ripple/rpc/handlers/Print.cpp @@ -18,7 +18,11 @@ //============================================================================== #include +#include #include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/Random.cpp b/src/ripple/rpc/handlers/Random.cpp index 7fb3ac0694..ac016ac82b 100644 --- a/src/ripple/rpc/handlers/Random.cpp +++ b/src/ripple/rpc/handlers/Random.cpp @@ -20,14 +20,22 @@ #include #include #include +#include +#include +#include +#include namespace ripple { +namespace RPC { +struct Context; +} + // Result: // { // random: // } -Json::Value doRandom (RPC::Context& context) +Json::Value doRandom (RPC::Context&) { // TODO(tom): the try/catch is almost certainly redundant, we catch at the // top level too. diff --git a/src/ripple/rpc/handlers/RipplePathFind.cpp b/src/ripple/rpc/handlers/RipplePathFind.cpp index d6ae45d21b..6b2a012a0e 100644 --- a/src/ripple/rpc/handlers/RipplePathFind.cpp +++ b/src/ripple/rpc/handlers/RipplePathFind.cpp @@ -19,16 +19,31 @@ #include #include -#include +#include #include +#include #include #include +#include +#include #include -#include +#include +#include #include +#include +#include +#include +#include +#include +#include #include #include +#include +#include +#include #include +#include +#include #include namespace ripple { @@ -215,8 +230,7 @@ Json::Value doRipplePathFind (RPC::Context& context) } WriteLog (lsDEBUG, RPCHandler) - << boost::str (boost::format ("ripple_path_find< %s") - % jvResult); + << "ripple_path_find< %s" << jvResult; return jvResult; } diff --git a/src/ripple/rpc/handlers/ServerInfo.cpp b/src/ripple/rpc/handlers/ServerInfo.cpp index ed2f9a12c1..7c155f4b15 100644 --- a/src/ripple/rpc/handlers/ServerInfo.cpp +++ b/src/ripple/rpc/handlers/ServerInfo.cpp @@ -18,6 +18,12 @@ //============================================================================== #include +#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/rpc/handlers/ServerState.cpp b/src/ripple/rpc/handlers/ServerState.cpp index 5b9a992e7e..e84c45a5c5 100644 --- a/src/ripple/rpc/handlers/ServerState.cpp +++ b/src/ripple/rpc/handlers/ServerState.cpp @@ -18,6 +18,12 @@ //============================================================================== #include +#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/rpc/handlers/SignFor.cpp b/src/ripple/rpc/handlers/SignFor.cpp index f09aded63d..4c82ef94a3 100755 --- a/src/ripple/rpc/handlers/SignFor.cpp +++ b/src/ripple/rpc/handlers/SignFor.cpp @@ -18,6 +18,12 @@ //============================================================================== #include +#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/rpc/handlers/SignHandler.cpp b/src/ripple/rpc/handlers/SignHandler.cpp index 9355da0b38..aebe5fcac5 100644 --- a/src/ripple/rpc/handlers/SignHandler.cpp +++ b/src/ripple/rpc/handlers/SignHandler.cpp @@ -18,6 +18,13 @@ //============================================================================== #include +#include +#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/rpc/handlers/Stop.cpp b/src/ripple/rpc/handlers/Stop.cpp index 303250f04b..15599647e6 100644 --- a/src/ripple/rpc/handlers/Stop.cpp +++ b/src/ripple/rpc/handlers/Stop.cpp @@ -18,11 +18,18 @@ //============================================================================== #include +#include +#include +#include #include namespace ripple { -Json::Value doStop (RPC::Context& context) +namespace RPC { +struct Context; +} + +Json::Value doStop (RPC::Context&) { auto lock = beast::make_lock(getApp().getMasterMutex()); getApp().signalStop (); diff --git a/src/ripple/rpc/handlers/Submit.cpp b/src/ripple/rpc/handlers/Submit.cpp index 102d460d50..22186a12e3 100644 --- a/src/ripple/rpc/handlers/Submit.cpp +++ b/src/ripple/rpc/handlers/Submit.cpp @@ -18,7 +18,15 @@ //============================================================================== #include +#include #include +#include +#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/rpc/handlers/SubmitMultiSigned.cpp b/src/ripple/rpc/handlers/SubmitMultiSigned.cpp index 55f706f29d..a8ed8e08ac 100644 --- a/src/ripple/rpc/handlers/SubmitMultiSigned.cpp +++ b/src/ripple/rpc/handlers/SubmitMultiSigned.cpp @@ -16,7 +16,11 @@ //============================================================================== #include +#include #include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/Subscribe.cpp b/src/ripple/rpc/handlers/Subscribe.cpp index 5ab0710e55..0570e4fa27 100644 --- a/src/ripple/rpc/handlers/Subscribe.cpp +++ b/src/ripple/rpc/handlers/Subscribe.cpp @@ -18,8 +18,18 @@ //============================================================================== #include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include #include +#include #include namespace ripple { diff --git a/src/ripple/rpc/handlers/TransactionEntry.cpp b/src/ripple/rpc/handlers/TransactionEntry.cpp index cae3183529..a813123f88 100644 --- a/src/ripple/rpc/handlers/TransactionEntry.cpp +++ b/src/ripple/rpc/handlers/TransactionEntry.cpp @@ -18,6 +18,10 @@ //============================================================================== #include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/Tx.cpp b/src/ripple/rpc/handlers/Tx.cpp index 8518f20706..a5d08db9f0 100644 --- a/src/ripple/rpc/handlers/Tx.cpp +++ b/src/ripple/rpc/handlers/Tx.cpp @@ -18,7 +18,14 @@ //============================================================================== #include +#include +#include +#include #include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/rpc/handlers/TxHistory.cpp b/src/ripple/rpc/handlers/TxHistory.cpp index c620ec37b0..8715c49b9b 100644 --- a/src/ripple/rpc/handlers/TxHistory.cpp +++ b/src/ripple/rpc/handlers/TxHistory.cpp @@ -18,7 +18,17 @@ //============================================================================== #include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/UnlAdd.cpp b/src/ripple/rpc/handlers/UnlAdd.cpp index 1689eedca9..b9f8731771 100644 --- a/src/ripple/rpc/handlers/UnlAdd.cpp +++ b/src/ripple/rpc/handlers/UnlAdd.cpp @@ -18,8 +18,15 @@ //============================================================================== #include -#include #include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/UnlDelete.cpp b/src/ripple/rpc/handlers/UnlDelete.cpp index 871b36f9c2..0df45e093c 100644 --- a/src/ripple/rpc/handlers/UnlDelete.cpp +++ b/src/ripple/rpc/handlers/UnlDelete.cpp @@ -18,6 +18,13 @@ //============================================================================== #include +#include +#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/rpc/handlers/UnlList.cpp b/src/ripple/rpc/handlers/UnlList.cpp index 3a28077106..6b078da682 100644 --- a/src/ripple/rpc/handlers/UnlList.cpp +++ b/src/ripple/rpc/handlers/UnlList.cpp @@ -18,11 +18,18 @@ //============================================================================== #include +#include +#include +#include #include namespace ripple { -Json::Value doUnlList (RPC::Context& context) +namespace RPC { +struct Context; +} + +Json::Value doUnlList (RPC::Context&) { auto lock = beast::make_lock(getApp().getMasterMutex()); Json::Value obj (Json::objectValue); diff --git a/src/ripple/rpc/handlers/UnlLoad.cpp b/src/ripple/rpc/handlers/UnlLoad.cpp index 592b1ec481..80f063735d 100644 --- a/src/ripple/rpc/handlers/UnlLoad.cpp +++ b/src/ripple/rpc/handlers/UnlLoad.cpp @@ -18,6 +18,12 @@ //============================================================================== #include +#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/rpc/handlers/UnlNetwork.cpp b/src/ripple/rpc/handlers/UnlNetwork.cpp index 4272d9b2b6..cddb574342 100644 --- a/src/ripple/rpc/handlers/UnlNetwork.cpp +++ b/src/ripple/rpc/handlers/UnlNetwork.cpp @@ -18,12 +18,19 @@ //============================================================================== #include +#include +#include +#include #include namespace ripple { +namespace RPC { +struct Context; +} + // Populate the UNL from ripple.com's validators.txt file. -Json::Value doUnlNetwork (RPC::Context& context) +Json::Value doUnlNetwork (RPC::Context&) { auto lock = beast::make_lock(getApp().getMasterMutex()); getApp().getUNL ().nodeNetwork (); diff --git a/src/ripple/rpc/handlers/UnlReset.cpp b/src/ripple/rpc/handlers/UnlReset.cpp index 49e445a566..02a9e26dce 100644 --- a/src/ripple/rpc/handlers/UnlReset.cpp +++ b/src/ripple/rpc/handlers/UnlReset.cpp @@ -18,11 +18,18 @@ //============================================================================== #include +#include +#include +#include #include namespace ripple { -Json::Value doUnlReset (RPC::Context& context) +namespace RPC { +struct Context; +} + +Json::Value doUnlReset (RPC::Context&) { auto lock = beast::make_lock(getApp().getMasterMutex()); getApp().getUNL ().nodeReset (); diff --git a/src/ripple/rpc/handlers/UnlScore.cpp b/src/ripple/rpc/handlers/UnlScore.cpp index 12584a217f..7c4e21b3c2 100644 --- a/src/ripple/rpc/handlers/UnlScore.cpp +++ b/src/ripple/rpc/handlers/UnlScore.cpp @@ -19,6 +19,13 @@ #include #include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/Unsubscribe.cpp b/src/ripple/rpc/handlers/Unsubscribe.cpp index 858c6acf94..a1c1b62522 100644 --- a/src/ripple/rpc/handlers/Unsubscribe.cpp +++ b/src/ripple/rpc/handlers/Unsubscribe.cpp @@ -18,6 +18,13 @@ //============================================================================== #include +#include +#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/rpc/handlers/ValidationCreate.cpp b/src/ripple/rpc/handlers/ValidationCreate.cpp index 8db8e4fc7b..afb8952c22 100644 --- a/src/ripple/rpc/handlers/ValidationCreate.cpp +++ b/src/ripple/rpc/handlers/ValidationCreate.cpp @@ -18,6 +18,12 @@ //============================================================================== #include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/ValidationSeed.cpp b/src/ripple/rpc/handlers/ValidationSeed.cpp index 947ae47549..a4cda0dc0f 100644 --- a/src/ripple/rpc/handlers/ValidationSeed.cpp +++ b/src/ripple/rpc/handlers/ValidationSeed.cpp @@ -18,7 +18,14 @@ //============================================================================== #include +#include +#include +#include +#include +#include +#include #include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/WalletPropose.cpp b/src/ripple/rpc/handlers/WalletPropose.cpp index 6819a5071d..64caeaba14 100644 --- a/src/ripple/rpc/handlers/WalletPropose.cpp +++ b/src/ripple/rpc/handlers/WalletPropose.cpp @@ -18,8 +18,13 @@ //============================================================================== #include +#include #include +#include +#include +#include #include +#include #include #include diff --git a/src/ripple/rpc/handlers/WalletSeed.cpp b/src/ripple/rpc/handlers/WalletSeed.cpp index 82a966657a..8cd6ad30b1 100644 --- a/src/ripple/rpc/handlers/WalletSeed.cpp +++ b/src/ripple/rpc/handlers/WalletSeed.cpp @@ -18,6 +18,11 @@ //============================================================================== #include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/impl/AccountFromString.cpp b/src/ripple/rpc/impl/AccountFromString.cpp index 213a44d818..a57f19d4d4 100644 --- a/src/ripple/rpc/impl/AccountFromString.cpp +++ b/src/ripple/rpc/impl/AccountFromString.cpp @@ -18,6 +18,11 @@ //============================================================================== #include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/rpc/impl/Accounts.h b/src/ripple/rpc/impl/Accounts.h index ddc61df522..08f77eb4f2 100644 --- a/src/ripple/rpc/impl/Accounts.h +++ b/src/ripple/rpc/impl/Accounts.h @@ -23,6 +23,9 @@ #include namespace ripple { + +class NetworkOPs; + namespace RPC { Json::Value accounts ( diff --git a/src/ripple/rpc/impl/DoPrint.h b/src/ripple/rpc/impl/DoPrint.h index 9a9c6067cf..7d33ec6d95 100644 --- a/src/ripple/rpc/impl/DoPrint.h +++ b/src/ripple/rpc/impl/DoPrint.h @@ -22,6 +22,7 @@ #include #include +#include namespace ripple { namespace RPC { diff --git a/src/ripple/rpc/impl/Handler.cpp b/src/ripple/rpc/impl/Handler.cpp index 1703b417b9..f80a29dece 100644 --- a/src/ripple/rpc/impl/Handler.cpp +++ b/src/ripple/rpc/impl/Handler.cpp @@ -20,7 +20,6 @@ #include #include #include -#include #include namespace ripple { diff --git a/src/ripple/rpc/impl/KeypairForSignature.cpp b/src/ripple/rpc/impl/KeypairForSignature.cpp index 4b5e5b87f8..1216af2a74 100644 --- a/src/ripple/rpc/impl/KeypairForSignature.cpp +++ b/src/ripple/rpc/impl/KeypairForSignature.cpp @@ -18,6 +18,10 @@ //============================================================================== #include +#include +#include +#include +#include #include #include diff --git a/src/ripple/rpc/impl/LegacyPathFind.cpp b/src/ripple/rpc/impl/LegacyPathFind.cpp index 5e60251326..4407648d4a 100644 --- a/src/ripple/rpc/impl/LegacyPathFind.cpp +++ b/src/ripple/rpc/impl/LegacyPathFind.cpp @@ -18,8 +18,12 @@ //============================================================================== #include -#include +#include +#include +#include #include +#include +#include namespace ripple { namespace RPC { diff --git a/src/ripple/rpc/impl/LegacyPathFind.h b/src/ripple/rpc/impl/LegacyPathFind.h index 75e8591454..68adbd7e86 100644 --- a/src/ripple/rpc/impl/LegacyPathFind.h +++ b/src/ripple/rpc/impl/LegacyPathFind.h @@ -20,6 +20,8 @@ #ifndef RIPPLE_RPC_LEGACYPATHFIND_H_INCLUDED #define RIPPLE_RPC_LEGACYPATHFIND_H_INCLUDED +#include + namespace ripple { namespace RPC { diff --git a/src/ripple/rpc/impl/LookupLedger.cpp b/src/ripple/rpc/impl/LookupLedger.cpp index 19bcdf2227..896b2c3e4e 100644 --- a/src/ripple/rpc/impl/LookupLedger.cpp +++ b/src/ripple/rpc/impl/LookupLedger.cpp @@ -18,8 +18,15 @@ //============================================================================== #include -#include +#include +#include +#include +#include +#include #include +#include +#include +#include namespace ripple { namespace RPC { diff --git a/src/ripple/rpc/impl/LookupLedger.h b/src/ripple/rpc/impl/LookupLedger.h index 0c0caac98c..d90dda44aa 100644 --- a/src/ripple/rpc/impl/LookupLedger.h +++ b/src/ripple/rpc/impl/LookupLedger.h @@ -20,15 +20,20 @@ #ifndef RIPPLE_RPC_LOOKUPLEDGER_H_INCLUDED #define RIPPLE_RPC_LOOKUPLEDGER_H_INCLUDED +#include #include +namespace Json { +class Value; +} + namespace ripple { class ReadView; namespace RPC { -class Context; +struct Context; /** Look up a ledger from a request and fill a Json::Result with either an error, or data representing a ledger. diff --git a/src/ripple/rpc/impl/RPCHandler.cpp b/src/ripple/rpc/impl/RPCHandler.cpp index a1ed6850c7..1636fc2b8a 100644 --- a/src/ripple/rpc/impl/RPCHandler.cpp +++ b/src/ripple/rpc/impl/RPCHandler.cpp @@ -18,6 +18,7 @@ //============================================================================== #include +#include #include #include #include @@ -33,6 +34,7 @@ #include #include #include +#include #include #include diff --git a/src/ripple/rpc/impl/TransactionSign.cpp b/src/ripple/rpc/impl/TransactionSign.cpp index 3fad0a0ee4..2efb872eb2 100644 --- a/src/ripple/rpc/impl/TransactionSign.cpp +++ b/src/ripple/rpc/impl/TransactionSign.cpp @@ -18,19 +18,24 @@ //============================================================================== #include +#include #include -#include -#include #include -#include -#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { - -//------------------------------------------------------------------------------ - - namespace RPC { namespace detail { @@ -301,7 +306,7 @@ bool TxnSignApiFacade::isLoadedCluster () const @return A JSON object containing the error results, if any */ -static Json::Value checkFee ( +Json::Value checkFee ( Json::Value& request, TxnSignApiFacade& apiFacade, Role const role, diff --git a/src/ripple/rpc/impl/TransactionSign.h b/src/ripple/rpc/impl/TransactionSign.h index 8cf6a348e5..e467ccb021 100644 --- a/src/ripple/rpc/impl/TransactionSign.h +++ b/src/ripple/rpc/impl/TransactionSign.h @@ -20,6 +20,10 @@ #ifndef RIPPLE_RPC_TRANSACTIONSIGN_H_INCLUDED #define RIPPLE_RPC_TRANSACTIONSIGN_H_INCLUDED +#include +#include +#include + namespace ripple { namespace RPC { @@ -106,7 +110,7 @@ enum class AutoFill : unsigned char might }; -static Json::Value checkFee ( +Json::Value checkFee ( Json::Value& request, TxnSignApiFacade& apiFacade, Role const role, @@ -123,7 +127,8 @@ Json::Value transactionSign ( Role role); /** Returns a Json::objectValue. */ -inline Json::Value transactionSign ( +inline +Json::Value transactionSign ( Json::Value const& params, NetworkOPs::FailHard failType, NetworkOPs& netOPs, @@ -141,6 +146,7 @@ Json::Value transactionSubmit ( Role role); /** Returns a Json::objectValue. */ +inline Json::Value transactionSubmit ( Json::Value const& params, NetworkOPs::FailHard failType, @@ -159,6 +165,7 @@ Json::Value transactionSignFor ( Role role); /** Returns a Json::objectValue. */ +inline Json::Value transactionSignFor ( Json::Value const& params, NetworkOPs::FailHard failType, @@ -177,6 +184,7 @@ Json::Value transactionSubmitMultiSigned ( Role role); /** Returns a Json::objectValue. */ +inline Json::Value transactionSubmitMultiSigned ( Json::Value const& params, NetworkOPs::FailHard failType, diff --git a/src/ripple/rpc/impl/Utilities.cpp b/src/ripple/rpc/impl/Utilities.cpp index 14e93c5ca5..262267ed2f 100644 --- a/src/ripple/rpc/impl/Utilities.cpp +++ b/src/ripple/rpc/impl/Utilities.cpp @@ -18,6 +18,8 @@ //============================================================================== #include +#include +#include namespace ripple { namespace RPC { diff --git a/src/ripple/rpc/impl/Utilities.h b/src/ripple/rpc/impl/Utilities.h index 9ea0d4302e..5e554e37c4 100644 --- a/src/ripple/rpc/impl/Utilities.h +++ b/src/ripple/rpc/impl/Utilities.h @@ -20,13 +20,23 @@ #ifndef RIPPLE_RPC_IMPL_UTILITIES_H_INCLUDED #define RIPPLE_RPC_IMPL_UTILITIES_H_INCLUDED +#include +#include + +namespace Json { +class Value; +} + namespace ripple { + namespace RPC { +struct Context; + void addPaymentDeliveredAmount ( Json::Value&, - RPC::Context&, + Context&, Transaction::pointer, TxMeta::pointer); diff --git a/src/ripple/rpc/impl/Yield.cpp b/src/ripple/rpc/impl/Yield.cpp index 55406603f3..c7f3b3fcce 100644 --- a/src/ripple/rpc/impl/Yield.cpp +++ b/src/ripple/rpc/impl/Yield.cpp @@ -18,6 +18,7 @@ //============================================================================== #include +#include #include #include diff --git a/src/ripple/rpc/tests/Coroutine.test.cpp b/src/ripple/rpc/tests/Coroutine.test.cpp index ab42cf53cd..4e125bddc7 100644 --- a/src/ripple/rpc/tests/Coroutine.test.cpp +++ b/src/ripple/rpc/tests/Coroutine.test.cpp @@ -72,24 +72,6 @@ public: Coroutine (suspendCallback).run(); expectCollectionEquals (result, expected); - - static - auto const printResults = false; - if (! printResults) - return; - - std::string indent1 = " "; - std::string indent2 = indent1 + " "; - - std::cerr << indent1 << "test (" + name + ", {"; - for (auto i = 0; i < result.size(); ++i) { - if (i) - std::cerr << ","; - std::cerr << "\n" << indent2; - std::cerr << '"' << result[i] << '"'; - } - std::cerr << "\n" << indent2 << "});\n"; - expect(true); } void run() override diff --git a/src/ripple/rpc/tests/KeyGeneration.test.cpp b/src/ripple/rpc/tests/KeyGeneration.test.cpp index 7590e027d8..5a6931990e 100644 --- a/src/ripple/rpc/tests/KeyGeneration.test.cpp +++ b/src/ripple/rpc/tests/KeyGeneration.test.cpp @@ -20,6 +20,10 @@ #include #include #include +#include +#include +#include +#include #include #include @@ -125,13 +129,13 @@ public: void testKeyType (char const* keyType, key_strings const& strings) { testcase (keyType); - + Json::Value params; params[jss::key_type] = keyType; params[jss::passphrase] = common::passphrase; testSecretWallet (params, strings); - + params[jss::seed] = strings.master_seed; // Secret fields are mutually exclusive. @@ -214,13 +218,13 @@ public: void testKeyType (char const* keyType, key_strings const& strings) { testcase (keyType); - + Json::Value params; params[jss::key_type] = keyType; params[jss::passphrase] = common::passphrase; testSecretWallet (params, strings); - + params[jss::seed] = strings.master_seed; // Secret fields are mutually exclusive. diff --git a/src/ripple/unity/rpcx.cpp b/src/ripple/unity/rpcx.cpp index eb594fdc6a..79cf6b87d3 100644 --- a/src/ripple/unity/rpcx.cpp +++ b/src/ripple/unity/rpcx.cpp @@ -51,7 +51,7 @@ #include #include #include -#include +#include #include #include #include