Move unsorted stuff into ripple_mess

2025-11-20 11:05:54 +00:00 · 2013-05-25 07:27:58 -07:00
parent abf75c726e
commit bf5a7469f4
5 changed files with 186 additions and 105 deletions
--- a/modules/ripple_basics/ripple_basics.cpp
+++ b/modules/ripple_basics/ripple_basics.cpp
@@ -24,23 +24,6 @@

 #include "ripple_basics.h"

-// VFALCO: TODO, clean this up
-// This is here for Amount*.cpp
-#include "src/cpp/ripple/bignum.h"
-#if (ULONG_MAX > UINT_MAX)
-#define BN_add_word64(bn, word) BN_add_word(bn, word)
-#define BN_sub_word64(bn, word) BN_sub_word(bn, word)
-#define BN_mul_word64(bn, word) BN_mul_word(bn, word)
-#define BN_div_word64(bn, word) BN_div_word(bn, word)
-#else
-#include "src/cpp/ripple/BigNum64.h"
-#endif
-
-static const uint64 tenTo14 = 100000000000000ull;
-static const uint64 tenTo14m1 = tenTo14 - 1;
-static const uint64 tenTo17 = tenTo14 * 1000;
-static const uint64 tenTo17m1 = tenTo17 - 1;
-
 // VFALCO: TODO, fix these warnings!
 #ifdef _MSC_VER
 //#pragma warning (push) // Causes spurious C4503 "decorated name exceeds maximum length"
@@ -48,34 +31,6 @@ static const uint64 tenTo17m1 = tenTo17 - 1;
 #pragma warning (disable: 4244) // conversion, possible loss of data
 #endif

-//VFALCO: TODO, figure out how to include this
-//#include "src/cpp/ripple.pb.cc"
-
-#include "src/cpp/ripple/Log.cpp"
-
-#include "src/cpp/ripple/Amount.cpp"
-#include "src/cpp/ripple/AmountRound.cpp"
-#include "src/cpp/ripple/BitcoinUtil.cpp" // no log
-#include "src/cpp/ripple/DeterministicKeys.cpp"
-#include "src/cpp/ripple/ECIES.cpp" // no log
-#include "src/cpp/ripple/FieldNames.cpp" // no log
-#include "src/cpp/ripple/HashedObject.cpp"
-#include "src/cpp/ripple/PackedMessage.cpp" // no log
-#include "src/cpp/ripple/ParameterTable.cpp" // no log
-#include "src/cpp/ripple/ParseSection.cpp"
-#include "src/cpp/ripple/PlatRand.cpp" // no log
-#include "src/cpp/ripple/ProofOfWork.cpp"
-#include "src/cpp/ripple/RangeSet.cpp"
-#include "src/cpp/ripple/RippleAddress.cpp"
-#include "src/cpp/ripple/rfc1751.cpp" // no log
-#include "src/cpp/ripple/SHAMap.cpp"
-#include "src/cpp/ripple/SHAMapDiff.cpp" // no log
-#include "src/cpp/ripple/SHAMapNodes.cpp" // no log
-#include "src/cpp/ripple/SHAMapSync.cpp"
-#include "src/cpp/ripple/utils.cpp" // no log
-
-#include "ripple.pb.cc"
-
 #ifdef _MSC_VER
 //#pragma warning (pop)
 #endif
--- a/modules/ripple_mess/ripple_mess.cpp
+++ b/modules/ripple_mess/ripple_mess.cpp
@@ -0,0 +1,78 @@
+//------------------------------------------------------------------------------
+/*
+	Copyright (c) 2011-2013, OpenCoin, 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.
+*/
+//==============================================================================
+
+/**	Add this to get the @ref ripple_mess module.
+
+    @file ripple_mess.cpp
+    @ingroup ripple_mess
+*/
+
+#include "ripple_mess.h"
+
+// VFALCO: TODO, clean this up
+// This is here for Amount*.cpp
+#include "src/cpp/ripple/bignum.h"
+#if (ULONG_MAX > UINT_MAX)
+#define BN_add_word64(bn, word) BN_add_word(bn, word)
+#define BN_sub_word64(bn, word) BN_sub_word(bn, word)
+#define BN_mul_word64(bn, word) BN_mul_word(bn, word)
+#define BN_div_word64(bn, word) BN_div_word(bn, word)
+#else
+#include "src/cpp/ripple/BigNum64.h"
+#endif
+
+static const uint64 tenTo14 = 100000000000000ull;
+static const uint64 tenTo14m1 = tenTo14 - 1;
+static const uint64 tenTo17 = tenTo14 * 1000;
+static const uint64 tenTo17m1 = tenTo17 - 1;
+
+// VFALCO: TODO, fix these warnings!
+#ifdef _MSC_VER
+//#pragma warning (push) // Causes spurious C4503 "decorated name exceeds maximum length"
+#pragma warning (disable: 4018) // signed/unsigned mismatch
+#pragma warning (disable: 4244) // conversion, possible loss of data
+#endif
+
+#include "src/cpp/ripple/Log.cpp"
+
+#include "src/cpp/ripple/Amount.cpp"
+#include "src/cpp/ripple/AmountRound.cpp"
+#include "src/cpp/ripple/BitcoinUtil.cpp" // no log
+#include "src/cpp/ripple/DeterministicKeys.cpp"
+#include "src/cpp/ripple/ECIES.cpp" // no log
+#include "src/cpp/ripple/FieldNames.cpp" // no log
+#include "src/cpp/ripple/HashedObject.cpp"
+#include "src/cpp/ripple/PackedMessage.cpp" // no log
+#include "src/cpp/ripple/ParameterTable.cpp" // no log
+#include "src/cpp/ripple/ParseSection.cpp"
+#include "src/cpp/ripple/PlatRand.cpp" // no log
+#include "src/cpp/ripple/ProofOfWork.cpp"
+#include "src/cpp/ripple/RangeSet.cpp"
+#include "src/cpp/ripple/RippleAddress.cpp"
+#include "src/cpp/ripple/rfc1751.cpp" // no log
+#include "src/cpp/ripple/SHAMap.cpp"
+#include "src/cpp/ripple/SHAMapDiff.cpp" // no log
+#include "src/cpp/ripple/SHAMapNodes.cpp" // no log
+#include "src/cpp/ripple/SHAMapSync.cpp"
+#include "src/cpp/ripple/utils.cpp" // no log
+
+#include "ripple.pb.cc"
+
+#ifdef _MSC_VER
+//#pragma warning (pop)
+#endif
--- a/modules/ripple_mess/ripple_mess.h
+++ b/modules/ripple_mess/ripple_mess.h
@@ -0,0 +1,37 @@
+//------------------------------------------------------------------------------
+/*
+	Copyright (c) 2011-2013, OpenCoin, 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 this to get the @ref ripple_mess module.
+
+    @file ripple_mess.h
+    @ingroup ripple_mess
+*/
+
+/**	Messy classes.
+
+	Stuff I haven't gotten to cleaning up yet.
+
+	@defgroup ripple_mess
+*/
+
+#ifndef RIPPLE_MESS_H
+#define RIPPLE_MESS_H
+
+#include "../ripple_basics/ripple_basics.h"
+
+#endif
--- a/newcoin.vcxproj
+++ b/newcoin.vcxproj
@@ -178,6 +178,7 @@
    <ClCompile Include="modules\ripple_db\ripple_db.cpp" />
    <ClCompile Include="modules\ripple_ledger\ripple_ledger.cpp" />
    <ClCompile Include="modules\ripple_main\ripple_main.cpp" />
+    <ClCompile Include="modules\ripple_mess\ripple_mess.cpp" />
    <ClCompile Include="modules\ripple_net\ripple_net.cpp" />
    <ClCompile Include="src\cpp\database\database.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -1167,6 +1168,7 @@
    <ClInclude Include="modules\ripple_db\ripple_db.h" />
    <ClInclude Include="modules\ripple_ledger\ripple_ledger.h" />
    <ClInclude Include="modules\ripple_main\ripple_main.h" />
+    <ClInclude Include="modules\ripple_mess\ripple_mess.h" />
    <ClInclude Include="modules\ripple_net\ripple_net.h" />
    <ClInclude Include="src\cpp\database\database.h" />
    <ClInclude Include="src\cpp\database\SqliteDatabase.h" />
--- a/newcoin.vcxproj.filters
+++ b/newcoin.vcxproj.filters
@@ -106,20 +106,23 @@
    <Filter Include="1. Modules\ripple_basics\types">
      <UniqueIdentifier>{71aefc54-1459-47a5-af76-995f121d498a}</UniqueIdentifier>
    </Filter>
-    <Filter Include="1. Modules\ripple_basics\%28mess%29">
-      <UniqueIdentifier>{3cd9631b-129b-4d0e-af70-d879e6f31a88}</UniqueIdentifier>
+    <Filter Include="1. Modules\ripple_mess">
+      <UniqueIdentifier>{becffa9b-61f7-42d4-815a-1ec822cad0e7}</UniqueIdentifier>
    </Filter>
-    <Filter Include="1. Modules\ripple_basics\%28mess%29\types">
-      <UniqueIdentifier>{1b463564-35d9-43d1-b3a0-21b344a3a1c7}</UniqueIdentifier>
+    <Filter Include="1. Modules\ripple_mess\containers">
+      <UniqueIdentifier>{683c494b-1175-49ac-9714-65640ba50bf5}</UniqueIdentifier>
    </Filter>
-    <Filter Include="1. Modules\ripple_basics\%28mess%29\protobuf">
-      <UniqueIdentifier>{eb0c6bda-cf68-4334-a8c3-8d39202852a0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="1. Modules\ripple_basics\%28mess%29\diagnostic">
+    <Filter Include="1. Modules\ripple_mess\diagnostic">
      <UniqueIdentifier>{505d1e20-ff6a-446b-8ce0-962e11b78820}</UniqueIdentifier>
    </Filter>
-    <Filter Include="1. Modules\ripple_basics\%28mess%29\containers">
-      <UniqueIdentifier>{683c494b-1175-49ac-9714-65640ba50bf5}</UniqueIdentifier>
+    <Filter Include="1. Modules\ripple_mess\protobuf">
+      <UniqueIdentifier>{eb0c6bda-cf68-4334-a8c3-8d39202852a0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="1. Modules\ripple_mess\types">
+      <UniqueIdentifier>{1b463564-35d9-43d1-b3a0-21b344a3a1c7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="1. Modules\ripple_basics\containers">
+      <UniqueIdentifier>{96cbc9ff-0118-4844-bb4c-05aef58a60b5}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
@@ -481,52 +484,52 @@
      <Filter>1. Modules\ripple_ledger\serialization</Filter>
    </ClCompile>
    <ClCompile Include="src\cpp\ripple\Amount.cpp">
-      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
+      <Filter>1. Modules\ripple_mess\types</Filter>
    </ClCompile>
    <ClCompile Include="src\cpp\ripple\AmountRound.cpp">
-      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
+      <Filter>1. Modules\ripple_mess\types</Filter>
    </ClCompile>
    <ClCompile Include="src\cpp\ripple\BitcoinUtil.cpp">
-      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
+      <Filter>1. Modules\ripple_mess\types</Filter>
    </ClCompile>
    <ClCompile Include="src\cpp\ripple\DeterministicKeys.cpp">
-      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
+      <Filter>1. Modules\ripple_mess\types</Filter>
    </ClCompile>
    <ClCompile Include="src\cpp\ripple\ECIES.cpp">
-      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
+      <Filter>1. Modules\ripple_mess\types</Filter>
    </ClCompile>
    <ClCompile Include="src\cpp\ripple\FieldNames.cpp">
-      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
+      <Filter>1. Modules\ripple_mess\types</Filter>
    </ClCompile>
    <ClCompile Include="src\cpp\ripple\HashedObject.cpp">
-      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
+      <Filter>1. Modules\ripple_mess\types</Filter>
    </ClCompile>
    <ClCompile Include="src\cpp\ripple\PackedMessage.cpp">
-      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
+      <Filter>1. Modules\ripple_mess\types</Filter>
    </ClCompile>
    <ClCompile Include="src\cpp\ripple\ParameterTable.cpp">
-      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
+      <Filter>1. Modules\ripple_mess\types</Filter>
    </ClCompile>
    <ClCompile Include="src\cpp\ripple\ParseSection.cpp">
-      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
+      <Filter>1. Modules\ripple_mess\types</Filter>
    </ClCompile>
    <ClCompile Include="src\cpp\ripple\PlatRand.cpp">
-      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
+      <Filter>1. Modules\ripple_mess\types</Filter>
    </ClCompile>
    <ClCompile Include="src\cpp\ripple\ProofOfWork.cpp">
-      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
+      <Filter>1. Modules\ripple_mess\types</Filter>
    </ClCompile>
    <ClCompile Include="src\cpp\ripple\rfc1751.cpp">
-      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
+      <Filter>1. Modules\ripple_mess\types</Filter>
    </ClCompile>
    <ClCompile Include="src\cpp\ripple\utils.cpp">
-      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
+      <Filter>1. Modules\ripple_mess\types</Filter>
    </ClCompile>
    <ClCompile Include="modules\ripple_basics\ripple_basics.cpp">
      <Filter>1. Modules\ripple_basics</Filter>
    </ClCompile>
    <ClCompile Include="src\cpp\ripple\Log.cpp">
-      <Filter>1. Modules\ripple_basics\%28mess%29\diagnostic</Filter>
+      <Filter>1. Modules\ripple_mess\diagnostic</Filter>
    </ClCompile>
    <ClCompile Include="modules\ripple_ledger\ripple_ledger.cpp">
      <Filter>1. Modules\ripple_ledger</Filter>
@@ -694,7 +697,7 @@
      <Filter>1. Modules\ripple_net\overlay</Filter>
    </ClCompile>
    <ClCompile Include="src\cpp\ripple\RippleAddress.cpp">
-      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
+      <Filter>1. Modules\ripple_mess\types</Filter>
    </ClCompile>
    <ClCompile Include="src\cpp\ripple\WalletAddTransactor.cpp">
      <Filter>1. Modules\ripple_ledger\transactions</Filter>
@@ -706,19 +709,19 @@
      <Filter>1. Modules\ripple_ledger\processing</Filter>
    </ClCompile>
    <ClCompile Include="src\cpp\ripple\RangeSet.cpp">
-      <Filter>1. Modules\ripple_basics\%28mess%29\containers</Filter>
+      <Filter>1. Modules\ripple_mess\containers</Filter>
    </ClCompile>
    <ClCompile Include="src\cpp\ripple\SHAMap.cpp">
-      <Filter>1. Modules\ripple_basics\%28mess%29\containers</Filter>
+      <Filter>1. Modules\ripple_mess\containers</Filter>
    </ClCompile>
    <ClCompile Include="src\cpp\ripple\SHAMapDiff.cpp">
-      <Filter>1. Modules\ripple_basics\%28mess%29\containers</Filter>
+      <Filter>1. Modules\ripple_mess\containers</Filter>
    </ClCompile>
    <ClCompile Include="src\cpp\ripple\SHAMapNodes.cpp">
-      <Filter>1. Modules\ripple_basics\%28mess%29\containers</Filter>
+      <Filter>1. Modules\ripple_mess\containers</Filter>
    </ClCompile>
    <ClCompile Include="src\cpp\ripple\SHAMapSync.cpp">
-      <Filter>1. Modules\ripple_basics\%28mess%29\containers</Filter>
+      <Filter>1. Modules\ripple_mess\containers</Filter>
    </ClCompile>
    <ClCompile Include="src\cpp\ripple\UpdateTables.cpp">
      <Filter>1. Modules\ripple_main\core</Filter>
@@ -730,7 +733,10 @@
      <Filter>1. Modules\ripple_ledger\processing</Filter>
    </ClCompile>
    <ClCompile Include="build\proto\ripple.pb.cc">
-      <Filter>1. Modules\ripple_basics\%28mess%29\protobuf</Filter>
+      <Filter>1. Modules\ripple_mess\protobuf</Filter>
+    </ClCompile>
+    <ClCompile Include="modules\ripple_mess\ripple_mess.cpp">
+      <Filter>1. Modules\ripple_mess</Filter>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
@@ -1098,52 +1104,52 @@
      <Filter>1. Modules\ripple_ledger\serialization</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\base58.h">
-      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
+      <Filter>1. Modules\ripple_mess\types</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\bignum.h">
-      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
+      <Filter>1. Modules\ripple_mess\types</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\BigNum64.h">
-      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
+      <Filter>1. Modules\ripple_mess\types</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\BitcoinUtil.h">
-      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
+      <Filter>1. Modules\ripple_mess\types</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\FieldNames.h">
-      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
+      <Filter>1. Modules\ripple_mess\types</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\HashedObject.h">
-      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
+      <Filter>1. Modules\ripple_mess\types</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\HashPrefixes.h">
-      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
+      <Filter>1. Modules\ripple_mess\types</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\key.h">
-      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
+      <Filter>1. Modules\ripple_mess\types</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\PackedMessage.h">
-      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
+      <Filter>1. Modules\ripple_mess\types</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\ParameterTable.h">
-      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
+      <Filter>1. Modules\ripple_mess\types</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\ParseSection.h">
-      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
+      <Filter>1. Modules\ripple_mess\types</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\ProofOfWork.h">
-      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
+      <Filter>1. Modules\ripple_mess\types</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\rfc1751.h">
-      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
+      <Filter>1. Modules\ripple_mess\types</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\utils.h">
-      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
+      <Filter>1. Modules\ripple_mess\types</Filter>
    </ClInclude>
    <ClInclude Include="modules\ripple_basics\ripple_basics.h">
      <Filter>1. Modules\ripple_basics</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\Log.h">
-      <Filter>1. Modules\ripple_basics\%28mess%29\diagnostic</Filter>
+      <Filter>1. Modules\ripple_mess\diagnostic</Filter>
    </ClInclude>
    <ClInclude Include="modules\ripple_ledger\ripple_ledger.h">
      <Filter>1. Modules\ripple_ledger</Filter>
@@ -1308,7 +1314,7 @@
      <Filter>1. Modules\ripple_net\service</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\uint256.h">
-      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
+      <Filter>1. Modules\ripple_mess\types</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\UniqueNodeList.h">
      <Filter>1. Modules\ripple_net\overlay</Filter>
@@ -1317,7 +1323,7 @@
      <Filter>1. Modules\ripple_net\overlay</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\RippleAddress.h">
-      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
+      <Filter>1. Modules\ripple_mess\types</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\WalletAddTransactor.h">
      <Filter>1. Modules\ripple_ledger\transactions</Filter>
@@ -1329,25 +1335,22 @@
      <Filter>1. Modules\ripple_ledger\processing</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\RangeSet.h">
-      <Filter>1. Modules\ripple_basics\%28mess%29\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\KeyCache.h">
-      <Filter>1. Modules\ripple_basics\%28mess%29\containers</Filter>
+      <Filter>1. Modules\ripple_mess\containers</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\SHAMap.h">
-      <Filter>1. Modules\ripple_basics\%28mess%29\containers</Filter>
+      <Filter>1. Modules\ripple_mess\containers</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\SHAMapSync.h">
-      <Filter>1. Modules\ripple_basics\%28mess%29\containers</Filter>
+      <Filter>1. Modules\ripple_mess\containers</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\TaggedCache.h">
-      <Filter>1. Modules\ripple_basics\%28mess%29\containers</Filter>
+      <Filter>1. Modules\ripple_mess\containers</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\ScopedLock.h">
-      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
+      <Filter>1. Modules\ripple_mess\types</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\SecureAllocator.h">
-      <Filter>1. Modules\ripple_basics\%28mess%29\containers</Filter>
+      <Filter>1. Modules\ripple_mess\containers</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\Version.h">
      <Filter>1. Modules\ripple_main\core</Filter>
@@ -1362,13 +1365,19 @@
      <Filter>1. Modules\ripple_main\core</Filter>
    </ClInclude>
    <ClInclude Include="build\proto\ripple.pb.h">
-      <Filter>1. Modules\ripple_basics\%28mess%29\protobuf</Filter>
+      <Filter>1. Modules\ripple_mess\protobuf</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\IntegerTypes.h">
      <Filter>1. Modules\ripple_basics\types</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\SerializeProto.h">
-      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
+      <Filter>1. Modules\ripple_mess\types</Filter>
+    </ClInclude>
+    <ClInclude Include="modules\ripple_mess\ripple_mess.h">
+      <Filter>1. Modules\ripple_mess</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\KeyCache.h">
+      <Filter>1. Modules\ripple_basics\containers</Filter>
    </ClInclude>
  </ItemGroup>
  <ItemGroup>