Feature cleanup

RippleD.props

@@ -17,6 +17,7 @@
       <WarningLevel>Level3</WarningLevel>
       <AdditionalIncludeDirectories>$(RepoDir);$(RepoDir)\src\cpp\leveldb;$(RepoDir)\src\cpp\leveldb\include;$(RepoDir)\src\cpp\protobuf\src;$(RepoDir)\src\cpp\protobuf\vsprojects;$(RepoDir)\build\proto;$(RepoDir)\Subtrees\beast;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <ExceptionHandling>Async</ExceptionHandling>
     </ClCompile>
     <Link>
       <AdditionalDependencies>Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

modules/ripple_basics/utility/ripple_InstanceCounter.h

@@ -1,7 +1,7 @@
 #ifndef RIPPLE_INSTANCECOUNTER_H
 #define RIPPLE_INSTANCECOUNTER_H
 
-// VFALCO TODO Clean up this junk, remove the macros, replace
+// VFALCO TODO Clean this up, remove the macros, replace
 //		   with a robust leak checker when we have atomics.
 //
 
@@ -38,7 +38,7 @@ class InstanceType
 public:
 	typedef std::pair<std::string, int> InstanceCount;
 
-	InstanceType(const char *n) : mInstances(0), mName(n)
+	explicit InstanceType (const char *n) : mInstances(0), mName(n)
 	{
 		mNextInstance = sHeadInstance;
 		sHeadInstance = this;
@@ -65,7 +65,7 @@ class InstanceType
 	{
 		if (sMultiThreaded)
 		{
-			// VFALCO NOTE Junk that will go away with atomics
+			// VFALCO NOTE This will go away with atomics
 			mLock.lock();
 			++mInstances;
 			mLock.unlock();

modules/ripple_basics/utility/ripple_RandomNumbers.cpp

@@ -160,7 +160,7 @@ bool RandomNumbers::platformAddEntropy ()
 
 void RandomNumbers::platformAddPerformanceMonitorEntropy ()
 {
-	// VFALCO This is how we simulate local functions
+    // VFALCO TODO Remove all this fancy stuff
 	struct
 	{
 		int64 operator() () const

modules/ripple_basics/utility/ripple_Sustain.h

@@ -19,7 +19,10 @@
 #ifndef RIPPLE_SUSTAIN_H
 #define RIPPLE_SUSTAIN_H
 
-// VFALCO TODO figure out what the heck this is??
+// "Sustain" is a system for a buddy process that monitors the main process
+// and relaunches it on a fault.
+//
+// VFALCO TODO Rename this and put it in a class.
 extern bool HaveSustain();
 extern std::string StopSustain();
 extern std::string DoSustain();

modules/ripple_client/ripple_client.cpp

@@ -22,4 +22,49 @@
     @ingroup ripple_client
 */
 
+#include <boost/unordered_set.hpp>
+#include <boost/asio.hpp>
+#include <boost/asio/ssl.hpp>
+
 #include "ripple_client.h"
+
+#include "../ripple_basics/ripple_basics.h"
+
+#include "../ripple_data/ripple_data.h"
+
+#include      "src/cpp/ripple/ripple_InfoSub.h"
+
+// Order and indentation reflect the hierarchy of dependencies
+    #include   "src/cpp/ripple/ripple_HashedObject.h"
+    #include   "src/cpp/ripple/ripple_SHAMapItem.h"
+    #include   "src/cpp/ripple/ripple_SHAMapNode.h"
+    #include   "src/cpp/ripple/ripple_SHAMapAddNode.h"
+    #include   "src/cpp/ripple/ripple_SHAMapMissingNode.h"
+    #include   "src/cpp/ripple/ripple_SHAMapTreeNode.h"
+    #include   "src/cpp/ripple/ripple_SHAMapSyncFilter.h"
+   #include    "src/cpp/ripple/ripple_SHAMap.h"
+    #include   "src/cpp/ripple/ripple_SerializedTransaction.h"
+     #include  "src/cpp/ripple/ripple_SerializedLedger.h"
+    #include   "src/cpp/ripple/TransactionMeta.h"
+   #include    "src/cpp/ripple/Transaction.h"
+   #include    "src/cpp/ripple/AccountState.h"
+   #include    "src/cpp/ripple/NicknameState.h"
+  #include     "src/cpp/ripple/Ledger.h"
+    #include   "src/cpp/ripple/LedgerEntrySet.h"
+   #include    "src/cpp/ripple/TransactionEngine.h"
+      #include "src/cpp/ripple/LoadManager.h"
+     #include  "src/cpp/ripple/ripple_Peer.h"
+    #include   "src/cpp/ripple/ripple_PeerSet.h"
+   #include    "src/cpp/ripple/ripple_LedgerAcquire.h"
+   #include    "src/cpp/ripple/ripple_LedgerHistory.h"
+   #include    "src/cpp/ripple/ripple_CanonicalTXSet.h"
+  #include     "src/cpp/ripple/LedgerMaster.h"
+  #include     "src/cpp/ripple/ripple_InfoSub.h"
+  #include     "src/cpp/ripple/SerializedValidation.h"
+  #include     "src/cpp/ripple/LedgerProposal.h"
+  #include     "src/cpp/ripple/ripple_AcceptedLedgerTx.h"
+ #include      "src/cpp/ripple/NetworkOPs.h"
+ #include      "src/cpp/ripple/ripple_IApplication.h"
+
+#include       "src/cpp/ripple/ripple_InfoSub.cpp"
+//#include       "src/cpp/ripple/NetworkOPs.cpp"

modules/ripple_client/ripple_client.h

@@ -32,6 +32,4 @@
 #ifndef RIPPLE_CLIENT_H
 #define RIPPLE_CLIENT_H
 
-#include "modules/ripple_basics/ripple_basics.h"
-
 #endif

modules/ripple_data/protocol/ripple_LedgerFormat.cpp

@@ -3,8 +3,6 @@ std::map <int, LedgerEntryFormat*> LedgerEntryFormat::byType;
 
 std::map <std::string, LedgerEntryFormat*> LedgerEntryFormat::byName;
 
-// VFALCO TODO surely we can think of a better way than macros?
-
 #define LEF_BASE											\
 	<< SOElement(sfLedgerIndex,				SOE_OPTIONAL)	\
 	<< SOElement(sfLedgerEntryType,			SOE_REQUIRED)	\

modules/ripple_data/protocol/ripple_RippleAddress.cpp

@@ -1,13 +1,8 @@
 
-
-// VFALCO TODO remove this when it's safe to do so.
-#ifdef __APPLICATION__
-#error Including Application.h is disallowed!
-#endif
-
 SETUP_LOG (RippleAddress)
 
-RippleAddress::RippleAddress() : mIsValid(false)
+RippleAddress::RippleAddress ()
+    : mIsValid (false)
 {
     nVersion = VER_NONE;
 }

modules/ripple_data/protocol/ripple_SerializedTypes.h

@@ -30,7 +30,7 @@ static const uint160 u160_zero(0), u160_one(1);
 static inline const uint160& get_u160_zero() { return u160_zero; }
 static inline const uint160& get_u160_one() { return u160_one; }
 
-// VFALCO TODO replace these with language constructs, gah!
+// VFALCO TODO replace these with language constructs
 #define CURRENCY_XRP		get_u160_zero()
 #define CURRENCY_ONE		get_u160_one()					// Used as a place holder.
 #define CURRENCY_BAD		uint160(0x5852500000000000)		// Do not allow XRP as an IOU currency.

modules/ripple_data/ripple_data.h

@@ -57,6 +57,15 @@
 // VFALCO TODO try to reduce these dependencies
 #include "../ripple_basics/ripple_basics.h"
 
+//------------------------------------------------------------------------------
+
+// VFALCO TODO prepare a unity header for LevelDB
+// VFALCO TODO don't expose leveldb throughout the headers
+#include "leveldb/cache.h"
+#include "leveldb/filter_policy.h"
+#include "leveldb/db.h"
+#include "leveldb/write_batch.h"
+
 // VFALCO TODO figure out a good place for this file, perhaps give it some
 //         additional hierarchy via directories.
 #include "ripple.pb.h"

modules/ripple_main/ripple_main.cpp

@@ -34,11 +34,14 @@
 #include <iostream>
 #include <list>
 #include <map>
+#include <queue>
 #include <set>
 #include <stack>
 #include <string>
 #include <vector>
 
+// VFALCO NOTE Holy smokes...that's a lot of boost!!!
+
 #include <boost/algorithm/string.hpp>
 #include <boost/array.hpp>
 #include <boost/asio.hpp>
@@ -55,11 +58,14 @@
 #include <boost/function.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/make_shared.hpp>
+#include <boost/mem_fn.hpp>
 #include <boost/pointer_cast.hpp>
+#include <boost/program_options.hpp>
 #include <boost/ptr_container/ptr_vector.hpp>
 #include <boost/ref.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/test/included/unit_test.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/thread.hpp>
 #include <boost/thread/condition_variable.hpp>
@@ -77,14 +83,6 @@
 
 //------------------------------------------------------------------------------
 
-// VFALCO TODO prepare a unity header for LevelDB
-#include "leveldb/cache.h"
-#include "leveldb/filter_policy.h"
-#include "leveldb/db.h"
-#include "leveldb/write_batch.h"
-
-//------------------------------------------------------------------------------
-
 // VFALCO TODO fix these warnings!
 #ifdef _MSC_VER
 //#pragma warning (push) // Causes spurious C4503 "decorated name exceeds maximum length"
@@ -197,7 +195,16 @@
 //
 // -----------
 
-#include "src/cpp/ripple/Application.h"
+#include "src/cpp/ripple/TransactionMaster.h"
+#include "src/cpp/ripple/Wallet.h"
+#include "src/cpp/ripple/WSDoor.h"
+#include "src/cpp/ripple/SNTPClient.h"
+#include "src/cpp/ripple/RPCHandler.h"
+#include "src/cpp/ripple/TransactionQueue.h"
+#include "src/cpp/ripple/OrderBookDB.h"
+#include "src/cpp/ripple/ripple_DatabaseCon.h"
+
+#include "src/cpp/ripple/ripple_IApplication.h"
 #include "src/cpp/ripple/AutoSocket.h"
 #include "src/cpp/ripple/CallRPC.h"
 #include "src/cpp/ripple/ChangeTransactor.h"
@@ -210,8 +217,7 @@
 #include "src/cpp/ripple/OfferCancelTransactor.h"
 #include "src/cpp/ripple/OfferCreateTransactor.h"
 #include "src/cpp/ripple/OrderBook.h"
-#include "src/cpp/ripple/OrderBookDB.h"
-#include "src/cpp/ripple/PFRequest.h"
+#include "src/cpp/ripple/ripple_PathRequest.h"
 #include "src/cpp/ripple/ParameterTable.h"
 #include "src/cpp/ripple/ParseSection.h"
 #include "src/cpp/ripple/Pathfinder.h"
@@ -220,24 +226,18 @@
 #include "src/cpp/ripple/RPC.h"
 #include "src/cpp/ripple/RPCDoor.h"
 #include "src/cpp/ripple/RPCErr.h"
-#include "src/cpp/ripple/RPCHandler.h"
 #include "src/cpp/ripple/RPCServer.h"
 #include "src/cpp/ripple/RPCSub.h"
 #include "src/cpp/ripple/RegularKeySetTransactor.h"
 #include "src/cpp/ripple/RippleCalc.h"
 #include "src/cpp/ripple/RippleState.h"
-#include "src/cpp/ripple/SNTPClient.h"
 #include "src/cpp/ripple/SerializedValidation.h"
-#include "src/cpp/ripple/TransactionMaster.h"
-#include "src/cpp/ripple/TransactionQueue.h"
 #include "src/cpp/ripple/Transactor.h"
 #include "src/cpp/ripple/AccountSetTransactor.h"
 #include "src/cpp/ripple/TrustSetTransactor.h"
 #include "src/cpp/ripple/Version.h"
 #include "src/cpp/ripple/WSConnection.h"
-#include "src/cpp/ripple/WSDoor.h"
 #include "src/cpp/ripple/WSHandler.h"
-#include "src/cpp/ripple/Wallet.h"
 #include "src/cpp/ripple/WalletAddTransactor.h"
 
 #include "../websocketpp/src/logger/logger.hpp" // for ripple_LogWebSockets.cpp
@@ -270,7 +270,6 @@ static DH* handleTmpDh(SSL* ssl, int is_export, int iKeyLength)
 #include "src/cpp/ripple/AccountItems.cpp" // no log
 #include "src/cpp/ripple/AccountSetTransactor.cpp"
 #include "src/cpp/ripple/AccountState.cpp" // no log
-#include "src/cpp/ripple/Application.cpp"
 #include "src/cpp/ripple/CallRPC.cpp"
 #include "src/cpp/ripple/ripple_CanonicalTXSet.cpp"
 #include "src/cpp/ripple/ChangeTransactor.cpp" // no log
@@ -300,7 +299,6 @@ static DH* handleTmpDh(SSL* ssl, int is_export, int iKeyLength)
 #include "src/cpp/ripple/Pathfinder.cpp"
 #include "src/cpp/ripple/PaymentTransactor.cpp"
 #include "src/cpp/ripple/PeerDoor.cpp"
-#include "src/cpp/ripple/PFRequest.cpp"
 #include "src/cpp/ripple/RegularKeySetTransactor.cpp"
 #include "src/cpp/ripple/RippleCalc.cpp"
 #include "src/cpp/ripple/RippleState.cpp" // no log
@@ -322,7 +320,6 @@ static DH* handleTmpDh(SSL* ssl, int is_export, int iKeyLength)
 #include "src/cpp/ripple/TransactionQueue.cpp" // no log
 #include "src/cpp/ripple/Transactor.cpp"
 #include "src/cpp/ripple/TrustSetTransactor.cpp"
-#include "src/cpp/ripple/UpdateTables.cpp"
 #include "src/cpp/ripple/Wallet.cpp"
 #include "src/cpp/ripple/WalletAddTransactor.cpp"
 #include "src/cpp/ripple/WSDoor.cpp" // uses logging in WSConnection.h 
@@ -339,13 +336,14 @@ static DH* handleTmpDh(SSL* ssl, int is_export, int iKeyLength)
 
 #include "src/cpp/ripple/ripple_AcceptedLedgerTx.cpp"
 #include "src/cpp/ripple/ripple_AcceptedLedger.cpp"
+#include "src/cpp/ripple/ripple_Application.cpp"
 #include "src/cpp/ripple/ripple_Config.cpp"
 #include "src/cpp/ripple/ripple_DatabaseCon.cpp"
 #include "src/cpp/ripple/ripple_Features.cpp"
 #include "src/cpp/ripple/ripple_FeeVote.cpp"
 #include "src/cpp/ripple/ripple_HashedObjectStore.cpp"
 #include "src/cpp/ripple/ripple_HashRouter.cpp"
-#include "src/cpp/ripple/ripple_InfoSub.cpp"
+//#include "src/cpp/ripple/ripple_InfoSub.cpp"
 #include "src/cpp/ripple/ripple_Job.cpp"
 #include "src/cpp/ripple/ripple_JobQueue.cpp"
 #include "src/cpp/ripple/ripple_LedgerAcquire.cpp"
@@ -355,6 +353,7 @@ static DH* handleTmpDh(SSL* ssl, int is_export, int iKeyLength)
 #include "src/cpp/ripple/ripple_LoadMonitor.cpp"
 #include "src/cpp/ripple/ripple_LogWebsockets.cpp"
 #include "src/cpp/ripple/ripple_LoadFeeTrack.cpp"
+#include "src/cpp/ripple/ripple_PathRequest.cpp"
 #include "src/cpp/ripple/ripple_Peer.cpp"
 #include "src/cpp/ripple/ripple_Peers.cpp"
 #include "src/cpp/ripple/ripple_PeerSet.cpp"

newcoin.vcxproj

@@ -734,7 +734,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\cpp\ripple\Application.cpp">
+    <ClCompile Include="src\cpp\ripple\ripple_Application.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -990,7 +990,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\cpp\ripple\PFRequest.cpp">
+    <ClCompile Include="src\cpp\ripple\ripple_PathRequest.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
@@ -1264,12 +1264,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\cpp\ripple\UpdateTables.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="src\cpp\ripple\Wallet.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -1702,7 +1696,7 @@
     <ClInclude Include="src\cpp\ripple\AccountItems.h" />
     <ClInclude Include="src\cpp\ripple\AccountSetTransactor.h" />
     <ClInclude Include="src\cpp\ripple\AccountState.h" />
-    <ClInclude Include="src\cpp\ripple\Application.h" />
+    <ClInclude Include="src\cpp\ripple\ripple_IApplication.h" />
     <ClInclude Include="src\cpp\ripple\AutoSocket.h" />
     <ClInclude Include="src\cpp\ripple\CallRPC.h" />
     <ClInclude Include="src\cpp\ripple\ripple_AcceptedLedgerTx.h" />
@@ -1745,7 +1739,7 @@
     <ClInclude Include="src\cpp\ripple\Pathfinder.h" />
     <ClInclude Include="src\cpp\ripple\PaymentTransactor.h" />
     <ClInclude Include="src\cpp\ripple\PeerDoor.h" />
-    <ClInclude Include="src\cpp\ripple\PFRequest.h" />
+    <ClInclude Include="src\cpp\ripple\ripple_PathRequest.h" />
     <ClInclude Include="src\cpp\ripple\RegularKeySetTransactor.h" />
     <ClInclude Include="src\cpp\ripple\RippleCalc.h" />
     <ClInclude Include="src\cpp\ripple\RippleState.h" />