ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up src/ripple/app/tx directory:

Browse Source 
* Move InboundTransactions to app/ledger
* Move TransactionAcquire to app/ledger
* Move LocalTxs to app/ledger
* Move Transaction to app/misc
* Move TransactionMaster to app/ledger
This commit is contained in:
Edward Hennis
2015-10-15 16:48:59 -04:00
parent 7d0d89faae
commit 6464d1abc1
50 changed files with 161 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
Builds/VisualStudio2015/RippleD.vcxproj
View File

@@ -1356,6 +1356,10 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\ripple\app\ledger\impl\InboundTransactions.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\ripple\app\ledger\impl\LedgerCleaner.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
@@ -1380,14 +1384,30 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\ripple\app\ledger\impl\LocalTxs.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\ripple\app\ledger\impl\OpenLedger.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\ripple\app\ledger\impl\TransactionAcquire.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
</ClCompile>
<ClInclude Include="..\..\src\ripple\app\ledger\impl\TransactionAcquire.h">
</ClInclude>
<ClCompile Include="..\..\src\ripple\app\ledger\impl\TransactionMaster.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
</ClCompile>
<ClInclude Include="..\..\src\ripple\app\ledger\InboundLedger.h">
</ClInclude>
<ClInclude Include="..\..\src\ripple\app\ledger\InboundLedgers.h">
</ClInclude>
<ClInclude Include="..\..\src\ripple\app\ledger\InboundTransactions.h">
</ClInclude>
<ClCompile Include="..\..\src\ripple\app\ledger\Ledger.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
@@ -1416,6 +1436,8 @@
</ClInclude>
<ClInclude Include="..\..\src\ripple\app\ledger\LedgerToJson.h">
</ClInclude>
<ClInclude Include="..\..\src\ripple\app\ledger\LocalTxs.h">
</ClInclude>
<ClInclude Include="..\..\src\ripple\app\ledger\OpenLedger.h">
</ClInclude>
<ClCompile Include="..\..\src\ripple\app\ledger\OrderBookDB.cpp">
@@ -1426,6 +1448,8 @@
</ClInclude>
<ClInclude Include="..\..\src\ripple\app\ledger\PendingSaves.h">
</ClInclude>
<ClInclude Include="..\..\src\ripple\app\ledger\TransactionMaster.h">
</ClInclude>
<ClCompile Include="..\..\src\ripple\app\ledger\TransactionStateSF.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
@@ -1510,6 +1534,10 @@
</ClCompile>
<ClInclude Include="..\..\src\ripple\app\misc\impl\AccountTxPaging.h">
</ClInclude>
<ClCompile Include="..\..\src\ripple\app\misc\impl\Transaction.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\ripple\app\misc\impl\TxQ.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
@@ -1530,6 +1558,8 @@
</ClCompile>
<ClInclude Include="..\..\src\ripple\app\misc\SHAMapStoreImp.h">
</ClInclude>
<ClInclude Include="..\..\src\ripple\app\misc\Transaction.h">
</ClInclude>
<ClInclude Include="..\..\src\ripple\app\misc\TxQ.h">
</ClInclude>
<ClCompile Include="..\..\src\ripple\app\misc\UniqueNodeList.cpp">
@@ -1774,14 +1804,6 @@
</ClCompile>
<ClInclude Include="..\..\src\ripple\app\tx\impl\CreateTicket.h">
</ClInclude>
<ClCompile Include="..\..\src\ripple\app\tx\impl\InboundTransactions.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\ripple\app\tx\impl\LocalTxs.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
</ClCompile>
<ClInclude Include="..\..\src\ripple\app\tx\impl\Offer.h">
</ClInclude>
<ClCompile Include="..\..\src\ripple\app\tx\impl\OfferStream.cpp">
@@ -1838,34 +1860,12 @@
</ClCompile>
<ClInclude Include="..\..\src\ripple\app\tx\impl\Taker.h">
</ClInclude>
<ClCompile Include="..\..\src\ripple\app\tx\impl\Transaction.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\ripple\app\tx\impl\TransactionAcquire.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\ripple\app\tx\impl\TransactionMaster.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\ripple\app\tx\impl\Transactor.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
</ClCompile>
<ClInclude Include="..\..\src\ripple\app\tx\impl\Transactor.h">
</ClInclude>
<ClInclude Include="..\..\src\ripple\app\tx\InboundTransactions.h">
</ClInclude>
<ClInclude Include="..\..\src\ripple\app\tx\LocalTxs.h">
</ClInclude>
<ClInclude Include="..\..\src\ripple\app\tx\Transaction.h">
</ClInclude>
<ClInclude Include="..\..\src\ripple\app\tx\TransactionAcquire.h">
</ClInclude>
<ClInclude Include="..\..\src\ripple\app\tx\TransactionMaster.h">
</ClInclude>
<ClInclude Include="..\..\src\ripple\basics\base_uint.h">
</ClInclude>
<ClInclude Include="..\..\src\ripple\basics\BasicConfig.h">

60
Builds/VisualStudio2015/RippleD.vcxproj.filters
View File

@@ -2097,6 +2097,9 @@
<ClCompile Include="..\..\src\ripple\app\ledger\impl\InboundLedgers.cpp">
<Filter>ripple\app\ledger\impl</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\app\ledger\impl\InboundTransactions.cpp">
<Filter>ripple\app\ledger\impl</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\app\ledger\impl\LedgerCleaner.cpp">
<Filter>ripple\app\ledger\impl</Filter>
</ClCompile>
@@ -2118,15 +2121,30 @@
<ClCompile Include="..\..\src\ripple\app\ledger\impl\LedgerToJson.cpp">
<Filter>ripple\app\ledger\impl</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\app\ledger\impl\LocalTxs.cpp">
<Filter>ripple\app\ledger\impl</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\app\ledger\impl\OpenLedger.cpp">
<Filter>ripple\app\ledger\impl</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\app\ledger\impl\TransactionAcquire.cpp">
<Filter>ripple\app\ledger\impl</Filter>
</ClCompile>
<ClInclude Include="..\..\src\ripple\app\ledger\impl\TransactionAcquire.h">
<Filter>ripple\app\ledger\impl</Filter>
</ClInclude>
<ClCompile Include="..\..\src\ripple\app\ledger\impl\TransactionMaster.cpp">
<Filter>ripple\app\ledger\impl</Filter>
</ClCompile>
<ClInclude Include="..\..\src\ripple\app\ledger\InboundLedger.h">
<Filter>ripple\app\ledger</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ripple\app\ledger\InboundLedgers.h">
<Filter>ripple\app\ledger</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ripple\app\ledger\InboundTransactions.h">
<Filter>ripple\app\ledger</Filter>
</ClInclude>
<ClCompile Include="..\..\src\ripple\app\ledger\Ledger.cpp">
<Filter>ripple\app\ledger</Filter>
</ClCompile>
@@ -2160,6 +2178,9 @@
<ClInclude Include="..\..\src\ripple\app\ledger\LedgerToJson.h">
<Filter>ripple\app\ledger</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ripple\app\ledger\LocalTxs.h">
<Filter>ripple\app\ledger</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ripple\app\ledger\OpenLedger.h">
<Filter>ripple\app\ledger</Filter>
</ClInclude>
@@ -2172,6 +2193,9 @@
<ClInclude Include="..\..\src\ripple\app\ledger\PendingSaves.h">
<Filter>ripple\app\ledger</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ripple\app\ledger\TransactionMaster.h">
<Filter>ripple\app\ledger</Filter>
</ClInclude>
<ClCompile Include="..\..\src\ripple\app\ledger\TransactionStateSF.cpp">
<Filter>ripple\app\ledger</Filter>
</ClCompile>
@@ -2256,6 +2280,9 @@
<ClInclude Include="..\..\src\ripple\app\misc\impl\AccountTxPaging.h">
<Filter>ripple\app\misc\impl</Filter>
</ClInclude>
<ClCompile Include="..\..\src\ripple\app\misc\impl\Transaction.cpp">
<Filter>ripple\app\misc\impl</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\app\misc\impl\TxQ.cpp">
<Filter>ripple\app\misc\impl</Filter>
</ClCompile>
@@ -2277,6 +2304,9 @@
<ClInclude Include="..\..\src\ripple\app\misc\SHAMapStoreImp.h">
<Filter>ripple\app\misc</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ripple\app\misc\Transaction.h">
<Filter>ripple\app\misc</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ripple\app\misc\TxQ.h">
<Filter>ripple\app\misc</Filter>
</ClInclude>
@@ -2502,12 +2532,6 @@
<ClInclude Include="..\..\src\ripple\app\tx\impl\CreateTicket.h">
<Filter>ripple\app\tx\impl</Filter>
</ClInclude>
<ClCompile Include="..\..\src\ripple\app\tx\impl\InboundTransactions.cpp">
<Filter>ripple\app\tx\impl</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\app\tx\impl\LocalTxs.cpp">
<Filter>ripple\app\tx\impl</Filter>
</ClCompile>
<ClInclude Include="..\..\src\ripple\app\tx\impl\Offer.h">
<Filter>ripple\app\tx\impl</Filter>
</ClInclude>
@@ -2565,36 +2589,12 @@
<ClInclude Include="..\..\src\ripple\app\tx\impl\Taker.h">
<Filter>ripple\app\tx\impl</Filter>
</ClInclude>
<ClCompile Include="..\..\src\ripple\app\tx\impl\Transaction.cpp">
<Filter>ripple\app\tx\impl</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\app\tx\impl\TransactionAcquire.cpp">
<Filter>ripple\app\tx\impl</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\app\tx\impl\TransactionMaster.cpp">
<Filter>ripple\app\tx\impl</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\app\tx\impl\Transactor.cpp">
<Filter>ripple\app\tx\impl</Filter>
</ClCompile>
<ClInclude Include="..\..\src\ripple\app\tx\impl\Transactor.h">
<Filter>ripple\app\tx\impl</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ripple\app\tx\InboundTransactions.h">
<Filter>ripple\app\tx</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ripple\app\tx\LocalTxs.h">
<Filter>ripple\app\tx</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ripple\app\tx\Transaction.h">
<Filter>ripple\app\tx</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ripple\app\tx\TransactionAcquire.h">
<Filter>ripple\app\tx</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ripple\app\tx\TransactionMaster.h">
<Filter>ripple\app\tx</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ripple\basics\base_uint.h">
<Filter>ripple\basics</Filter>
</ClInclude>

2
src/ripple/app/ledger/AccountStateSF.cpp
View File

@@ -20,9 +20,9 @@
#include <BeastConfig.h>
#include <ripple/app/ledger/AccountStateSF.h>
#include <ripple/app/ledger/LedgerMaster.h>
#include <ripple/app/ledger/TransactionMaster.h>
#include <ripple/app/main/Application.h>
#include <ripple/app/misc/NetworkOPs.h>
#include <ripple/app/tx/TransactionMaster.h>
#include <ripple/nodestore/Database.h>
#include <ripple/protocol/HashPrefix.h>

5
src/ripple/app/ledger/Consensus.h
View File

@@ -22,9 +22,8 @@
#include <ripple/app/ledger/LedgerConsensus.h>
#include <ripple/app/ledger/LedgerMaster.h>
#include <ripple/app/ledger/InboundTransactions.h>
#include <ripple/app/main/Application.h>
#include <ripple/app/tx/InboundTransactions.h>
#include <ripple/app/tx/LocalTxs.h>
#include <ripple/basics/Log.h>
#include <ripple/core/Config.h>
@@ -32,6 +31,8 @@
namespace ripple {
class LocalTxs;
/** Implements the consensus process and provides inter-round state. */
class Consensus
{

3
src/ripple/app/ledger/ConsensusTransSetSF.cpp
View File

@@ -19,9 +19,10 @@
#include <BeastConfig.h>
#include <ripple/app/ledger/ConsensusTransSetSF.h>
#include <ripple/app/ledger/TransactionMaster.h>
#include <ripple/app/main/Application.h>
#include <ripple/app/misc/NetworkOPs.h>
#include <ripple/app/tx/TransactionMaster.h>
#include <ripple/app/misc/Transaction.h>
#include <ripple/basics/Log.h>
#include <ripple/protocol/digest.h>
#include <ripple/core/JobQueue.h>

6
src/ripple/app/tx/InboundTransactions.h → src/ripple/app/ledger/InboundTransactions.h
View File

@@ -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 <ripple/overlay/Peer.h>
#include <ripple/shamap/SHAMap.h>
@@ -28,6 +28,8 @@
namespace ripple {
class Application;
/** Manages the acquisition and lifetime of transaction sets.
*/

2
src/ripple/app/ledger/Ledger.cpp
View File

@@ -26,10 +26,10 @@
#include <ripple/app/ledger/LedgerToJson.h>
#include <ripple/app/ledger/OrderBookDB.h>
#include <ripple/app/ledger/PendingSaves.h>
#include <ripple/app/ledger/TransactionMaster.h>
#include <ripple/app/main/Application.h>
#include <ripple/app/misc/HashRouter.h>
#include <ripple/app/misc/NetworkOPs.h>
#include <ripple/app/tx/TransactionMaster.h>
#include <ripple/basics/contract.h>
#include <ripple/basics/Log.h>
#include <ripple/basics/StringUtilities.h>

1
src/ripple/app/ledger/Ledger.h
View File

@@ -23,7 +23,6 @@
#include <ripple/ledger/TxMeta.h>
#include <ripple/ledger/View.h>
#include <ripple/ledger/CachedView.h>
#include <ripple/app/tx/Transaction.h>
#include <ripple/basics/CountedObject.h>
#include <ripple/core/TimeKeeper.h>
#include <ripple/protocol/Indexes.h>

3
src/ripple/app/ledger/LedgerConsensus.h
View File

@@ -22,11 +22,10 @@
#include <ripple/app/ledger/Ledger.h>
#include <ripple/app/ledger/LedgerProposal.h>
#include <ripple/app/ledger/InboundTransactions.h>
#include <ripple/app/main/Application.h>
#include <ripple/app/misc/CanonicalTXSet.h>
#include <ripple/app/misc/FeeVote.h>
#include <ripple/app/tx/InboundTransactions.h>
#include <ripple/app/tx/LocalTxs.h>
#include <ripple/json/json_value.h>
#include <ripple/overlay/Peer.h>
#include <ripple/protocol/RippleLedgerHash.h>

3
src/ripple/app/ledger/LedgerMaster.h
View File

@@ -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<Transaction> const& trans) = 0;
virtual void fixMismatch (Ledger::ref ledger) = 0;
virtual bool haveLedger (std::uint32_t seq) = 0;

4
src/ripple/app/tx/LocalTxs.h → src/ripple/app/ledger/LocalTxs.h
View File

@@ -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 <ripple/app/ledger/Ledger.h>
#include <ripple/app/misc/CanonicalTXSet.h>

15
src/ripple/app/tx/TransactionMaster.h → src/ripple/app/ledger/TransactionMaster.h
View File

@@ -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 <ripple/app/tx/Transaction.h>
#include <ripple/shamap/SHAMapItem.h>
#include <ripple/shamap/SHAMapTreeNode.h>
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<Transaction>
fetch (uint256 const& , bool checkDisk);
std::shared_ptr<STTx const>
fetch (std::shared_ptr<SHAMapItem> 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<Transaction>* pTransaction);
void sweep (void);

4
src/ripple/app/ledger/TransactionStateSF.cpp
View File

@@ -18,11 +18,11 @@
//==============================================================================
#include <BeastConfig.h>
#include <ripple/app/ledger/LedgerMaster.h>
#include <ripple/app/ledger/TransactionStateSF.h>
#include <ripple/app/ledger/LedgerMaster.h>
#include <ripple/app/ledger/TransactionMaster.h>
#include <ripple/app/main/Application.h>
#include <ripple/app/misc/NetworkOPs.h>
#include <ripple/app/tx/TransactionMaster.h>
#include <ripple/nodestore/Database.h>
#include <ripple/protocol/HashPrefix.h>

4
src/ripple/app/tx/impl/InboundTransactions.cpp → src/ripple/app/ledger/impl/InboundTransactions.cpp
View File

@@ -18,9 +18,9 @@
//==============================================================================
#include <BeastConfig.h>
#include <ripple/app/ledger/InboundTransactions.h>
#include <ripple/app/ledger/InboundLedgers.h>
#include <ripple/app/tx/InboundTransactions.h>
#include <ripple/app/tx/TransactionAcquire.h>
#include <ripple/app/ledger/impl/TransactionAcquire.h>
#include <ripple/app/main/Application.h>
#include <ripple/app/misc/NetworkOPs.h>
#include <ripple/basics/Log.h>

3
src/ripple/app/ledger/impl/LedgerConsensusImp.cpp
View File

@@ -22,9 +22,11 @@
#include <ripple/app/ledger/LedgerMaster.h>
#include <ripple/app/ledger/LedgerTiming.h>
#include <ripple/app/ledger/LedgerToJson.h>
#include <ripple/app/ledger/LocalTxs.h>
#include <ripple/app/ledger/OpenLedger.h>
#include <ripple/app/ledger/impl/DisputedTx.h>
#include <ripple/app/ledger/impl/LedgerConsensusImp.h>
#include <ripple/app/ledger/impl/TransactionAcquire.h>
#include <ripple/app/main/Application.h>
#include <ripple/app/misc/AmendmentTable.h>
#include <ripple/app/misc/CanonicalTXSet.h>
@@ -32,7 +34,6 @@
#include <ripple/app/misc/NetworkOPs.h>
#include <ripple/app/misc/TxQ.h>
#include <ripple/app/misc/Validations.h>
#include <ripple/app/tx/TransactionAcquire.h>
#include <ripple/app/tx/apply.h>
#include <ripple/basics/CountedObject.h>
#include <ripple/basics/Log.h>

4
src/ripple/app/ledger/impl/LedgerMaster.cpp
View File

@@ -32,6 +32,7 @@
#include <ripple/app/misc/NetworkOPs.h>
#include <ripple/app/misc/CanonicalTXSet.h>
#include <ripple/app/misc/SHAMapStore.h>
#include <ripple/app/misc/Transaction.h>
#include <ripple/app/misc/TxQ.h>
#include <ripple/app/misc/Validations.h>
#include <ripple/app/paths/PathRequests.h>
@@ -315,7 +316,8 @@ public:
mPubLedgerSeq = l->info().seq;
}
void addHeldTransaction (Transaction::ref transaction) override
void addHeldTransaction (
std::shared_ptr<Transaction> const& transaction) override
{
// returns true if transaction was added
ScopedLockType ml (m_mutex);

2
src/ripple/app/tx/impl/LocalTxs.cpp → src/ripple/app/ledger/impl/LocalTxs.cpp
View File

@@ -18,7 +18,7 @@
//==============================================================================
#include <BeastConfig.h>
#include <ripple/app/tx/LocalTxs.h>
#include <ripple/app/ledger/LocalTxs.h>
#include <ripple/app/main/Application.h>
#include <ripple/protocol/Indexes.h>

4
src/ripple/app/tx/impl/TransactionAcquire.cpp → src/ripple/app/ledger/impl/TransactionAcquire.cpp
View File

@@ -18,12 +18,12 @@
//==============================================================================
#include <BeastConfig.h>
#include <ripple/app/ledger/impl/TransactionAcquire.h>
#include <ripple/app/ledger/ConsensusTransSetSF.h>
#include <ripple/app/ledger/InboundLedgers.h>
#include <ripple/app/ledger/InboundTransactions.h>
#include <ripple/app/main/Application.h>
#include <ripple/app/misc/NetworkOPs.h>
#include <ripple/app/tx/TransactionAcquire.h>
#include <ripple/app/tx/InboundTransactions.h>
#include <ripple/overlay/Overlay.h>
#include <beast/utility/make_lock.h>
#include <memory>

4
src/ripple/app/tx/TransactionAcquire.h → src/ripple/app/ledger/impl/TransactionAcquire.h
View File

@@ -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 <ripple/app/main/Application.h>
#include <ripple/overlay/PeerSet.h>

17
src/ripple/app/tx/impl/TransactionMaster.cpp → src/ripple/app/ledger/impl/TransactionMaster.cpp
View File

@@ -18,8 +18,10 @@
//==============================================================================
#include <BeastConfig.h>
#include <ripple/app/tx/TransactionMaster.h>
#include <ripple/app/ledger/TransactionMaster.h>
#include <ripple/app/misc/Transaction.h>
#include <ripple/app/main/Application.h>
#include <ripple/protocol/STTx.h>
#include <ripple/basics/Log.h>
#include <ripple/basics/chrono.h>
@@ -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<Transaction>
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<STTx const>
TransactionMaster::fetch (std::shared_ptr<SHAMapItem> const& item,
SHAMapTreeNode::TNType type,
SHAMapTreeNode::TNType type,
bool checkDisk, std::uint32_t uCommitLedger)
{
std::shared_ptr<STTx const> txn;
@@ -94,12 +97,12 @@ TransactionMaster::fetch (std::shared_ptr<SHAMapItem> const& item,
}
void
TransactionMaster::canonicalize(Transaction::pointer* pTransaction)
TransactionMaster::canonicalize(std::shared_ptr<Transaction>* 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;

4
src/ripple/app/main/Application.cpp
View File

@@ -30,6 +30,8 @@
#include <ripple/app/ledger/OpenLedger.h>
#include <ripple/app/ledger/OrderBookDB.h>
#include <ripple/app/ledger/PendingSaves.h>
#include <ripple/app/ledger/InboundTransactions.h>
#include <ripple/app/ledger/TransactionMaster.h>
#include <ripple/app/main/CollectorManager.h>
#include <ripple/app/main/LoadManager.h>
#include <ripple/app/main/LocalCredentials.h>
@@ -43,8 +45,6 @@
#include <ripple/app/paths/Pathfinder.h>
#include <ripple/app/paths/PathRequests.h>
#include <ripple/app/misc/UniqueNodeList.h>
#include <ripple/app/tx/InboundTransactions.h>
#include <ripple/app/tx/TransactionMaster.h>
#include <ripple/app/tx/apply.h>
#include <ripple/basics/Log.h>
#include <ripple/basics/ResolverAsio.h>

20
src/ripple/app/misc/NetworkOPs.cpp
View File

@@ -29,18 +29,20 @@
#include <ripple/app/ledger/LedgerMaster.h>
#include <ripple/app/ledger/LedgerTiming.h>
#include <ripple/app/ledger/LedgerToJson.h>
#include <ripple/app/ledger/LocalTxs.h>
#include <ripple/app/ledger/OpenLedger.h>
#include <ripple/app/ledger/OrderBookDB.h>
#include <ripple/app/ledger/TransactionMaster.h>
#include <ripple/app/main/LoadManager.h>
#include <ripple/app/main/LocalCredentials.h>
#include <ripple/app/misc/HashRouter.h>
#include <ripple/app/misc/NetworkOPs.h>
#include <ripple/app/misc/TxQ.h>
#include <ripple/app/misc/Validations.h>
#include <ripple/app/misc/Transaction.h>
#include <ripple/app/misc/impl/AccountTxPaging.h>
#include <ripple/app/misc/UniqueNodeList.h>
#include <ripple/app/tx/apply.h>
#include <ripple/app/tx/TransactionMaster.h>
#include <ripple/basics/Log.h>
#include <ripple/basics/Time.h>
#include <ripple/protocol/digest.h>
@@ -85,7 +87,7 @@ class NetworkOPsImp final
class TransactionStatus
{
public:
Transaction::pointer transaction;
std::shared_ptr<Transaction> transaction;
bool admin;
bool local;
FailHard failType;
@@ -93,7 +95,7 @@ class NetworkOPsImp final
TER result;
TransactionStatus (
Transaction::pointer t,
std::shared_ptr<Transaction> t,
bool a,
bool l,
FailHard f)
@@ -159,7 +161,7 @@ public:
void submitTransaction (std::shared_ptr<STTx const> const&) override;
void processTransaction (
Transaction::pointer& transaction,
std::shared_ptr<Transaction>& 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> 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> transaction,
bool bAdmin, FailHard failtype);
/**
@@ -699,7 +701,7 @@ void NetworkOPsImp::submitTransaction (std::shared_ptr<STTx const> const& iTrans
});
}
void NetworkOPsImp::processTransaction (Transaction::pointer& transaction,
void NetworkOPsImp::processTransaction (std::shared_ptr<Transaction>& 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> transaction,
bool bAdmin, FailHard failType)
{
std::lock_guard<std::mutex> 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> transaction,
bool bAdmin, FailHard failType)
{
std::unique_lock<std::mutex> lock (mMutex);

5
src/ripple/app/misc/NetworkOPs.h
View File

@@ -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>& 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<Transaction::pointer, TxMeta::pointer>;
using AccountTx = std::pair<std::shared_ptr<Transaction>, TxMeta::pointer>;
using AccountTxs = std::vector<AccountTx>;
virtual AccountTxs getAccountTxs (

3
src/ripple/app/misc/SHAMapStore.h
View File

@@ -21,7 +21,6 @@
#define RIPPLE_APP_MISC_SHAMAPSTORE_H_INCLUDED
#include <ripple/app/ledger/Ledger.h>
#include <ripple/app/tx/TransactionMaster.h>
#include <ripple/core/Config.h>
#include <ripple/nodestore/Manager.h>
#include <ripple/nodestore/Scheduler.h>
@@ -30,6 +29,8 @@
namespace ripple {
class TransactionMaster;
/**
* class to create database, launch online delete thread, and
* related sqlite databse

1
src/ripple/app/misc/SHAMapStoreImp.cpp
View File

@@ -21,6 +21,7 @@
#include <ripple/app/misc/SHAMapStoreImp.h>
#include <ripple/app/ledger/LedgerMaster.h>
#include <ripple/app/ledger/TransactionMaster.h>
#include <ripple/app/main/Application.h>
#include <ripple/core/ConfigSections.h>
#include <boost/format.hpp>

4
src/ripple/app/tx/Transaction.h → src/ripple/app/misc/Transaction.h
View File

@@ -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 <ripple/protocol/Protocol.h>
#include <ripple/protocol/STTx.h>

2
src/ripple/app/misc/impl/AccountTxPaging.cpp
View File

@@ -21,8 +21,8 @@
#include <ripple/app/ledger/LedgerToJson.h>
#include <ripple/app/ledger/LedgerMaster.h>
#include <ripple/app/main/Application.h>
#include <ripple/app/misc/Transaction.h>
#include <ripple/app/misc/impl/AccountTxPaging.h>
#include <ripple/app/tx/Transaction.h>
#include <ripple/protocol/Serializer.h>
#include <ripple/protocol/types.h>
#include <boost/format.hpp>

2
src/ripple/app/tx/impl/Transaction.cpp → src/ripple/app/misc/impl/Transaction.cpp
View File

@@ -18,7 +18,7 @@
//==============================================================================
#include <BeastConfig.h>
#include <ripple/app/tx/Transaction.h>
#include <ripple/app/misc/Transaction.h>
#include <ripple/app/tx/apply.h>
#include <ripple/basics/Log.h>
#include <ripple/core/DatabaseCon.h>

2
src/ripple/app/tx/impl/CreateOffer.cpp
View File

@@ -19,8 +19,6 @@
#include <BeastConfig.h>
#include <ripple/app/tx/impl/CreateOffer.h>
#include <ripple/app/tx/impl/OfferStream.h>
#include <ripple/app/tx/impl/Taker.h>
#include <ripple/app/ledger/Ledger.h>
#include <ripple/protocol/st.h>
#include <ripple/basics/Log.h>

2
src/ripple/app/tx/impl/CreateTicket.cpp
View File

@@ -18,8 +18,8 @@
//==============================================================================
#include <BeastConfig.h>
#include <ripple/app/ledger/Ledger.h>
#include <ripple/app/tx/impl/CreateTicket.h>
#include <ripple/app/ledger/Ledger.h>
#include <ripple/basics/Log.h>
#include <ripple/protocol/Indexes.h>

3
src/ripple/app/tx/impl/SetSignerList.cpp
View File

@@ -18,9 +18,8 @@
//==============================================================================
#include <BeastConfig.h>
#include <ripple/app/ledger/Ledger.h>
#include <ripple/app/tx/impl/SetSignerList.h>
#include <ripple/app/tx/impl/SignerEntries.h>
#include <ripple/app/ledger/Ledger.h>
#include <ripple/protocol/Feature.h>
#include <ripple/protocol/STObject.h>
#include <ripple/protocol/STArray.h>

4
src/ripple/app/tx/impl/SetTrust.cpp
View File

@@ -18,10 +18,10 @@
//==============================================================================
#include <BeastConfig.h>
#include <ripple/protocol/Feature.h>
#include <ripple/protocol/Quality.h>
#include <ripple/app/tx/impl/SetTrust.h>
#include <ripple/basics/Log.h>
#include <ripple/protocol/Feature.h>
#include <ripple/protocol/Quality.h>
#include <ripple/protocol/Indexes.h>
#include <ripple/protocol/st.h>
#include <ripple/ledger/View.h>

2
src/ripple/app/tx/impl/apply.cpp
View File

@@ -18,9 +18,9 @@
//==============================================================================
#include <BeastConfig.h>
#include <ripple/app/misc/HashRouter.h>
#include <ripple/app/tx/apply.h>
#include <ripple/app/tx/applySteps.h>
#include <ripple/app/misc/HashRouter.h>
#include <ripple/protocol/Feature.h>
namespace ripple {

2
src/ripple/ledger/tests/PathSet.h
View File

@@ -17,8 +17,6 @@
*/
//==============================================================================
#include <BeastConfig.h>
#include <ripple/app/tx/impl/BookTip.h>
#include <ripple/basics/Log.h>
#include <ripple/protocol/TxFlags.h>
#include <ripple/test/jtx.h>

1
src/ripple/ledger/tests/PaymentSandbox_test.cpp
View File

@@ -17,6 +17,7 @@
*/
//==============================================================================
#include <BeastConfig.h>
#include <ripple/ledger/ApplyViewImpl.h>
#include <ripple/ledger/PaymentSandbox.h>
#include <ripple/ledger/tests/PathSet.h>

3
src/ripple/overlay/impl/PeerImp.cpp
View File

@@ -23,11 +23,12 @@
#include <ripple/overlay/impl/Tuning.h>
#include <ripple/app/ledger/InboundLedgers.h>
#include <ripple/app/ledger/LedgerMaster.h>
#include <ripple/app/ledger/InboundTransactions.h>
#include <ripple/app/misc/HashRouter.h>
#include <ripple/app/misc/NetworkOPs.h>
#include <ripple/app/misc/Transaction.h>
#include <ripple/overlay/ClusterNodeStatus.h>
#include <ripple/app/misc/UniqueNodeList.h>
#include <ripple/app/tx/InboundTransactions.h>
#include <ripple/app/tx/apply.h>
#include <ripple/protocol/digest.h>
#include <ripple/basics/StringUtilities.h>

1
src/ripple/rpc/handlers/AccountTx.cpp
View File

@@ -21,6 +21,7 @@
#include <ripple/app/ledger/LedgerMaster.h>
#include <ripple/app/main/Application.h>
#include <ripple/app/misc/NetworkOPs.h>
#include <ripple/app/misc/Transaction.h>
#include <ripple/json/json_value.h>
#include <ripple/ledger/ReadView.h>
#include <ripple/net/RPCErr.h>

1
src/ripple/rpc/handlers/AccountTxOld.cpp
View File

@@ -21,6 +21,7 @@
#include <ripple/app/ledger/LedgerMaster.h>
#include <ripple/app/main/Application.h>
#include <ripple/app/misc/NetworkOPs.h>
#include <ripple/app/misc/Transaction.h>
#include <ripple/ledger/ReadView.h>
#include <ripple/net/RPCErr.h>
#include <ripple/protocol/ErrorCodes.h>

4
src/ripple/rpc/handlers/Submit.cpp
View File

@@ -20,6 +20,7 @@
#include <BeastConfig.h>
#include <ripple/app/ledger/LedgerMaster.h>
#include <ripple/app/misc/HashRouter.h>
#include <ripple/app/misc/Transaction.h>
#include <ripple/app/tx/apply.h>
#include <ripple/net/RPCErr.h>
#include <ripple/protocol/ErrorCodes.h>
@@ -94,9 +95,8 @@ Json::Value doSubmit (RPC::Context& context)
}
}
Transaction::pointer tpTrans;
std::string reason;
tpTrans = std::make_shared<Transaction> (
auto tpTrans = std::make_shared<Transaction> (
stpTrans, reason, context.app);
if (tpTrans->getStatus() != NEW)
{

1
src/ripple/rpc/handlers/TransactionEntry.cpp
View File

@@ -65,7 +65,6 @@ Json::Value doTransactionEntry (RPC::Context& context)
}
else
{
Transaction::pointer tpTrans;
TxMeta::pointer tmTrans;
auto tx = lpLedger->txRead (uTransID);

3
src/ripple/rpc/handlers/Tx.cpp
View File

@@ -19,9 +19,10 @@
#include <BeastConfig.h>
#include <ripple/app/ledger/LedgerMaster.h>
#include <ripple/app/ledger/TransactionMaster.h>
#include <ripple/app/main/Application.h>
#include <ripple/app/misc/NetworkOPs.h>
#include <ripple/app/tx/TransactionMaster.h>
#include <ripple/app/misc/Transaction.h>
#include <ripple/net/RPCErr.h>
#include <ripple/protocol/ErrorCodes.h>
#include <ripple/protocol/JsonFields.h>

2
src/ripple/rpc/handlers/TxHistory.cpp
View File

@@ -19,7 +19,7 @@
#include <BeastConfig.h>
#include <ripple/app/main/Application.h>
#include <ripple/app/tx/Transaction.h>
#include <ripple/app/misc/Transaction.h>
#include <ripple/core/DatabaseCon.h>
#include <ripple/core/SociDB.h>
#include <ripple/net/RPCErr.h>

1
src/ripple/rpc/impl/TransactionSign.cpp
View File

@@ -21,6 +21,7 @@
#include <ripple/rpc/impl/TransactionSign.h>
#include <ripple/app/ledger/LedgerMaster.h>
#include <ripple/app/main/Application.h>
#include <ripple/app/misc/Transaction.h>
#include <ripple/app/paths/Pathfinder.h>
#include <ripple/app/tx/apply.h> // Validity::Valid
#include <ripple/basics/Log.h>

5
src/ripple/rpc/impl/TransactionSign.h
View File

@@ -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<void (Transaction::pointer& transaction,
std::function<void (std::shared_ptr<Transaction>& transaction,
bool bAdmin, bool bLocal, NetworkOPs::FailHard failType)>;
inline ProcessTransactionFn getProcessTxnFn (NetworkOPs& netOPs)
{
return [&netOPs](Transaction::pointer& transaction,
return [&netOPs](std::shared_ptr<Transaction>& transaction,
bool bAdmin, bool bLocal, NetworkOPs::FailHard failType)
{
netOPs.processTransaction(transaction, bAdmin, bLocal, failType);

3
src/ripple/rpc/impl/Utilities.cpp
View File

@@ -18,6 +18,7 @@
//==============================================================================
#include <ripple/rpc/impl/Utilities.h>
#include <ripple/app/misc/Transaction.h>
#include <ripple/json/json_value.h>
#include <ripple/protocol/JsonFields.h>
#include <ripple/protocol/ErrorCodes.h>
@@ -32,7 +33,7 @@ void
addPaymentDeliveredAmount (
Json::Value& meta,
RPC::Context& context,
Transaction::pointer transaction,
std::shared_ptr<Transaction> transaction,
TxMeta::pointer transactionMeta)
{
// We only want to add a "delivered_amount" field if the transaction

5
src/ripple/rpc/impl/Utilities.h
View File

@@ -21,7 +21,6 @@
#define RIPPLE_RPC_IMPL_UTILITIES_H_INCLUDED
#include <ripple/ledger/TxMeta.h>
#include <ripple/app/tx/Transaction.h>
#include <ripple/rpc/impl/Tuning.h>
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<Transaction>,
TxMeta::pointer);
/** Inject JSON describing ledger entry

2
src/ripple/rpc/tests/JSONRPC.test.cpp
View File

@@ -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<Transaction>&, bool, bool, NetworkOPs::FailHard)
{
;
}

4
src/ripple/unity/app_ledger.cpp
View File

@@ -34,9 +34,13 @@
#include <ripple/app/ledger/impl/DisputedTx.cpp>
#include <ripple/app/ledger/impl/InboundLedger.cpp>
#include <ripple/app/ledger/impl/InboundLedgers.cpp>
#include <ripple/app/ledger/impl/InboundTransactions.cpp>
#include <ripple/app/ledger/impl/LedgerCleaner.cpp>
#include <ripple/app/ledger/impl/LedgerConsensusImp.cpp>
#include <ripple/app/ledger/impl/LedgerMaster.cpp>
#include <ripple/app/ledger/impl/LedgerTiming.cpp>
#include <ripple/app/ledger/impl/LocalTxs.cpp>
#include <ripple/app/ledger/impl/OpenLedger.cpp>
#include <ripple/app/ledger/impl/LedgerToJson.cpp>
#include <ripple/app/ledger/impl/TransactionAcquire.cpp>
#include <ripple/app/ledger/impl/TransactionMaster.cpp>

1
src/ripple/unity/app_misc.cpp
View File

@@ -29,4 +29,5 @@
#include <ripple/app/misc/Validations.cpp>
#include <ripple/app/misc/impl/AccountTxPaging.cpp>
#include <ripple/app/misc/impl/Transaction.cpp>
#include <ripple/app/misc/impl/TxQ.cpp>

5
src/ripple/unity/app_tx.cpp
View File

@@ -27,8 +27,6 @@
#include <ripple/app/tx/impl/Change.cpp>
#include <ripple/app/tx/impl/CreateOffer.cpp>
#include <ripple/app/tx/impl/CreateTicket.cpp>
#include <ripple/app/tx/impl/InboundTransactions.cpp>
#include <ripple/app/tx/impl/LocalTxs.cpp>
#include <ripple/app/tx/impl/OfferStream.cpp>
#include <ripple/app/tx/impl/Payment.cpp>
#include <ripple/app/tx/impl/SetAccount.cpp>
@@ -38,8 +36,5 @@
#include <ripple/app/tx/impl/SignerEntries.cpp>
#include <ripple/app/tx/impl/SusPay.cpp>
#include <ripple/app/tx/impl/Taker.cpp>
#include <ripple/app/tx/impl/TransactionMaster.cpp>
#include <ripple/app/tx/impl/Transaction.cpp>
#include <ripple/app/tx/impl/ApplyContext.cpp>
#include <ripple/app/tx/impl/TransactionAcquire.cpp>
#include <ripple/app/tx/impl/Transactor.cpp>