Break ripple_app module into 8 pieces (from 4)

Conflicts: Builds/VisualStudio2012/RippleD.vcxproj modules/ripple_app/ripple_app.cpp
2025-12-03 01:15:53 +00:00 · 2013-07-02 07:36:08 -07:00
parent 0ddd78e9b3
commit 8497597d91
8 changed files with 153 additions and 64 deletions
--- a/modules/ripple_app/ripple_app.cpp
+++ b/modules/ripple_app/ripple_app.cpp
@@ -228,36 +228,21 @@ static const uint64 tenTo17m1 = tenTo17 - 1;

 #if ! defined (RIPPLE_MAIN_PART) || RIPPLE_MAIN_PART == 1

-#include "src/cpp/ripple/RPCHandler.cpp"
 #include "src/cpp/ripple/Ledger.cpp"
-#include "src/cpp/ripple/ripple_SHAMap.cpp" // Uses theApp
 #include "src/cpp/ripple/ripple_SHAMapDelta.cpp"
-#include "src/cpp/ripple/ripple_SHAMapItem.cpp"
 #include "src/cpp/ripple/ripple_SHAMapNode.cpp"
-#include "src/cpp/ripple/ripple_SHAMapSync.cpp"
 #include "src/cpp/ripple/ripple_SHAMapTreeNode.cpp"
-#include "src/cpp/ripple/ripple_SHAMapMissingNode.cpp"

 #include "src/cpp/ripple/ripple_Database.cpp"
-#include "src/cpp/ripple/ripple_AccountItem.cpp"
 #include "src/cpp/ripple/ripple_AccountItems.cpp"
-#include "src/cpp/ripple/AccountSetTransactor.cpp"
 #include "src/cpp/ripple/ripple_AccountState.cpp"
-#include "src/cpp/ripple/ripple_CanonicalTXSet.cpp"
 #include "src/cpp/ripple/ChangeTransactor.cpp"
-#include "src/cpp/ripple/Contract.cpp"
 #include "src/cpp/ripple/ripple_DBInit.cpp"
-#include "src/cpp/ripple/HTTPRequest.cpp"
 #include "src/cpp/ripple/Interpreter.cpp"
-#include "src/cpp/ripple/LedgerProposal.cpp"
 #include "src/cpp/ripple/LedgerTiming.cpp"
-#include "src/cpp/ripple/ripple_LoadManager.cpp"
 #include "src/cpp/ripple/ripple_Main.cpp"
-#include "src/cpp/ripple/ripple_NicknameState.cpp"
 #include "src/cpp/ripple/ripple_Offer.cpp"
-#include "src/cpp/ripple/OfferCancelTransactor.cpp"
 #include "src/cpp/ripple/Operation.cpp"
-#include "src/cpp/ripple/OrderBookDB.cpp"

 #endif

@@ -265,6 +250,29 @@ static const uint64 tenTo17m1 = tenTo17 - 1;

 #if ! defined (RIPPLE_MAIN_PART) || RIPPLE_MAIN_PART == 2

+#include "src/cpp/ripple/RPCHandler.cpp"
+#include "src/cpp/ripple/ripple_SHAMap.cpp" // Uses theApp
+#include "src/cpp/ripple/ripple_SHAMapItem.cpp"
+#include "src/cpp/ripple/ripple_SHAMapSync.cpp"
+#include "src/cpp/ripple/ripple_SHAMapMissingNode.cpp"
+
+#include "src/cpp/ripple/ripple_AccountItem.cpp"
+#include "src/cpp/ripple/AccountSetTransactor.cpp"
+#include "src/cpp/ripple/ripple_CanonicalTXSet.cpp"
+#include "src/cpp/ripple/Contract.cpp"
+#include "src/cpp/ripple/HTTPRequest.cpp"
+#include "src/cpp/ripple/LedgerProposal.cpp"
+#include "src/cpp/ripple/ripple_LoadManager.cpp"
+#include "src/cpp/ripple/ripple_NicknameState.cpp"
+#include "src/cpp/ripple/OfferCancelTransactor.cpp"
+#include "src/cpp/ripple/OrderBookDB.cpp"
+
+#endif
+
+//------------------------------------------------------------------------------
+
+#if ! defined (RIPPLE_MAIN_PART) || RIPPLE_MAIN_PART == 3
+
 // This is for PeerDoor and WSDoor
 // Generate DH for SSL connection.
 static DH* handleTmpDh (SSL* ssl, int is_export, int iKeyLength)
@@ -274,61 +282,22 @@ static DH* handleTmpDh (SSL* ssl, int is_export, int iKeyLength)
 }

 #include "src/cpp/ripple/ripple_RippleCalc.cpp"
-#include "src/cpp/ripple/ripple_UniqueNodeList.cpp"
 #include "src/cpp/ripple/CallRPC.cpp"
-#include "src/cpp/ripple/ripple_InboundLedger.cpp"
 #include "src/cpp/ripple/ripple_PathState.cpp"
-#include "src/cpp/ripple/ripple_SqliteDatabase.cpp"

 #include "src/cpp/ripple/ParameterTable.cpp"
-#include "src/cpp/ripple/PaymentTransactor.cpp"
 #include "src/cpp/ripple/PeerDoor.cpp"
-#include "src/cpp/ripple/RegularKeySetTransactor.cpp"
 #include "src/cpp/ripple/ripple_RippleLineCache.cpp"
-#include "src/cpp/ripple/ripple_RippleState.cpp"
 #include "src/cpp/ripple/rpc.cpp"
-#include "src/cpp/ripple/RPCDoor.cpp"
 #include "src/cpp/ripple/RPCErr.cpp"
-#include "src/cpp/ripple/RPCServer.cpp"
 #include "src/cpp/ripple/RPCSub.cpp"
-#include "src/cpp/ripple/ScriptData.cpp"
 #include "src/cpp/ripple/SerializedValidation.cpp"
-#include "src/cpp/ripple/SNTPClient.cpp"
 #include "src/cpp/ripple/Transaction.cpp"
-#include "src/cpp/ripple/TransactionCheck.cpp"
 #include "src/cpp/ripple/TransactionEngine.cpp"
-#include "src/cpp/ripple/TransactionMaster.cpp"
 #include "src/cpp/ripple/TransactionMeta.cpp"
-#include "src/cpp/ripple/TransactionQueue.cpp"
 #include "src/cpp/ripple/Transactor.cpp"
-#include "src/cpp/ripple/TrustSetTransactor.cpp"
 #include "src/cpp/ripple/WSConnection.cpp"
 #include "src/cpp/ripple/WSDoor.cpp"
-#include "src/cpp/ripple/WSHandler.cpp"
-
-#endif
-
-//------------------------------------------------------------------------------
-
-#if ! defined (RIPPLE_MAIN_PART) || RIPPLE_MAIN_PART == 3
-
-#include "src/cpp/ripple/ripple_Peer.cpp"
-#include "src/cpp/ripple/ripple_LedgerEntrySet.cpp"
-#include "src/cpp/ripple/ripple_Application.cpp"
-#include "src/cpp/ripple/ripple_Pathfinder.cpp"
-#include "src/cpp/ripple/OfferCreateTransactor.cpp"
-#include "src/cpp/ripple/ripple_Features.cpp"
-#include "src/cpp/ripple/ripple_Validations.cpp"
-
-#include "src/cpp/ripple/ripple_LocalCredentials.cpp"
-#include "src/cpp/ripple/WalletAddTransactor.cpp"
-#include "src/cpp/ripple/ripple_HashedObject.cpp"
-#include "src/cpp/ripple/ripple_AcceptedLedgerTx.cpp"
-#include "src/cpp/ripple/ripple_AcceptedLedger.cpp"
-#include "src/cpp/ripple/ripple_DatabaseCon.cpp"
-#include "src/cpp/ripple/ripple_DisputedTx.cpp"
-#include "src/cpp/ripple/ripple_FeeVote.cpp"
-#include "src/cpp/ripple/ripple_HashRouter.cpp"

 #endif

@@ -336,25 +305,96 @@ static DH* handleTmpDh (SSL* ssl, int is_export, int iKeyLength)

 #if ! defined (RIPPLE_MAIN_PART) || RIPPLE_MAIN_PART == 4

+// This is for PeerDoor and WSDoor
+// Generate DH for SSL connection.
+static DH* handleTmpDh (SSL* ssl, int is_export, int iKeyLength)
+{
+    // VFALCO TODO eliminate this horrendous dependency on theApp and LocalCredentials
+    return 512 == iKeyLength ? getApp ().getLocalCredentials ().getDh512 () : getApp ().getLocalCredentials ().getDh1024 ();
+}
+
+#include "src/cpp/ripple/ripple_UniqueNodeList.cpp"
+#include "src/cpp/ripple/ripple_InboundLedger.cpp"
+#include "src/cpp/ripple/ripple_SqliteDatabase.cpp"
+
+#include "src/cpp/ripple/PaymentTransactor.cpp"
+#include "src/cpp/ripple/RegularKeySetTransactor.cpp"
+#include "src/cpp/ripple/ripple_RippleState.cpp"
+#include "src/cpp/ripple/RPCDoor.cpp"
+#include "src/cpp/ripple/RPCServer.cpp"
+#include "src/cpp/ripple/ScriptData.cpp"
+#include "src/cpp/ripple/SNTPClient.cpp"
+#include "src/cpp/ripple/TransactionCheck.cpp"
+#include "src/cpp/ripple/TransactionMaster.cpp"
+#include "src/cpp/ripple/TransactionQueue.cpp"
+#include "src/cpp/ripple/TrustSetTransactor.cpp"
+#include "src/cpp/ripple/WSHandler.cpp"
+
+#endif
+
+//------------------------------------------------------------------------------
+
+#if ! defined (RIPPLE_MAIN_PART) || RIPPLE_MAIN_PART == 5
+
+#include "src/cpp/ripple/ripple_Peer.cpp"
+#include "src/cpp/ripple/ripple_Application.cpp"
+#include "src/cpp/ripple/OfferCreateTransactor.cpp"
+#include "src/cpp/ripple/ripple_Validations.cpp"
+
+#include "src/cpp/ripple/WalletAddTransactor.cpp"
+#include "src/cpp/ripple/ripple_AcceptedLedgerTx.cpp"
+#include "src/cpp/ripple/ripple_DatabaseCon.cpp"
+#include "src/cpp/ripple/ripple_FeeVote.cpp"
+
+#endif
+
+//------------------------------------------------------------------------------
+
+#if ! defined (RIPPLE_MAIN_PART) || RIPPLE_MAIN_PART == 6
+
+#include "src/cpp/ripple/ripple_LedgerEntrySet.cpp"
+#include "src/cpp/ripple/ripple_Pathfinder.cpp"
+#include "src/cpp/ripple/ripple_Features.cpp"
+
+#include "src/cpp/ripple/ripple_LocalCredentials.cpp"
+#include "src/cpp/ripple/ripple_HashedObject.cpp"
+#include "src/cpp/ripple/ripple_AcceptedLedger.cpp"
+#include "src/cpp/ripple/ripple_DisputedTx.cpp"
+#include "src/cpp/ripple/ripple_HashRouter.cpp"
+
+#endif
+
+//------------------------------------------------------------------------------
+
+#if ! defined (RIPPLE_MAIN_PART) || RIPPLE_MAIN_PART == 7
+
 #include "src/cpp/ripple/NetworkOPs.cpp"
-#include "src/cpp/ripple/ripple_LedgerConsensus.cpp"
 #include "src/cpp/ripple/ripple_Peers.cpp"
-#include "src/cpp/ripple/LedgerMaster.cpp"
 #include "src/cpp/ripple/ripple_HashedObjectStore.cpp"
-#include "src/cpp/ripple/HttpsClient.cpp"

 #include "src/cpp/ripple/ripple_InboundLedgers.cpp"
-#include "src/cpp/ripple/ripple_InfoSub.cpp"
 #include "src/cpp/ripple/ripple_LedgerHistory.cpp"
-#include "src/cpp/ripple/ripple_OrderBook.cpp"
 #include "src/cpp/ripple/ripple_PathRequest.cpp"
+#include "src/cpp/ripple/ripple_SerializedLedger.cpp"
+#include "src/cpp/ripple/ripple_TransactionAcquire.cpp"
+
+#endif
+
+//------------------------------------------------------------------------------
+
+#if ! defined (RIPPLE_MAIN_PART) || RIPPLE_MAIN_PART == 8
+
+#include "src/cpp/ripple/ripple_LedgerConsensus.cpp"
+#include "src/cpp/ripple/LedgerMaster.cpp"
+#include "src/cpp/ripple/HttpsClient.cpp"
+
+#include "src/cpp/ripple/ripple_InfoSub.cpp"
+#include "src/cpp/ripple/ripple_OrderBook.cpp"
 #include "src/cpp/ripple/ripple_PeerSet.cpp"
 #include "src/cpp/ripple/ripple_ProofOfWork.cpp"
 #include "src/cpp/ripple/ripple_ProofOfWorkFactory.h" // private
-#include "src/cpp/ripple/ripple_ProofOfWorkFactory.cpp"
-#include "src/cpp/ripple/ripple_SerializedLedger.cpp"
+#include "src/cpp/ripple/ripple_ProofOfWorkFactory.cpp" // requires ProofOfWork.cpp for ProofOfWork::sMaxDifficulty
 #include "src/cpp/ripple/ripple_SerializedTransaction.cpp"
-#include "src/cpp/ripple/ripple_TransactionAcquire.cpp"

 #include "src/cpp/ripple/ripple_SHAMapSyncFilters.cpp" // requires Application

@@ -366,7 +406,7 @@ static DH* handleTmpDh (SSL* ssl, int is_export, int iKeyLength)

 //------------------------------------------------------------------------------

-#if ! defined (RIPPLE_MAIN_PART) || RIPPLE_MAIN_PART == 4
+#if ! defined (RIPPLE_MAIN_PART) || RIPPLE_MAIN_PART == 8

 // Unit Tests
 //
@@ -377,7 +417,7 @@ static DH* handleTmpDh (SSL* ssl, int is_export, int iKeyLength)
 #include "src/cpp/ripple/LedgerUnitTests.cpp"
 #include "src/cpp/ripple/ripple_SHAMapUnitTests.cpp"
 #include "src/cpp/ripple/ripple_SHAMapSyncUnitTests.cpp"
-#include "src/cpp/ripple/ripple_ProofOfWorkFactoryUnitTests.cpp"
+#include "src/cpp/ripple/ripple_ProofOfWorkFactoryUnitTests.cpp" // Requires ProofOfWorkFactory.h
 #include "src/cpp/ripple/ripple_SerializedTransactionUnitTests.cpp"

 //------------------------------------------------------------------------------
--- a/modules/ripple_app/ripple_app_pt5.cpp
+++ b/modules/ripple_app/ripple_app_pt5.cpp
@@ -0,0 +1,8 @@
+//------------------------------------------------------------------------------
+/*
+    Copyright (c) 2011-2013, OpenCoin, Inc.
+*/
+//==============================================================================
+
+#define RIPPLE_MAIN_PART 5
+#include "ripple_app.cpp"
--- a/modules/ripple_app/ripple_app_pt6.cpp
+++ b/modules/ripple_app/ripple_app_pt6.cpp
@@ -0,0 +1,8 @@
+//------------------------------------------------------------------------------
+/*
+    Copyright (c) 2011-2013, OpenCoin, Inc.
+*/
+//==============================================================================
+
+#define RIPPLE_MAIN_PART 6
+#include "ripple_app.cpp"
--- a/modules/ripple_app/ripple_app_pt7.cpp
+++ b/modules/ripple_app/ripple_app_pt7.cpp
@@ -0,0 +1,8 @@
+//------------------------------------------------------------------------------
+/*
+    Copyright (c) 2011-2013, OpenCoin, Inc.
+*/
+//==============================================================================
+
+#define RIPPLE_MAIN_PART 7
+#include "ripple_app.cpp"
--- a/modules/ripple_app/ripple_app_pt8.cpp
+++ b/modules/ripple_app/ripple_app_pt8.cpp
@@ -0,0 +1,8 @@
+//------------------------------------------------------------------------------
+/*
+    Copyright (c) 2011-2013, OpenCoin, Inc.
+*/
+//==============================================================================
+
+#define RIPPLE_MAIN_PART 8
+#include "ripple_app.cpp"