From 39719f4c17daf4c4dd0f0b77ba32dfc21fe8c1d9 Mon Sep 17 00:00:00 2001 From: Tom Ritchford Date: Thu, 5 Jun 2014 20:13:12 -0400 Subject: [PATCH] Rearrange branch in accordance with new practices. --- src/ripple/module/app/rpc/RPCHandler.cpp | 2 - .../module/rpc}/handlers/LedgerGet.cpp | 15 +-- .../module/rpc/handlers/ProofCreate.cpp | 2 +- src/ripple/module/rpc/impl/Handlers.cpp | 91 ------------------- .../module/rpc/impl/TransactionSign.cpp | 1 + src/ripple/unity/rpcx.cpp | 78 +++++++++++++++- src/ripple_rpc/impl/Handlers.cpp | 91 ------------------- 7 files changed, 83 insertions(+), 197 deletions(-) rename src/{ripple_rpc => ripple/module/rpc}/handlers/LedgerGet.cpp (96%) delete mode 100644 src/ripple/module/rpc/impl/Handlers.cpp delete mode 100644 src/ripple_rpc/impl/Handlers.cpp diff --git a/src/ripple/module/app/rpc/RPCHandler.cpp b/src/ripple/module/app/rpc/RPCHandler.cpp index cddc2fd1c..260f8b5b7 100644 --- a/src/ripple/module/app/rpc/RPCHandler.cpp +++ b/src/ripple/module/app/rpc/RPCHandler.cpp @@ -17,8 +17,6 @@ */ //============================================================================== -#include - namespace ripple { // diff --git a/src/ripple_rpc/handlers/LedgerGet.cpp b/src/ripple/module/rpc/handlers/LedgerGet.cpp similarity index 96% rename from src/ripple_rpc/handlers/LedgerGet.cpp rename to src/ripple/module/rpc/handlers/LedgerGet.cpp index 99eda3721..62d69cb1f 100644 --- a/src/ripple_rpc/handlers/LedgerGet.cpp +++ b/src/ripple/module/rpc/handlers/LedgerGet.cpp @@ -43,15 +43,12 @@ Json::Value RPCHandler::doLedgerGet ( "Exactly one of ledger_hash and ledger_index can be set."); } - if (hasHas) + if (hasHash) { auto const& jsonHash = params[jss::ledger_hash]; if (!jsonHash.isString() || !ledgerHash.SetHex (jsonHash.asString ())) return RPC::invalid_field_message ("ledger_hash"); - } - else - { - + } else { auto const& jsonIndex = params[jss::ledger_index]; if (!jsonIndex.isNumeric ()) return RPC::invalid_field_message ("ledger_index"); @@ -69,7 +66,7 @@ Json::Value RPCHandler::doLedgerGet ( // Try to get the hash of the desired ledger from the validated ledger ledgerHash = ledger->getLedgerHash (ledgerIndex); - if (ledgerHash.isZero ()) + if (ledgerHash == zero) { // Find a ledger more likely to have the hash of the desired ledger auto refIndex = (ledgerIndex + 255) & (~255); @@ -79,8 +76,8 @@ Json::Value RPCHandler::doLedgerGet ( ledger = ledgerMaster.getLedgerByHash (refHash); if (!ledger) { - // We don't have the ledger we need to figure out whihc - // ledger they want. Try to get it. + // We don't have the ledger we need to figure out which ledger + // they want. Try to get it. getApp().getInboundLedgers().findCreate ( refHash, refIndex, InboundLedger::fcGENERIC); @@ -92,7 +89,6 @@ Json::Value RPCHandler::doLedgerGet ( ledgerHash = ledger->getLedgerHash (ledgerIndex); assert (ledgerHash.isNonZero ()); } - } auto ledger = ledgerMaster.getLedgerByHash (ledgerHash); @@ -111,7 +107,6 @@ Json::Value RPCHandler::doLedgerGet ( ledgerHash, 0, InboundLedger::fcGENERIC); return il->getJson (0); } - } } // ripple diff --git a/src/ripple/module/rpc/handlers/ProofCreate.cpp b/src/ripple/module/rpc/handlers/ProofCreate.cpp index 3f4dcc513..7d197971a 100644 --- a/src/ripple/module/rpc/handlers/ProofCreate.cpp +++ b/src/ripple/module/rpc/handlers/ProofCreate.cpp @@ -17,10 +17,10 @@ */ //============================================================================== +#include namespace ripple { - // { // // if either of these parameters is set, a custom generator is used // difficulty: // optional diff --git a/src/ripple/module/rpc/impl/Handlers.cpp b/src/ripple/module/rpc/impl/Handlers.cpp deleted file mode 100644 index ba0ef796a..000000000 --- a/src/ripple/module/rpc/impl/Handlers.cpp +++ /dev/null @@ -1,91 +0,0 @@ -//------------------------------------------------------------------------------ -/* - This file is part of rippled: https://github.com/ripple/rippled - Copyright (c) 2012-2014 Ripple Labs Inc. - - Permission to use, copy, modify, and/or distribute this software for any - purpose with or without fee is hereby granted, provided that the above - copyright notice and this permission notice appear in all copies. - - THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -*/ -//============================================================================== - -#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 -#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 -#include -#include -#include -#include -#include -#include -#include - -#include -#include - diff --git a/src/ripple/module/rpc/impl/TransactionSign.cpp b/src/ripple/module/rpc/impl/TransactionSign.cpp index c1ca12811..6ca71b2bf 100644 --- a/src/ripple/module/rpc/impl/TransactionSign.cpp +++ b/src/ripple/module/rpc/impl/TransactionSign.cpp @@ -18,6 +18,7 @@ //============================================================================== #include +#include namespace ripple { diff --git a/src/ripple/unity/rpcx.cpp b/src/ripple/unity/rpcx.cpp index dc368b102..1aa99f0a6 100644 --- a/src/ripple/unity/rpcx.cpp +++ b/src/ripple/unity/rpcx.cpp @@ -19,12 +19,86 @@ #include -#include - // Unfortunate but necessary since RPC handlers can literally do anything #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 +#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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include diff --git a/src/ripple_rpc/impl/Handlers.cpp b/src/ripple_rpc/impl/Handlers.cpp deleted file mode 100644 index d73c057a0..000000000 --- a/src/ripple_rpc/impl/Handlers.cpp +++ /dev/null @@ -1,91 +0,0 @@ -//------------------------------------------------------------------------------ -/* - This file is part of rippled: https://github.com/ripple/rippled - Copyright (c) 2012-2014 Ripple Labs Inc. - - Permission to use, copy, modify, and/or distribute this software for any - purpose with or without fee is hereby granted, provided that the above - copyright notice and this permission notice appear in all copies. - - THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -*/ -//============================================================================== - -#include "../handlers/AccountCurrencies.cpp" -#include "../handlers/AccountInfo.cpp" -#include "../handlers/AccountLines.cpp" -#include "../handlers/AccountOffers.cpp" -#include "../handlers/AccountTx.cpp" -#include "../handlers/AccountTxOld.cpp" -#include "../handlers/AccountTxSwitch.cpp" -#include "../handlers/BlackList.cpp" -#include "../handlers/BookOffers.cpp" -#include "../handlers/Connect.cpp" -#include "../handlers/ConsensusInfo.cpp" -#include "../handlers/Feature.cpp" -#include "../handlers/FetchInfo.cpp" -#include "../handlers/GetCounts.cpp" -#include "../handlers/Ledger.cpp" -#include "../handlers/LedgerAccept.cpp" -#include "../handlers/LedgerCleaner.cpp" -#include "../handlers/LedgerClosed.cpp" -#include "../handlers/LedgerCurrent.cpp" -#include "../handlers/LedgerData.cpp" -#include "../handlers/LedgerEntry.cpp" -#include "../handlers/LedgerHeader.cpp" -#include "../handlers/LogLevel.cpp" -#include "../handlers/LogRotate.cpp" -#include "../handlers/NicknameInfo.cpp" -#include "../handlers/OwnerInfo.cpp" -#include "../handlers/PathFind.cpp" -#include "../handlers/Peers.cpp" -#include "../handlers/Ping.cpp" -#include "../handlers/Print.cpp" -#include "../handlers/Profile.cpp" -#include "../handlers/ProofCreate.cpp" -#include "../handlers/ProofSolve.cpp" -#include "../handlers/ProofVerify.cpp" -#include "../handlers/Random.cpp" -#include "../handlers/RipplePathFind.cpp" -#include "../handlers/SMS.cpp" -#include "../handlers/ServerInfo.cpp" -#include "../handlers/ServerState.cpp" -#include "../handlers/Sign.cpp" -#include "../handlers/Stop.cpp" -#include "../handlers/Submit.cpp" -#include "../handlers/Subscribe.cpp" -#include "../handlers/TransactionEntry.cpp" -#include "../handlers/Tx.cpp" -#include "../handlers/TxHistory.cpp" -#include "../handlers/UnlAdd.cpp" -#include "../handlers/UnlDelete.cpp" -#include "../handlers/UnlList.cpp" -#include "../handlers/UnlLoad.cpp" -#include "../handlers/UnlNetwork.cpp" -#include "../handlers/UnlReset.cpp" -#include "../handlers/UnlScore.cpp" -#include "../handlers/Unsubscribe.cpp" -#include "../handlers/ValidationCreate.cpp" -#include "../handlers/ValidationSeed.cpp" -#include "../handlers/WalletAccounts.cpp" -#include "../handlers/WalletPropose.cpp" -#include "../handlers/WalletSeed.cpp" - -#include "AccountFromString.cpp" -#include "Accounts.cpp" -#include "Authorize.cpp" -#include "GetMasterGenerator.cpp" -#include "LegacyPathFind.cpp" -#include "LookupLedger.cpp" -#include "ParseAccountIds.cpp" -#include "TransactionSign.cpp" - -#include "../../ripple_overlay/api/Overlay.h" -#include -