From 0f177a8038a30743f348a4b95a77f42de632d3bb Mon Sep 17 00:00:00 2001
From: Vinnie Falco <vinnie.falco@gmail.com>
Date: Mon, 27 May 2013 11:17:06 -0700
Subject: [PATCH] Move uint256 to ripple_basics

---
 modules/ripple_basics/ripple_basics.h         | 14 ++++++++++++++
 .../ripple_basics/types/ripple_UInt256.h      | 19 ++++---------------
 modules/ripple_ledger/ripple_ledger.cpp       |  1 -
 newcoin.vcxproj                               |  2 +-
 newcoin.vcxproj.filters                       |  9 ++++++---
 src/cpp/ripple/BitcoinUtil.h                  |  1 -
 src/cpp/ripple/CanonicalTXSet.h               |  1 -
 src/cpp/ripple/HashedObject.h                 |  1 -
 src/cpp/ripple/PFRequest.h                    |  1 -
 src/cpp/ripple/ProofOfWork.h                  |  2 --
 src/cpp/ripple/RippleAddress.h                |  1 -
 src/cpp/ripple/SHAMap.h                       |  1 -
 src/cpp/ripple/SerializedTransaction.h        |  1 -
 src/cpp/ripple/SerializedTypes.h              |  1 -
 src/cpp/ripple/Serializer.h                   |  1 -
 src/cpp/ripple/Suppression.h                  |  1 -
 src/cpp/ripple/Transaction.h                  |  1 -
 src/cpp/ripple/TransactionMeta.h              |  1 -
 src/cpp/ripple/ValidationCollection.h         |  1 -
 src/cpp/ripple/Wallet.h                       |  1 -
 src/cpp/ripple/key.h                          |  2 --
 21 files changed, 25 insertions(+), 38 deletions(-)
 rename src/cpp/ripple/uint256.h => modules/ripple_basics/types/ripple_UInt256.h (98%)

diff --git a/modules/ripple_basics/ripple_basics.h b/modules/ripple_basics/ripple_basics.h
index 670005a1c..fde95024a 100644
--- a/modules/ripple_basics/ripple_basics.h
+++ b/modules/ripple_basics/ripple_basics.h
@@ -38,6 +38,15 @@
 #include <sstream>
 #include <string>
 
+// UInt256
+#include <algorithm>
+#include <cassert>
+#include <climits>
+#include <cstdio>
+#include <cstring>
+#include <string>
+#include <vector>
+
 #include <boost/version.hpp>
 #if BOOST_VERSION < 104700
 #error Boost 1.47 or later is required
@@ -90,6 +99,9 @@ namespace boost {
 #include <boost/format.hpp>
 #include <boost/lexical_cast.hpp>
 
+// UInt256
+#include <boost/functional/hash.hpp>
+
 // VFALCO: TODO, remove this dependency!!!
 #include <openssl/dh.h> // for DiffieHellmanUtil
 
@@ -114,4 +126,6 @@ namespace boost {
 #include "utility/ripple_Time.h"
 #include "utility/ripple_UptimeTimer.h"
 
+#include "types/ripple_UInt256.h"
+
 #endif
diff --git a/src/cpp/ripple/uint256.h b/modules/ripple_basics/types/ripple_UInt256.h
similarity index 98%
rename from src/cpp/ripple/uint256.h
rename to modules/ripple_basics/types/ripple_UInt256.h
index c1fe96b7b..58752081b 100644
--- a/src/cpp/ripple/uint256.h
+++ b/modules/ripple_basics/types/ripple_UInt256.h
@@ -2,23 +2,10 @@
 // Copyright (c) 2011 The Bitcoin developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file license.txt or http://www.opensource.org/licenses/mit-license.php.
+
 #ifndef RIPPLE_UINT256_H
 #define RIPPLE_UINT256_H
 
-#include <algorithm>
-#include <climits>
-#include <string>
-#include <vector>
-#include <cstdio>
-#include <cstring>
-#include <cassert>
-
-#include <boost/functional/hash.hpp>
-
-#if defined(_MSC_VER) && _MSC_VER < 1300
-#define for  if (false) ; else for
-#endif
-
 // These classes all store their values internally
 // in big-endian form
 
@@ -751,6 +738,8 @@ inline const std::string strHex(const uint160& ui)
 	return strHex(ui.begin(), ui.size());
 }
 
-
 #endif
+
+// vim:ts=4
+
 // vim:ts=4
diff --git a/modules/ripple_ledger/ripple_ledger.cpp b/modules/ripple_ledger/ripple_ledger.cpp
index d1aa91927..ac0aba833 100644
--- a/modules/ripple_ledger/ripple_ledger.cpp
+++ b/modules/ripple_ledger/ripple_ledger.cpp
@@ -45,7 +45,6 @@
 #include <string>
 #include <vector>
 
-//#include "uint256.h"
 
 #include <boost/algorithm/string.hpp>
 #include <boost/bind.hpp>
diff --git a/newcoin.vcxproj b/newcoin.vcxproj
index 113d88af5..4c5fd24d3 100644
--- a/newcoin.vcxproj
+++ b/newcoin.vcxproj
@@ -1210,6 +1210,7 @@
     <ClInclude Include="modules\ripple_basics\containers\ripple_SecureAllocator.h" />
     <ClInclude Include="modules\ripple_basics\containers\ripple_TaggedCache.h" />
     <ClInclude Include="modules\ripple_basics\ripple_basics.h" />
+    <ClInclude Include="modules\ripple_basics\types\ripple_UInt256.h" />
     <ClInclude Include="modules\ripple_basics\utility\ripple_ByteOrder.h" />
     <ClInclude Include="modules\ripple_basics\utility\ripple_DiffieHellmanUtil.h" />
     <ClInclude Include="modules\ripple_basics\utility\ripple_IntegerTypes.h" />
@@ -1635,7 +1636,6 @@
     <ClInclude Include="src\cpp\ripple\TransactionQueue.h" />
     <ClInclude Include="src\cpp\ripple\Transactor.h" />
     <ClInclude Include="src\cpp\ripple\TrustSetTransactor.h" />
-    <ClInclude Include="src\cpp\ripple\uint256.h" />
     <ClInclude Include="src\cpp\ripple\UniqueNodeList.h" />
     <ClInclude Include="src\cpp\ripple\ValidationCollection.h" />
     <ClInclude Include="src\cpp\ripple\Version.h" />
diff --git a/newcoin.vcxproj.filters b/newcoin.vcxproj.filters
index 57db27371..dd530649d 100644
--- a/newcoin.vcxproj.filters
+++ b/newcoin.vcxproj.filters
@@ -127,6 +127,9 @@
     <Filter Include="1. Modules\ripple_basics\utility">
       <UniqueIdentifier>{c30623e7-e0ab-4a8e-a213-aeaceb4327e2}</UniqueIdentifier>
     </Filter>
+    <Filter Include="1. Modules\ripple_basics\types">
+      <UniqueIdentifier>{0d38ac4f-f094-4b17-9f4c-ac4011ea3bca}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\cpp\database\sqlite3.c">
@@ -1283,9 +1286,6 @@
     <ClInclude Include="src\cpp\ripple\SNTPClient.h">
       <Filter>1. Modules\ripple_net\service</Filter>
     </ClInclude>
-    <ClInclude Include="src\cpp\ripple\uint256.h">
-      <Filter>1. Modules\ripple_mess\types</Filter>
-    </ClInclude>
     <ClInclude Include="src\cpp\ripple\UniqueNodeList.h">
       <Filter>1. Modules\ripple_net\overlay</Filter>
     </ClInclude>
@@ -1430,6 +1430,9 @@
     <ClInclude Include="modules\ripple_basics\utility\ripple_DiffieHellmanUtil.h">
       <Filter>1. Modules\ripple_basics\utility</Filter>
     </ClInclude>
+    <ClInclude Include="modules\ripple_basics\types\ripple_UInt256.h">
+      <Filter>1. Modules\ripple_basics\types</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="SConstruct" />
diff --git a/src/cpp/ripple/BitcoinUtil.h b/src/cpp/ripple/BitcoinUtil.h
index 32dc63f0a..eca8a7245 100644
--- a/src/cpp/ripple/BitcoinUtil.h
+++ b/src/cpp/ripple/BitcoinUtil.h
@@ -4,7 +4,6 @@
 // TODO: these things should all go somewhere
 
 #include <string>
-#include "uint256.h"
 #include <openssl/ripemd.h>
 #include <openssl/sha.h>
 
diff --git a/src/cpp/ripple/CanonicalTXSet.h b/src/cpp/ripple/CanonicalTXSet.h
index a28b004e5..02a4bf2f2 100644
--- a/src/cpp/ripple/CanonicalTXSet.h
+++ b/src/cpp/ripple/CanonicalTXSet.h
@@ -3,7 +3,6 @@
 
 #include <map>
 
-#include "uint256.h"
 #include "SerializedTransaction.h"
 
 class CanonicalTXKey
diff --git a/src/cpp/ripple/HashedObject.h b/src/cpp/ripple/HashedObject.h
index 776dfc3de..8ddfa6bfe 100644
--- a/src/cpp/ripple/HashedObject.h
+++ b/src/cpp/ripple/HashedObject.h
@@ -6,7 +6,6 @@
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition_variable.hpp>
 
-#include "uint256.h"
 #include "ScopedLock.h"
 #include "InstanceCounter.h"
 
diff --git a/src/cpp/ripple/PFRequest.h b/src/cpp/ripple/PFRequest.h
index 07321011e..a933ee6df 100644
--- a/src/cpp/ripple/PFRequest.h
+++ b/src/cpp/ripple/PFRequest.h
@@ -9,7 +9,6 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 
-#include "uint256.h"
 #include "RippleAddress.h"
 #include "SerializedTypes.h"
 #include "Pathfinder.h"
diff --git a/src/cpp/ripple/ProofOfWork.h b/src/cpp/ripple/ProofOfWork.h
index 0d476bbd7..20492f432 100644
--- a/src/cpp/ripple/ProofOfWork.h
+++ b/src/cpp/ripple/ProofOfWork.h
@@ -8,8 +8,6 @@
 #include <boost/bimap/unordered_set_of.hpp>
 #include <boost/bimap/multiset_of.hpp>
 
-#include "uint256.h"
-
 enum POWResult
 {
 	powOK		= 0,
diff --git a/src/cpp/ripple/RippleAddress.h b/src/cpp/ripple/RippleAddress.h
index d4f916b4f..c86bfddd9 100644
--- a/src/cpp/ripple/RippleAddress.h
+++ b/src/cpp/ripple/RippleAddress.h
@@ -2,7 +2,6 @@
 #define __RIPPLE_ADDRESS__
 
 #include "base58.h"
-#include "uint256.h"
 
 //
 // Used to hold addresses and parse and produce human formats.
diff --git a/src/cpp/ripple/SHAMap.h b/src/cpp/ripple/SHAMap.h
index 16b06b1cd..9c4553b61 100644
--- a/src/cpp/ripple/SHAMap.h
+++ b/src/cpp/ripple/SHAMap.h
@@ -9,7 +9,6 @@
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/unordered_map.hpp>
 
-#include "uint256.h"
 #include "ScopedLock.h"
 #include "Serializer.h"
 #include "HashedObject.h"
diff --git a/src/cpp/ripple/SerializedTransaction.h b/src/cpp/ripple/SerializedTransaction.h
index 6b9dde135..7691d8416 100644
--- a/src/cpp/ripple/SerializedTransaction.h
+++ b/src/cpp/ripple/SerializedTransaction.h
@@ -5,7 +5,6 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include "uint256.h"
 #include "SerializedObject.h"
 #include "TransactionFormats.h"
 #include "RippleAddress.h"
diff --git a/src/cpp/ripple/SerializedTypes.h b/src/cpp/ripple/SerializedTypes.h
index 6bc252bae..e170d40b9 100644
--- a/src/cpp/ripple/SerializedTypes.h
+++ b/src/cpp/ripple/SerializedTypes.h
@@ -4,7 +4,6 @@
 #include <vector>
 #include <string>
 
-#include "uint256.h"
 #include "Serializer.h"
 #include "FieldNames.h"
 #include "InstanceCounter.h"
diff --git a/src/cpp/ripple/Serializer.h b/src/cpp/ripple/Serializer.h
index 8d9a88efc..eb1eeebaa 100644
--- a/src/cpp/ripple/Serializer.h
+++ b/src/cpp/ripple/Serializer.h
@@ -8,7 +8,6 @@
 #include <boost/shared_ptr.hpp>
 
 #include "key.h"
-#include "uint256.h"
 #include "FieldNames.h"
 
 class Serializer
diff --git a/src/cpp/ripple/Suppression.h b/src/cpp/ripple/Suppression.h
index 1de789278..34e0145f7 100644
--- a/src/cpp/ripple/Suppression.h
+++ b/src/cpp/ripple/Suppression.h
@@ -8,7 +8,6 @@
 #include <boost/unordered_map.hpp>
 #include <boost/thread/mutex.hpp>
 
-#include "uint256.h"
 #include "InstanceCounter.h"
 
 DEFINE_INSTANCE(Suppression);
diff --git a/src/cpp/ripple/Transaction.h b/src/cpp/ripple/Transaction.h
index 2ba693766..75d900578 100644
--- a/src/cpp/ripple/Transaction.h
+++ b/src/cpp/ripple/Transaction.h
@@ -12,7 +12,6 @@
 #include <boost/cstdint.hpp>
 
 #include "key.h"
-#include "uint256.h"
 #include "ripple.pb.h"
 #include "Serializer.h"
 #include "SHAMap.h"
diff --git a/src/cpp/ripple/TransactionMeta.h b/src/cpp/ripple/TransactionMeta.h
index 1da6a3728..eae8ade4d 100644
--- a/src/cpp/ripple/TransactionMeta.h
+++ b/src/cpp/ripple/TransactionMeta.h
@@ -6,7 +6,6 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/ptr_container/ptr_vector.hpp>
 
-#include "uint256.h"
 #include "Serializer.h"
 #include "SerializedTypes.h"
 #include "SerializedObject.h"
diff --git a/src/cpp/ripple/ValidationCollection.h b/src/cpp/ripple/ValidationCollection.h
index cdb93db95..0569c8bc3 100644
--- a/src/cpp/ripple/ValidationCollection.h
+++ b/src/cpp/ripple/ValidationCollection.h
@@ -6,7 +6,6 @@
 #include <boost/unordered_map.hpp>
 #include <boost/thread/mutex.hpp>
 
-#include "uint256.h"
 #include "SerializedValidation.h"
 #include "JobQueue.h"
 
diff --git a/src/cpp/ripple/Wallet.h b/src/cpp/ripple/Wallet.h
index 68cb10609..4b2f1864c 100644
--- a/src/cpp/ripple/Wallet.h
+++ b/src/cpp/ripple/Wallet.h
@@ -12,7 +12,6 @@
 #include "openssl/ec.h"
 #include "openssl/dh.h"
 
-#include "uint256.h"
 #include "Serializer.h"
 
 class Ledger;
diff --git a/src/cpp/ripple/key.h b/src/cpp/ripple/key.h
index f5019d966..12913255e 100644
--- a/src/cpp/ripple/key.h
+++ b/src/cpp/ripple/key.h
@@ -16,8 +16,6 @@
 #include <boost/shared_ptr.hpp>
 
 #include "RippleAddress.h"
-#include "uint256.h"
-#include "base58.h"
 
 // secp256k1:
 // const unsigned int PRIVATE_KEY_SIZE = 279;