Tidy up app unity sources

2025-12-06 17:27:55 +00:00 · 2015-05-22 08:34:26 -07:00
parent 860ab3523c
commit 52f298f150
63 changed files with 481 additions and 706 deletions
--- a/src/ripple/unity/app.cpp
+++ b/src/ripple/unity/app.cpp
@@ -18,11 +18,5 @@
 //==============================================================================

 #include <BeastConfig.h>
-#include <ripple/app/impl/BasicApp.cpp>
-#include <ripple/app/main/Application.cpp>
-#include <ripple/app/main/CollectorManager.cpp>
-#include <ripple/app/main/Main.cpp>
-#include <ripple/app/main/NodeStoreScheduler.cpp>
 #include <ripple/resource/Manager.h>
 #include <ripple/rpc/Manager.h>
-#include <beast/module/core/time/Time.h>
--- a/src/ripple/unity/app1.cpp
+++ b/src/ripple/unity/app1.cpp
@@ -18,7 +18,3 @@
 //==============================================================================

 #include <BeastConfig.h>
-
-#include <ripple/app/consensus/LedgerConsensus.cpp>
-#include <ripple/app/ledger/LedgerCleaner.cpp>
-#include <ripple/app/ledger/LedgerMaster.cpp>
--- a/src/ripple/unity/app2.cpp
+++ b/src/ripple/unity/app2.cpp
@@ -18,15 +18,3 @@
 //==============================================================================

 #include <BeastConfig.h>
-
-#include <ripple/app/data/DatabaseCon.cpp>
-#include <ripple/app/data/DBInit.cpp>
-#include <ripple/app/ledger/AccountStateSF.cpp>
-#include <ripple/app/ledger/BookListeners.cpp>
-#include <ripple/app/ledger/ConsensusTransSetSF.cpp>
-#include <ripple/app/ledger/LedgerProposal.cpp>
-#include <ripple/app/ledger/OrderBookDB.cpp>
-#include <ripple/app/ledger/TransactionStateSF.cpp>
-#include <ripple/app/main/LoadManager.cpp>
-#include <ripple/app/misc/CanonicalTXSet.cpp>
-#include <ripple/app/misc/SHAMapStoreImp.cpp>
--- a/src/ripple/unity/app3.cpp
+++ b/src/ripple/unity/app3.cpp
@@ -19,10 +19,5 @@

 #include <BeastConfig.h>

-#include <ripple/app/ledger/Ledger.cpp>
-#include <ripple/app/ledger/impl/LedgerFees.cpp>
-#include <ripple/app/misc/AccountState.cpp>
-
-#include <ripple/app/tests/common_ledger.cpp>
-#include <ripple/app/ledger/tests/Ledger_test.cpp>
-#include <ripple/app/tests/Path_test.cpp>
+#include <ripple/app/ledger/tests/common_ledger.cpp>
+#include <ripple/app/paths/tests/Path_test.cpp>
--- a/src/ripple/unity/app4.cpp
+++ b/src/ripple/unity/app4.cpp
@@ -19,35 +19,3 @@

 #include <BeastConfig.h>

-#include <ripple/app/ledger/InboundLedger.cpp>
-#include <ripple/app/paths/RippleState.cpp>
-#include <ripple/app/peers/UniqueNodeList.cpp>
-
-#include <ripple/app/tx/impl/InboundTransactions.cpp>
-#include <ripple/app/tx/impl/LocalTxs.cpp>
-#include <ripple/app/tx/impl/TransactionMaster.cpp>
-#include <ripple/app/tx/impl/Transaction.cpp>
-#include <ripple/app/tx/impl/TransactionEngine.cpp>
-#include <ripple/app/tx/impl/TransactionMeta.cpp>
-#include <ripple/app/tx/impl/TransactionAcquire.cpp>
-#include <ripple/app/tx/impl/Transactor.cpp>
-#include <ripple/app/tx/impl/BookTip.cpp>
-#include <ripple/app/tx/impl/OfferStream.cpp>
-#include <ripple/app/tx/impl/Taker.cpp>
-
-#include <ripple/app/tx/impl/Change.cpp>
-#include <ripple/app/tx/impl/CancelOffer.cpp>
-#include <ripple/app/tx/impl/Payment.cpp>
-#include <ripple/app/tx/impl/SetRegularKey.cpp>
-#include <ripple/app/tx/impl/SetAccount.cpp>
-#include <ripple/app/tx/impl/SetTrust.cpp>
-#include <ripple/app/tx/impl/CreateOffer.cpp>
-#include <ripple/app/tx/impl/CreateTicket.cpp>
-#include <ripple/app/tx/impl/CancelTicket.cpp>
-#include <ripple/app/tx/impl/SetSignerList.cpp>
-#include <ripple/app/tx/impl/SignerEntries.cpp>
-
-#include <ripple/app/tx/tests/common_transactor.cpp>
-#include <ripple/app/tx/tests/MultiSign.test.cpp>
-#include <ripple/app/tx/tests/OfferStream.test.cpp>
-#include <ripple/app/tx/tests/Taker.test.cpp>
--- a/src/ripple/unity/app5.cpp
+++ b/src/ripple/unity/app5.cpp
@@ -19,8 +19,6 @@

 #include <BeastConfig.h>

-#include <ripple/app/ledger/LedgerTiming.cpp>
-#include <ripple/app/ledger/AcceptedLedgerTx.cpp>
 #include <ripple/app/main/LocalCredentials.cpp>
 #include <ripple/app/misc/Validations.cpp>
 #include <ripple/app/misc/FeeVoteImpl.cpp>
--- a/src/ripple/unity/app6.cpp
+++ b/src/ripple/unity/app6.cpp
@@ -19,17 +19,3 @@

 #include <BeastConfig.h>

-#include <ripple/app/ledger/LedgerEntrySet.cpp>
-#include <ripple/app/ledger/AcceptedLedger.cpp>
-#include <ripple/app/ledger/DirectoryEntryIterator.cpp>
-#include <ripple/app/ledger/OrderBookIterator.cpp>
-#include <ripple/app/ledger/DeferredCredits.cpp>
-#include <ripple/app/consensus/DisputedTx.cpp>
-#include <ripple/app/misc/HashRouter.cpp>
-#include <ripple/app/paths/AccountCurrencies.cpp>
-#include <ripple/app/paths/Credit.cpp>
-#include <ripple/app/paths/FindPaths.cpp>
-#include <ripple/app/paths/Pathfinder.cpp>
-#include <ripple/app/misc/AmendmentTableImpl.cpp>
-#include <ripple/app/misc/tests/AmendmentTable.test.cpp>
-#include <ripple/app/ledger/tests/DeferredCredits.test.cpp>
--- a/src/ripple/unity/app7.cpp
+++ b/src/ripple/unity/app7.cpp
@@ -19,8 +19,3 @@

 #include <BeastConfig.h>

-#include <ripple/app/ledger/InboundLedgers.cpp>
-#include <ripple/app/ledger/LedgerHistory.cpp>
-#include <ripple/app/misc/NetworkOPs.cpp>
-#include <ripple/app/misc/impl/AccountTxPaging.cpp>
-#include <ripple/app/misc/tests/AccountTxPaging.test.cpp>
--- a/src/ripple/unity/app_ledger.cpp
+++ b/src/ripple/unity/app_ledger.cpp
@@ -0,0 +1,48 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of rippled: https://github.com/ripple/rippled
+    Copyright (c) 2012, 2013 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 <BeastConfig.h>
+
+#include <ripple/app/ledger/AcceptedLedger.cpp>
+#include <ripple/app/ledger/AcceptedLedgerTx.cpp>
+#include <ripple/app/ledger/AccountStateSF.cpp>
+#include <ripple/app/ledger/BookListeners.cpp>
+#include <ripple/app/ledger/ConsensusTransSetSF.cpp>
+#include <ripple/app/ledger/DeferredCredits.cpp>
+#include <ripple/app/ledger/DirectoryEntryIterator.cpp>
+#include <ripple/app/ledger/DisputedTx.cpp>
+#include <ripple/app/ledger/InboundLedger.cpp>
+#include <ripple/app/ledger/InboundLedgers.cpp>
+#include <ripple/app/ledger/Ledger.cpp>
+#include <ripple/app/ledger/LedgerConsensus.cpp>
+#include <ripple/app/ledger/LedgerCleaner.cpp>
+#include <ripple/app/ledger/LedgerEntrySet.cpp>
+#include <ripple/app/ledger/LedgerHistory.cpp>
+#include <ripple/app/ledger/LedgerMaster.cpp>
+#include <ripple/app/ledger/LedgerProposal.cpp>
+#include <ripple/app/ledger/LedgerTiming.cpp>
+#include <ripple/app/ledger/OrderBookDB.cpp>
+#include <ripple/app/ledger/OrderBookIterator.cpp>
+#include <ripple/app/ledger/TransactionStateSF.cpp>
+
+#include <ripple/app/ledger/impl/LedgerFees.cpp>
+
+#include <ripple/app/ledger/tests/common_ledger.cpp>
+#include <ripple/app/ledger/tests/DeferredCredits.test.cpp>
+#include <ripple/app/ledger/tests/Ledger_test.cpp>
--- a/src/ripple/unity/app_main.cpp
+++ b/src/ripple/unity/app_main.cpp
@@ -0,0 +1,29 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of rippled: https://github.com/ripple/rippled
+    Copyright (c) 2012, 2013 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 <BeastConfig.h>
+
+#include <ripple/app/main/BasicApp.cpp>
+#include <ripple/app/main/Application.cpp>
+#include <ripple/app/main/CollectorManager.cpp>
+#include <ripple/app/main/Main.cpp>
+#include <ripple/app/main/NodeStoreScheduler.cpp>
+#include <ripple/app/main/DBInit.cpp>
+#include <ripple/app/main/LoadManager.cpp>
+#include <ripple/app/main/LocalCredentials.cpp>
--- a/src/ripple/unity/app_misc.cpp
+++ b/src/ripple/unity/app_misc.cpp
@@ -0,0 +1,35 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of rippled: https://github.com/ripple/rippled
+    Copyright (c) 2012, 2013 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 <BeastConfig.h>
+
+#include <ripple/app/misc/AccountState.cpp>
+#include <ripple/app/misc/AmendmentTableImpl.cpp>
+#include <ripple/app/misc/CanonicalTXSet.cpp>
+#include <ripple/app/misc/FeeVoteImpl.cpp>
+#include <ripple/app/misc/HashRouter.cpp>
+#include <ripple/app/misc/NetworkOPs.cpp>
+#include <ripple/app/misc/SHAMapStoreImp.cpp>
+#include <ripple/app/misc/UniqueNodeList.cpp>
+#include <ripple/app/misc/Validations.cpp>
+
+#include <ripple/app/misc/impl/AccountTxPaging.cpp>
+
+#include <ripple/app/misc/tests/AccountTxPaging.test.cpp>
+#include <ripple/app/misc/tests/AmendmentTable.test.cpp>
--- a/src/ripple/unity/app_paths.cpp
+++ b/src/ripple/unity/app_paths.cpp
@@ -19,9 +19,15 @@

 #include <BeastConfig.h>

+#include <ripple/app/paths/RippleState.cpp>
+#include <ripple/app/paths/AccountCurrencies.cpp>
+#include <ripple/app/paths/Credit.cpp>
+#include <ripple/app/paths/FindPaths.cpp>
+#include <ripple/app/paths/Pathfinder.cpp>
+
 #ifdef _MSC_VER
 #pragma warning (push)
-#pragma warning (disable: 4309) // truncation of constant value
+//#pragma warning (disable: 4309) // truncation of constant value
 #endif
 #include <ripple/app/paths/Node.cpp>
 #include <ripple/app/paths/PathRequest.cpp>
@@ -38,9 +44,7 @@
 #include <ripple/app/paths/cursor/ReverseLiquidity.cpp>
 #include <ripple/app/paths/cursor/ReverseLiquidityForAccount.cpp>
 #include <ripple/app/paths/cursor/RippleLiquidity.cpp>
-
 #include <ripple/app/paths/RippleLineCache.cpp>
-
 #ifdef _MSC_VER
 #pragma warning (pop)
 #endif
--- a/src/ripple/unity/app_tx.cpp
+++ b/src/ripple/unity/app_tx.cpp
@@ -0,0 +1,49 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of rippled: https://github.com/ripple/rippled
+    Copyright (c) 2012, 2013 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 <BeastConfig.h>
+
+#include <ripple/app/tx/impl/InboundTransactions.cpp>
+#include <ripple/app/tx/impl/LocalTxs.cpp>
+#include <ripple/app/tx/impl/TransactionMaster.cpp>
+#include <ripple/app/tx/impl/Transaction.cpp>
+#include <ripple/app/tx/impl/TransactionEngine.cpp>
+#include <ripple/app/tx/impl/TransactionMeta.cpp>
+#include <ripple/app/tx/impl/TransactionAcquire.cpp>
+#include <ripple/app/tx/impl/Transactor.cpp>
+#include <ripple/app/tx/impl/BookTip.cpp>
+#include <ripple/app/tx/impl/OfferStream.cpp>
+#include <ripple/app/tx/impl/Taker.cpp>
+
+#include <ripple/app/tx/impl/Change.cpp>
+#include <ripple/app/tx/impl/CancelOffer.cpp>
+#include <ripple/app/tx/impl/Payment.cpp>
+#include <ripple/app/tx/impl/SetRegularKey.cpp>
+#include <ripple/app/tx/impl/SetAccount.cpp>
+#include <ripple/app/tx/impl/SetTrust.cpp>
+#include <ripple/app/tx/impl/CreateOffer.cpp>
+#include <ripple/app/tx/impl/CreateTicket.cpp>
+#include <ripple/app/tx/impl/CancelTicket.cpp>
+#include <ripple/app/tx/impl/SetSignerList.cpp>
+#include <ripple/app/tx/impl/SignerEntries.cpp>
+
+#include <ripple/app/tx/tests/common_transactor.cpp>
+#include <ripple/app/tx/tests/MultiSign.test.cpp>
+#include <ripple/app/tx/tests/OfferStream.test.cpp>
+#include <ripple/app/tx/tests/Taker.test.cpp>
--- a/src/ripple/unity/core.cpp
+++ b/src/ripple/unity/core.cpp
@@ -20,6 +20,7 @@
 #include <BeastConfig.h>

 #include <ripple/core/impl/Config.cpp>
+#include <ripple/core/impl/DatabaseCon.cpp>
 #include <ripple/core/impl/LoadFeeTrackImp.cpp>
 #include <ripple/core/impl/LoadEvent.cpp>
 #include <ripple/core/impl/LoadMonitor.cpp>
--- a/src/ripple/unity/soci_ripple.cpp
+++ b/src/ripple/unity/soci_ripple.cpp
@@ -19,6 +19,6 @@

 #include <BeastConfig.h>

-#include <ripple/app/data/DummySociDynamicBackend.cpp>
-#include <ripple/app/data/SociDB.cpp>
-#include <ripple/app/data/tests/SociDB.test.cpp>
+#include <ripple/core/impl/DummySociDynamicBackend.cpp>
+#include <ripple/core/impl/SociDB.cpp>
+#include <ripple/core/tests/SociDB.test.cpp>