diff --git a/Builds/VisualStudio2015/RippleD.vcxproj b/Builds/VisualStudio2015/RippleD.vcxproj index 2023d4e96..caf586417 100644 --- a/Builds/VisualStudio2015/RippleD.vcxproj +++ b/Builds/VisualStudio2015/RippleD.vcxproj @@ -1356,6 +1356,10 @@ True True + + True + True + True True @@ -1380,14 +1384,30 @@ True True + + True + True + True True + + True + True + + + + + True + True + + + True True @@ -1416,6 +1436,8 @@ + + @@ -1426,6 +1448,8 @@ + + True True @@ -1510,6 +1534,10 @@ + + True + True + True True @@ -1530,6 +1558,8 @@ + + @@ -1774,14 +1804,6 @@ - - True - True - - - True - True - @@ -1838,34 +1860,12 @@ - - True - True - - - True - True - - - True - True - True True - - - - - - - - - - diff --git a/Builds/VisualStudio2015/RippleD.vcxproj.filters b/Builds/VisualStudio2015/RippleD.vcxproj.filters index ad0fc1a76..fb23071b8 100644 --- a/Builds/VisualStudio2015/RippleD.vcxproj.filters +++ b/Builds/VisualStudio2015/RippleD.vcxproj.filters @@ -2097,6 +2097,9 @@ ripple\app\ledger\impl + + ripple\app\ledger\impl + ripple\app\ledger\impl @@ -2118,15 +2121,30 @@ ripple\app\ledger\impl + + ripple\app\ledger\impl + ripple\app\ledger\impl + + ripple\app\ledger\impl + + + ripple\app\ledger\impl + + + ripple\app\ledger\impl + ripple\app\ledger ripple\app\ledger + + ripple\app\ledger + ripple\app\ledger @@ -2160,6 +2178,9 @@ ripple\app\ledger + + ripple\app\ledger + ripple\app\ledger @@ -2172,6 +2193,9 @@ ripple\app\ledger + + ripple\app\ledger + ripple\app\ledger @@ -2256,6 +2280,9 @@ ripple\app\misc\impl + + ripple\app\misc\impl + ripple\app\misc\impl @@ -2277,6 +2304,9 @@ ripple\app\misc + + ripple\app\misc + ripple\app\misc @@ -2502,12 +2532,6 @@ ripple\app\tx\impl - - ripple\app\tx\impl - - - ripple\app\tx\impl - ripple\app\tx\impl @@ -2565,36 +2589,12 @@ ripple\app\tx\impl - - ripple\app\tx\impl - - - ripple\app\tx\impl - - - ripple\app\tx\impl - ripple\app\tx\impl ripple\app\tx\impl - - ripple\app\tx - - - ripple\app\tx - - - ripple\app\tx - - - ripple\app\tx - - - ripple\app\tx - ripple\basics diff --git a/src/ripple/app/ledger/AccountStateSF.cpp b/src/ripple/app/ledger/AccountStateSF.cpp index 29a33182f..8dcba9a86 100644 --- a/src/ripple/app/ledger/AccountStateSF.cpp +++ b/src/ripple/app/ledger/AccountStateSF.cpp @@ -20,9 +20,9 @@ #include #include #include +#include #include #include -#include #include #include diff --git a/src/ripple/app/ledger/Consensus.h b/src/ripple/app/ledger/Consensus.h index c75884563..a54374a30 100644 --- a/src/ripple/app/ledger/Consensus.h +++ b/src/ripple/app/ledger/Consensus.h @@ -22,9 +22,8 @@ #include #include +#include #include -#include -#include #include #include @@ -32,6 +31,8 @@ namespace ripple { +class LocalTxs; + /** Implements the consensus process and provides inter-round state. */ class Consensus { diff --git a/src/ripple/app/ledger/ConsensusTransSetSF.cpp b/src/ripple/app/ledger/ConsensusTransSetSF.cpp index 8382fce8f..374bc43ac 100644 --- a/src/ripple/app/ledger/ConsensusTransSetSF.cpp +++ b/src/ripple/app/ledger/ConsensusTransSetSF.cpp @@ -19,9 +19,10 @@ #include #include +#include #include #include -#include +#include #include #include #include diff --git a/src/ripple/app/tx/InboundTransactions.h b/src/ripple/app/ledger/InboundTransactions.h similarity index 95% rename from src/ripple/app/tx/InboundTransactions.h rename to src/ripple/app/ledger/InboundTransactions.h index 492fa4d33..5eeeca104 100644 --- a/src/ripple/app/tx/InboundTransactions.h +++ b/src/ripple/app/ledger/InboundTransactions.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_INBOUNDTRANSACTIONS_H -#define RIPPLE_INBOUNDTRANSACTIONS_H +#ifndef RIPPLE_APP_LEDGER_INBOUNDTRANSACTIONS_H_INCLUDED +#define RIPPLE_APP_LEDGER_INBOUNDTRANSACTIONS_H_INCLUDED #include #include @@ -28,6 +28,8 @@ namespace ripple { +class Application; + /** Manages the acquisition and lifetime of transaction sets. */ diff --git a/src/ripple/app/ledger/Ledger.cpp b/src/ripple/app/ledger/Ledger.cpp index 4d2df6b5d..acf8fe9dc 100644 --- a/src/ripple/app/ledger/Ledger.cpp +++ b/src/ripple/app/ledger/Ledger.cpp @@ -26,10 +26,10 @@ #include #include #include +#include #include #include #include -#include #include #include #include diff --git a/src/ripple/app/ledger/Ledger.h b/src/ripple/app/ledger/Ledger.h index ba1ad03e7..b360e3eb2 100644 --- a/src/ripple/app/ledger/Ledger.h +++ b/src/ripple/app/ledger/Ledger.h @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include diff --git a/src/ripple/app/ledger/LedgerConsensus.h b/src/ripple/app/ledger/LedgerConsensus.h index e26d5835d..096f17e90 100644 --- a/src/ripple/app/ledger/LedgerConsensus.h +++ b/src/ripple/app/ledger/LedgerConsensus.h @@ -22,11 +22,10 @@ #include #include +#include #include #include #include -#include -#include #include #include #include diff --git a/src/ripple/app/ledger/LedgerMaster.h b/src/ripple/app/ledger/LedgerMaster.h index f3266ff2c..b9e6bc509 100644 --- a/src/ripple/app/ledger/LedgerMaster.h +++ b/src/ripple/app/ledger/LedgerMaster.h @@ -38,6 +38,7 @@ namespace ripple { class Peer; +class Transaction; struct LedgerReplay { @@ -136,7 +137,7 @@ public: virtual uint256 getLedgerHash( std::uint32_t desiredSeq, Ledger::ref knownGoodLedger) = 0; - virtual void addHeldTransaction (Transaction::ref trans) = 0; + virtual void addHeldTransaction (std::shared_ptr const& trans) = 0; virtual void fixMismatch (Ledger::ref ledger) = 0; virtual bool haveLedger (std::uint32_t seq) = 0; diff --git a/src/ripple/app/tx/LocalTxs.h b/src/ripple/app/ledger/LocalTxs.h similarity index 95% rename from src/ripple/app/tx/LocalTxs.h rename to src/ripple/app/ledger/LocalTxs.h index 02e3fb208..2af152293 100644 --- a/src/ripple/app/tx/LocalTxs.h +++ b/src/ripple/app/ledger/LocalTxs.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_APP_TX_LOCALTXS_H_INCLUDED -#define RIPPLE_APP_TX_LOCALTXS_H_INCLUDED +#ifndef RIPPLE_APP_LEDGER_LOCALTXS_H_INCLUDED +#define RIPPLE_APP_LEDGER_LOCALTXS_H_INCLUDED #include #include diff --git a/src/ripple/app/tx/TransactionMaster.h b/src/ripple/app/ledger/TransactionMaster.h similarity index 84% rename from src/ripple/app/tx/TransactionMaster.h rename to src/ripple/app/ledger/TransactionMaster.h index b257e4e2b..8cbb562e7 100644 --- a/src/ripple/app/tx/TransactionMaster.h +++ b/src/ripple/app/ledger/TransactionMaster.h @@ -17,16 +17,17 @@ */ //============================================================================== -#ifndef RIPPLE_APP_TX_TRANSACTIONMASTER_H_INCLUDED -#define RIPPLE_APP_TX_TRANSACTIONMASTER_H_INCLUDED +#ifndef RIPPLE_APP_LEDGER_TRANSACTIONMASTER_H_INCLUDED +#define RIPPLE_APP_LEDGER_TRANSACTIONMASTER_H_INCLUDED -#include #include #include namespace ripple { class Application; +class Transaction; +class STTx; // Tracks all transactions in memory @@ -37,18 +38,18 @@ public: TransactionMaster (TransactionMaster const&) = delete; TransactionMaster& operator= (TransactionMaster const&) = delete; - Transaction::pointer + std::shared_ptr fetch (uint256 const& , bool checkDisk); std::shared_ptr fetch (std::shared_ptr const& item, - SHAMapTreeNode:: TNType type, - bool checkDisk, std::uint32_t uCommitLedger); + SHAMapTreeNode::TNType type, bool checkDisk, + std::uint32_t uCommitLedger); // return value: true = we had the transaction already bool inLedger (uint256 const& hash, std::uint32_t ledger); - void canonicalize (Transaction::pointer* pTransaction); + void canonicalize (std::shared_ptr* pTransaction); void sweep (void); diff --git a/src/ripple/app/ledger/TransactionStateSF.cpp b/src/ripple/app/ledger/TransactionStateSF.cpp index 6ea43bfdd..3d93fb111 100644 --- a/src/ripple/app/ledger/TransactionStateSF.cpp +++ b/src/ripple/app/ledger/TransactionStateSF.cpp @@ -18,11 +18,11 @@ //============================================================================== #include -#include #include +#include +#include #include #include -#include #include #include diff --git a/src/ripple/app/tx/impl/InboundTransactions.cpp b/src/ripple/app/ledger/impl/InboundTransactions.cpp similarity index 98% rename from src/ripple/app/tx/impl/InboundTransactions.cpp rename to src/ripple/app/ledger/impl/InboundTransactions.cpp index c8a7b4b1f..667f9d0b3 100644 --- a/src/ripple/app/tx/impl/InboundTransactions.cpp +++ b/src/ripple/app/ledger/impl/InboundTransactions.cpp @@ -18,9 +18,9 @@ //============================================================================== #include +#include #include -#include -#include +#include #include #include #include diff --git a/src/ripple/app/ledger/impl/LedgerConsensusImp.cpp b/src/ripple/app/ledger/impl/LedgerConsensusImp.cpp index 7b91afcf3..dd6e69957 100644 --- a/src/ripple/app/ledger/impl/LedgerConsensusImp.cpp +++ b/src/ripple/app/ledger/impl/LedgerConsensusImp.cpp @@ -22,9 +22,11 @@ #include #include #include +#include #include #include #include +#include #include #include #include @@ -32,7 +34,6 @@ #include #include #include -#include #include #include #include diff --git a/src/ripple/app/ledger/impl/LedgerMaster.cpp b/src/ripple/app/ledger/impl/LedgerMaster.cpp index 105c11394..8e8f00631 100644 --- a/src/ripple/app/ledger/impl/LedgerMaster.cpp +++ b/src/ripple/app/ledger/impl/LedgerMaster.cpp @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -315,7 +316,8 @@ public: mPubLedgerSeq = l->info().seq; } - void addHeldTransaction (Transaction::ref transaction) override + void addHeldTransaction ( + std::shared_ptr const& transaction) override { // returns true if transaction was added ScopedLockType ml (m_mutex); diff --git a/src/ripple/app/tx/impl/LocalTxs.cpp b/src/ripple/app/ledger/impl/LocalTxs.cpp similarity index 99% rename from src/ripple/app/tx/impl/LocalTxs.cpp rename to src/ripple/app/ledger/impl/LocalTxs.cpp index a3f1bd343..9752b9750 100644 --- a/src/ripple/app/tx/impl/LocalTxs.cpp +++ b/src/ripple/app/ledger/impl/LocalTxs.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include #include diff --git a/src/ripple/app/tx/impl/TransactionAcquire.cpp b/src/ripple/app/ledger/impl/TransactionAcquire.cpp similarity index 98% rename from src/ripple/app/tx/impl/TransactionAcquire.cpp rename to src/ripple/app/ledger/impl/TransactionAcquire.cpp index a271cb873..e40d252f8 100644 --- a/src/ripple/app/tx/impl/TransactionAcquire.cpp +++ b/src/ripple/app/ledger/impl/TransactionAcquire.cpp @@ -18,12 +18,12 @@ //============================================================================== #include +#include #include #include +#include #include #include -#include -#include #include #include #include diff --git a/src/ripple/app/tx/TransactionAcquire.h b/src/ripple/app/ledger/impl/TransactionAcquire.h similarity index 95% rename from src/ripple/app/tx/TransactionAcquire.h rename to src/ripple/app/ledger/impl/TransactionAcquire.h index 2c0702834..9562d3caa 100644 --- a/src/ripple/app/tx/TransactionAcquire.h +++ b/src/ripple/app/ledger/impl/TransactionAcquire.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_APP_TX_TRANSACTIONACQUIRE_H_INCLUDED -#define RIPPLE_APP_TX_TRANSACTIONACQUIRE_H_INCLUDED +#ifndef RIPPLE_APP_LEDGER_TRANSACTIONACQUIRE_H_INCLUDED +#define RIPPLE_APP_LEDGER_TRANSACTIONACQUIRE_H_INCLUDED #include #include diff --git a/src/ripple/app/tx/impl/TransactionMaster.cpp b/src/ripple/app/ledger/impl/TransactionMaster.cpp similarity index 87% rename from src/ripple/app/tx/impl/TransactionMaster.cpp rename to src/ripple/app/ledger/impl/TransactionMaster.cpp index 88b1c9dda..dc67407a3 100644 --- a/src/ripple/app/tx/impl/TransactionMaster.cpp +++ b/src/ripple/app/ledger/impl/TransactionMaster.cpp @@ -18,8 +18,10 @@ //============================================================================== #include -#include +#include +#include #include +#include #include #include @@ -34,7 +36,7 @@ TransactionMaster::TransactionMaster (Application& app) bool TransactionMaster::inLedger (uint256 const& hash, std::uint32_t ledger) { - Transaction::pointer txn = mCache.fetch (hash); + auto txn = mCache.fetch (hash); if (!txn) return false; @@ -43,9 +45,10 @@ bool TransactionMaster::inLedger (uint256 const& hash, std::uint32_t ledger) return true; } -Transaction::pointer TransactionMaster::fetch (uint256 const& txnID, bool checkDisk) +std::shared_ptr +TransactionMaster::fetch (uint256 const& txnID, bool checkDisk) { - Transaction::pointer txn = mCache.fetch (txnID); + auto txn = mCache.fetch (txnID); if (!checkDisk || txn) return txn; @@ -62,7 +65,7 @@ Transaction::pointer TransactionMaster::fetch (uint256 const& txnID, bool checkD std::shared_ptr TransactionMaster::fetch (std::shared_ptr const& item, - SHAMapTreeNode::TNType type, + SHAMapTreeNode::TNType type, bool checkDisk, std::uint32_t uCommitLedger) { std::shared_ptr txn; @@ -94,12 +97,12 @@ TransactionMaster::fetch (std::shared_ptr const& item, } void -TransactionMaster::canonicalize(Transaction::pointer* pTransaction) +TransactionMaster::canonicalize(std::shared_ptr* pTransaction) { uint256 const tid = (*pTransaction)->getID(); if (tid != zero) { - Transaction::pointer txn(*pTransaction); + auto txn = *pTransaction; // VFALCO NOTE canonicalize can change the value of txn! mCache.canonicalize(tid, txn); *pTransaction = txn; diff --git a/src/ripple/app/main/Application.cpp b/src/ripple/app/main/Application.cpp index 2e1291962..57b55669e 100644 --- a/src/ripple/app/main/Application.cpp +++ b/src/ripple/app/main/Application.cpp @@ -30,6 +30,8 @@ #include #include #include +#include +#include #include #include #include @@ -43,8 +45,6 @@ #include #include #include -#include -#include #include #include #include diff --git a/src/ripple/app/misc/NetworkOPs.cpp b/src/ripple/app/misc/NetworkOPs.cpp index b4a378026..e0c7af004 100644 --- a/src/ripple/app/misc/NetworkOPs.cpp +++ b/src/ripple/app/misc/NetworkOPs.cpp @@ -29,18 +29,20 @@ #include #include #include +#include #include #include +#include #include #include #include #include #include #include +#include #include #include #include -#include #include #include #include @@ -85,7 +87,7 @@ class NetworkOPsImp final class TransactionStatus { public: - Transaction::pointer transaction; + std::shared_ptr transaction; bool admin; bool local; FailHard failType; @@ -93,7 +95,7 @@ class NetworkOPsImp final TER result; TransactionStatus ( - Transaction::pointer t, + std::shared_ptr t, bool a, bool l, FailHard f) @@ -159,7 +161,7 @@ public: void submitTransaction (std::shared_ptr const&) override; void processTransaction ( - Transaction::pointer& transaction, + std::shared_ptr& transaction, bool bAdmin, bool bLocal, FailHard failType) override; /** @@ -170,7 +172,7 @@ public: * @param bAdmin Whether an administrative client connection submitted it. * @param failType fail_hard setting from transaction submission. */ - void doTransactionSync (Transaction::pointer transaction, + void doTransactionSync (std::shared_ptr transaction, bool bAdmin, FailHard failType); /** @@ -182,7 +184,7 @@ public: * @param bAdmin Whether an administrative client connection submitted it. * @param failType fail_hard setting from transaction submission. */ - void doTransactionAsync (Transaction::pointer transaction, + void doTransactionAsync (std::shared_ptr transaction, bool bAdmin, FailHard failtype); /** @@ -699,7 +701,7 @@ void NetworkOPsImp::submitTransaction (std::shared_ptr const& iTrans }); } -void NetworkOPsImp::processTransaction (Transaction::pointer& transaction, +void NetworkOPsImp::processTransaction (std::shared_ptr& transaction, bool bAdmin, bool bLocal, FailHard failType) { auto ev = m_job_queue.getLoadEventAP (jtTXN_PROC, "ProcessTXN"); @@ -744,7 +746,7 @@ void NetworkOPsImp::processTransaction (Transaction::pointer& transaction, doTransactionAsync (transaction, bAdmin, failType); } -void NetworkOPsImp::doTransactionAsync (Transaction::pointer transaction, +void NetworkOPsImp::doTransactionAsync (std::shared_ptr transaction, bool bAdmin, FailHard failType) { std::lock_guard lock (mMutex); @@ -764,7 +766,7 @@ void NetworkOPsImp::doTransactionAsync (Transaction::pointer transaction, } } -void NetworkOPsImp::doTransactionSync (Transaction::pointer transaction, +void NetworkOPsImp::doTransactionSync (std::shared_ptr transaction, bool bAdmin, FailHard failType) { std::unique_lock lock (mMutex); diff --git a/src/ripple/app/misc/NetworkOPs.h b/src/ripple/app/misc/NetworkOPs.h index 6a596d319..79868373a 100644 --- a/src/ripple/app/misc/NetworkOPs.h +++ b/src/ripple/app/misc/NetworkOPs.h @@ -40,6 +40,7 @@ namespace ripple { class Peer; class LedgerMaster; +class Transaction; // This is the primary interface into the "client" portion of the program. // Code that wants to do normal operations on the network such as @@ -121,7 +122,7 @@ public: * @param bLocal Client submission. * @param failType fail_hard setting from transaction submission. */ - virtual void processTransaction (Transaction::pointer& transaction, + virtual void processTransaction (std::shared_ptr& transaction, bool bAdmin, bool bLocal, FailHard failType) = 0; //-------------------------------------------------------------------------- @@ -198,7 +199,7 @@ public: virtual std::size_t getLocalTxCount () = 0; // client information retrieval functions - using AccountTx = std::pair; + using AccountTx = std::pair, TxMeta::pointer>; using AccountTxs = std::vector; virtual AccountTxs getAccountTxs ( diff --git a/src/ripple/app/misc/SHAMapStore.h b/src/ripple/app/misc/SHAMapStore.h index e7ce233e4..34c509306 100644 --- a/src/ripple/app/misc/SHAMapStore.h +++ b/src/ripple/app/misc/SHAMapStore.h @@ -21,7 +21,6 @@ #define RIPPLE_APP_MISC_SHAMAPSTORE_H_INCLUDED #include -#include #include #include #include @@ -30,6 +29,8 @@ namespace ripple { +class TransactionMaster; + /** * class to create database, launch online delete thread, and * related sqlite databse diff --git a/src/ripple/app/misc/SHAMapStoreImp.cpp b/src/ripple/app/misc/SHAMapStoreImp.cpp index 789a264ea..1831ea9ef 100644 --- a/src/ripple/app/misc/SHAMapStoreImp.cpp +++ b/src/ripple/app/misc/SHAMapStoreImp.cpp @@ -21,6 +21,7 @@ #include #include +#include #include #include #include diff --git a/src/ripple/app/tx/Transaction.h b/src/ripple/app/misc/Transaction.h similarity index 98% rename from src/ripple/app/tx/Transaction.h rename to src/ripple/app/misc/Transaction.h index 7750129f4..ef8671763 100644 --- a/src/ripple/app/tx/Transaction.h +++ b/src/ripple/app/misc/Transaction.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_APP_TX_TRANSACTION_H_INCLUDED -#define RIPPLE_APP_TX_TRANSACTION_H_INCLUDED +#ifndef RIPPLE_APP_MISC_TRANSACTION_H_INCLUDED +#define RIPPLE_APP_MISC_TRANSACTION_H_INCLUDED #include #include diff --git a/src/ripple/app/misc/impl/AccountTxPaging.cpp b/src/ripple/app/misc/impl/AccountTxPaging.cpp index ac07a9fd1..977842577 100644 --- a/src/ripple/app/misc/impl/AccountTxPaging.cpp +++ b/src/ripple/app/misc/impl/AccountTxPaging.cpp @@ -21,8 +21,8 @@ #include #include #include +#include #include -#include #include #include #include diff --git a/src/ripple/app/tx/impl/Transaction.cpp b/src/ripple/app/misc/impl/Transaction.cpp similarity index 99% rename from src/ripple/app/tx/impl/Transaction.cpp rename to src/ripple/app/misc/impl/Transaction.cpp index cb8084917..b8bf14635 100644 --- a/src/ripple/app/tx/impl/Transaction.cpp +++ b/src/ripple/app/misc/impl/Transaction.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include #include #include diff --git a/src/ripple/app/tx/impl/CreateOffer.cpp b/src/ripple/app/tx/impl/CreateOffer.cpp index ea8780e66..c34d98729 100644 --- a/src/ripple/app/tx/impl/CreateOffer.cpp +++ b/src/ripple/app/tx/impl/CreateOffer.cpp @@ -19,8 +19,6 @@ #include #include -#include -#include #include #include #include diff --git a/src/ripple/app/tx/impl/CreateTicket.cpp b/src/ripple/app/tx/impl/CreateTicket.cpp index f4ec8f89e..b7bf72a2c 100644 --- a/src/ripple/app/tx/impl/CreateTicket.cpp +++ b/src/ripple/app/tx/impl/CreateTicket.cpp @@ -18,8 +18,8 @@ //============================================================================== #include -#include #include +#include #include #include diff --git a/src/ripple/app/tx/impl/SetSignerList.cpp b/src/ripple/app/tx/impl/SetSignerList.cpp index 6e3b426de..040345b80 100644 --- a/src/ripple/app/tx/impl/SetSignerList.cpp +++ b/src/ripple/app/tx/impl/SetSignerList.cpp @@ -18,9 +18,8 @@ //============================================================================== #include -#include #include -#include +#include #include #include #include diff --git a/src/ripple/app/tx/impl/SetTrust.cpp b/src/ripple/app/tx/impl/SetTrust.cpp index 4cf794801..85b8244cf 100644 --- a/src/ripple/app/tx/impl/SetTrust.cpp +++ b/src/ripple/app/tx/impl/SetTrust.cpp @@ -18,10 +18,10 @@ //============================================================================== #include -#include -#include #include #include +#include +#include #include #include #include diff --git a/src/ripple/app/tx/impl/apply.cpp b/src/ripple/app/tx/impl/apply.cpp index 87fa27970..a00a15e1f 100644 --- a/src/ripple/app/tx/impl/apply.cpp +++ b/src/ripple/app/tx/impl/apply.cpp @@ -18,9 +18,9 @@ //============================================================================== #include -#include #include #include +#include #include namespace ripple { diff --git a/src/ripple/ledger/tests/PathSet.h b/src/ripple/ledger/tests/PathSet.h index a21ec7c41..efc6bbab6 100644 --- a/src/ripple/ledger/tests/PathSet.h +++ b/src/ripple/ledger/tests/PathSet.h @@ -17,8 +17,6 @@ */ //============================================================================== -#include -#include #include #include #include diff --git a/src/ripple/ledger/tests/PaymentSandbox_test.cpp b/src/ripple/ledger/tests/PaymentSandbox_test.cpp index 40bf37eea..b9194d881 100644 --- a/src/ripple/ledger/tests/PaymentSandbox_test.cpp +++ b/src/ripple/ledger/tests/PaymentSandbox_test.cpp @@ -17,6 +17,7 @@ */ //============================================================================== +#include #include #include #include diff --git a/src/ripple/overlay/impl/PeerImp.cpp b/src/ripple/overlay/impl/PeerImp.cpp index 23e0df3b3..f631c44da 100644 --- a/src/ripple/overlay/impl/PeerImp.cpp +++ b/src/ripple/overlay/impl/PeerImp.cpp @@ -23,11 +23,12 @@ #include #include #include +#include #include #include +#include #include #include -#include #include #include #include diff --git a/src/ripple/rpc/handlers/AccountTx.cpp b/src/ripple/rpc/handlers/AccountTx.cpp index db2da2714..099c31ea5 100644 --- a/src/ripple/rpc/handlers/AccountTx.cpp +++ b/src/ripple/rpc/handlers/AccountTx.cpp @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include diff --git a/src/ripple/rpc/handlers/AccountTxOld.cpp b/src/ripple/rpc/handlers/AccountTxOld.cpp index 8eab63b64..eece8f9f7 100644 --- a/src/ripple/rpc/handlers/AccountTxOld.cpp +++ b/src/ripple/rpc/handlers/AccountTxOld.cpp @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include diff --git a/src/ripple/rpc/handlers/Submit.cpp b/src/ripple/rpc/handlers/Submit.cpp index 18962cbc4..6b1a973a0 100644 --- a/src/ripple/rpc/handlers/Submit.cpp +++ b/src/ripple/rpc/handlers/Submit.cpp @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -94,9 +95,8 @@ Json::Value doSubmit (RPC::Context& context) } } - Transaction::pointer tpTrans; std::string reason; - tpTrans = std::make_shared ( + auto tpTrans = std::make_shared ( stpTrans, reason, context.app); if (tpTrans->getStatus() != NEW) { diff --git a/src/ripple/rpc/handlers/TransactionEntry.cpp b/src/ripple/rpc/handlers/TransactionEntry.cpp index 1c7da1606..3c0ee4c03 100644 --- a/src/ripple/rpc/handlers/TransactionEntry.cpp +++ b/src/ripple/rpc/handlers/TransactionEntry.cpp @@ -65,7 +65,6 @@ Json::Value doTransactionEntry (RPC::Context& context) } else { - Transaction::pointer tpTrans; TxMeta::pointer tmTrans; auto tx = lpLedger->txRead (uTransID); diff --git a/src/ripple/rpc/handlers/Tx.cpp b/src/ripple/rpc/handlers/Tx.cpp index c6e458db3..0a6a3ca9a 100644 --- a/src/ripple/rpc/handlers/Tx.cpp +++ b/src/ripple/rpc/handlers/Tx.cpp @@ -19,9 +19,10 @@ #include #include +#include #include #include -#include +#include #include #include #include diff --git a/src/ripple/rpc/handlers/TxHistory.cpp b/src/ripple/rpc/handlers/TxHistory.cpp index f06e5f981..e8214e7fd 100644 --- a/src/ripple/rpc/handlers/TxHistory.cpp +++ b/src/ripple/rpc/handlers/TxHistory.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/ripple/rpc/impl/TransactionSign.cpp b/src/ripple/rpc/impl/TransactionSign.cpp index 6acfa273e..bf600dd5c 100644 --- a/src/ripple/rpc/impl/TransactionSign.cpp +++ b/src/ripple/rpc/impl/TransactionSign.cpp @@ -21,6 +21,7 @@ #include #include #include +#include #include #include // Validity::Valid #include diff --git a/src/ripple/rpc/impl/TransactionSign.h b/src/ripple/rpc/impl/TransactionSign.h index ef894a6b1..21d0d47bd 100644 --- a/src/ripple/rpc/impl/TransactionSign.h +++ b/src/ripple/rpc/impl/TransactionSign.h @@ -29,6 +29,7 @@ namespace ripple { // Forward declarations class Application; class LoadFeeTrack; +class Transaction; namespace RPC { @@ -63,12 +64,12 @@ Json::Value checkFee ( // Return a std::function<> that calls NetworkOPs::processTransaction. using ProcessTransactionFn = - std::function& transaction, bool bAdmin, bool bLocal, NetworkOPs::FailHard failType)>; inline ProcessTransactionFn getProcessTxnFn (NetworkOPs& netOPs) { - return [&netOPs](Transaction::pointer& transaction, + return [&netOPs](std::shared_ptr& transaction, bool bAdmin, bool bLocal, NetworkOPs::FailHard failType) { netOPs.processTransaction(transaction, bAdmin, bLocal, failType); diff --git a/src/ripple/rpc/impl/Utilities.cpp b/src/ripple/rpc/impl/Utilities.cpp index b0eee111a..3966199bd 100644 --- a/src/ripple/rpc/impl/Utilities.cpp +++ b/src/ripple/rpc/impl/Utilities.cpp @@ -18,6 +18,7 @@ //============================================================================== #include +#include #include #include #include @@ -32,7 +33,7 @@ void addPaymentDeliveredAmount ( Json::Value& meta, RPC::Context& context, - Transaction::pointer transaction, + std::shared_ptr transaction, TxMeta::pointer transactionMeta) { // We only want to add a "delivered_amount" field if the transaction diff --git a/src/ripple/rpc/impl/Utilities.h b/src/ripple/rpc/impl/Utilities.h index 5bcbfc5ae..05a54b139 100644 --- a/src/ripple/rpc/impl/Utilities.h +++ b/src/ripple/rpc/impl/Utilities.h @@ -21,7 +21,6 @@ #define RIPPLE_RPC_IMPL_UTILITIES_H_INCLUDED #include -#include #include namespace Json { @@ -30,6 +29,8 @@ class Value; namespace ripple { +class Transaction; + namespace RPC { struct Context; @@ -38,7 +39,7 @@ void addPaymentDeliveredAmount ( Json::Value&, Context&, - Transaction::pointer, + std::shared_ptr, TxMeta::pointer); /** Inject JSON describing ledger entry diff --git a/src/ripple/rpc/tests/JSONRPC.test.cpp b/src/ripple/rpc/tests/JSONRPC.test.cpp index edeb58daf..b4d9d494c 100644 --- a/src/ripple/rpc/tests/JSONRPC.test.cpp +++ b/src/ripple/rpc/tests/JSONRPC.test.cpp @@ -1631,7 +1631,7 @@ public: // A function that can be called as though it would process a transaction. static void fakeProcessTransaction ( - Transaction::pointer&, bool, bool, NetworkOPs::FailHard) + std::shared_ptr&, bool, bool, NetworkOPs::FailHard) { ; } diff --git a/src/ripple/unity/app_ledger.cpp b/src/ripple/unity/app_ledger.cpp index af720e481..7a41ca836 100644 --- a/src/ripple/unity/app_ledger.cpp +++ b/src/ripple/unity/app_ledger.cpp @@ -34,9 +34,13 @@ #include #include #include +#include #include #include #include #include +#include #include #include +#include +#include diff --git a/src/ripple/unity/app_misc.cpp b/src/ripple/unity/app_misc.cpp index 635b4caba..dbcae1390 100644 --- a/src/ripple/unity/app_misc.cpp +++ b/src/ripple/unity/app_misc.cpp @@ -29,4 +29,5 @@ #include #include +#include #include diff --git a/src/ripple/unity/app_tx.cpp b/src/ripple/unity/app_tx.cpp index 7bb6a2e7d..8e6bb61c8 100644 --- a/src/ripple/unity/app_tx.cpp +++ b/src/ripple/unity/app_tx.cpp @@ -27,8 +27,6 @@ #include #include #include -#include -#include #include #include #include @@ -38,8 +36,5 @@ #include #include #include -#include -#include #include -#include #include