Reorganize source files

2025-12-06 17:27:55 +00:00 · 2016-04-19 20:29:16 -04:00
parent 2cb3834bbb
commit 4469ff4b9a
422 changed files with 4031 additions and 13217 deletions
--- a/src/ripple/protocol/HashPrefix.h
+++ b/src/ripple/protocol/HashPrefix.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_PROTOCOL_HASHPREFIX_H_INCLUDED
 #define RIPPLE_PROTOCOL_HASHPREFIX_H_INCLUDED

-#include <beast/hash/hash_append.h>
+#include <ripple/beast/hash/hash_append.h>
 #include <cstdint>

 namespace ripple {
--- a/src/ripple/protocol/STObject.h
+++ b/src/ripple/protocol/STObject.h
@@ -36,10 +36,6 @@
 #include <type_traits>
 #include <utility>

-#include <beast/streams/debug_ostream.h>
-#include <mutex>
-#include <unordered_map>
-
 namespace ripple {

 class STArray;
@@ -268,29 +264,6 @@ private:
        reserveSize = 20
    };

-    struct Log
-    {
-        std::mutex mutex_;
-        std::unordered_map<
-            std::size_t, std::size_t> map_;
-
-        ~Log()
-        {
-            beast::debug_ostream os;
-            for(auto const& e : map_)
-                os << e.first << "," << e.second;
-        }
-
-        void
-        operator() (std::size_t n)
-        {
-            std::lock_guard<std::mutex> lock(mutex_);
-            auto const result = map_.emplace(n, 1);
-            if (! result.second)
-                ++result.first->second;
-        }
-    };
-
    using list_type = std::vector<detail::STVar>;

    list_type v_;
--- a/src/ripple/protocol/digest.h
+++ b/src/ripple/protocol/digest.h
@@ -21,9 +21,9 @@
 #define RIPPLE_PROTOCOL_DIGEST_H_INCLUDED

 #include <ripple/basics/base_uint.h>
-#include <beast/crypto/ripemd.h>
-#include <beast/crypto/sha2.h>
-#include <beast/hash/endian.h>
+#include <ripple/beast/crypto/ripemd.h>
+#include <ripple/beast/crypto/sha2.h>
+#include <ripple/beast/hash/endian.h>
 #include <algorithm>
 #include <array>

--- a/src/ripple/protocol/impl/BuildInfo.cpp
+++ b/src/ripple/protocol/impl/BuildInfo.cpp
@@ -19,7 +19,7 @@

 #include <BeastConfig.h>
 #include <ripple/protocol/BuildInfo.h>
-#include <beast/unit_test/suite.h>
+#include <ripple/beast/unit_test.h>
 #include <ripple/beast/core/FatalError.h>
 #include <ripple/beast/core/SemanticVersion.h>

--- a/src/ripple/protocol/impl/STTx.cpp
+++ b/src/ripple/protocol/impl/STTx.cpp
@@ -32,7 +32,7 @@
 #include <ripple/basics/Log.h>
 #include <ripple/basics/StringUtilities.h>
 #include <ripple/json/to_string.h>
-#include <beast/unit_test/suite.h>
+#include <ripple/beast/unit_test.h>
 #include <boost/format.hpp>
 #include <array>
 #include <memory>
--- a/src/ripple/protocol/impl/STVar.cpp
+++ b/src/ripple/protocol/impl/STVar.cpp
@@ -39,24 +39,6 @@ nonPresentObject_t nonPresentObject;

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

-STVar::Log::~Log()
-{
-    beast::debug_ostream os;
-    for(auto const& e : map_)
-        os << e.first << "," << e.second;
-}
-
-void
-STVar::Log::operator() (std::size_t n)
-{
-    std::lock_guard<std::mutex> lock(mutex_);
-    auto const result = map_.emplace(n, 1);
-    if (! result.second)
-        ++result.first->second;
-}
-
-//------------------------------------------------------------------------------
-
 STVar::~STVar()
 {
    destroy();
--- a/src/ripple/protocol/impl/STVar.h
+++ b/src/ripple/protocol/impl/STVar.h
@@ -28,10 +28,6 @@
 #include <utility>
 #include <typeinfo>

-#include <beast/streams/debug_ostream.h>
-#include <mutex>
-#include <unordered_map>
-
 namespace ripple {
 namespace detail {

@@ -49,16 +45,6 @@ private:
    std::aligned_storage<72>::type d_;
    STBase* p_ = nullptr;

-    struct Log
-    {
-        std::mutex mutex_;
-        std::unordered_map<
-            std::size_t, std::size_t> map_;
-
-        ~Log();
-        void operator() (std::size_t n);
-    };
-
 public:
    ~STVar();
    STVar (STVar const& other);
--- a/src/ripple/protocol/impl/SecretKey.cpp
+++ b/src/ripple/protocol/impl/SecretKey.cpp
@@ -24,7 +24,7 @@
 #include <ripple/basics/contract.h>
 #include <ripple/crypto/GenerateDeterministicKey.h>
 #include <ripple/crypto/csprng.h>
-#include <beast/crypto/secure_erase.h>
+#include <ripple/beast/crypto/secure_erase.h>
 #include <ripple/beast/utility/rngfill.h>
 #include <ed25519-donna/ed25519.h>
 #include <cstring>
--- a/src/ripple/protocol/impl/Seed.cpp
+++ b/src/ripple/protocol/impl/Seed.cpp
@@ -27,7 +27,7 @@
 #include <ripple/basics/contract.h>
 #include <ripple/crypto/RFC1751.h>
 #include <ripple/crypto/csprng.h>
-#include <beast/crypto/secure_erase.h>
+#include <ripple/beast/crypto/secure_erase.h>
 #include <ripple/beast/utility/rngfill.h>
 #include <algorithm>
 #include <cstring>
--- a/src/ripple/protocol/tests/BuildInfo.test.cpp
+++ b/src/ripple/protocol/tests/BuildInfo.test.cpp
@@ -20,7 +20,7 @@
 #include <BeastConfig.h>
 #include <ripple/protocol/BuildInfo.h>
 #include <ripple/beast/core/SemanticVersion.h>
-#include <beast/unit_test/suite.h>
+#include <ripple/beast/unit_test.h>

 namespace ripple {

--- a/src/ripple/protocol/tests/IOUAmount.test.cpp
+++ b/src/ripple/protocol/tests/IOUAmount.test.cpp
@@ -19,7 +19,7 @@

 #include <BeastConfig.h>
 #include <ripple/protocol/IOUAmount.h>
-#include <beast/unit_test/suite.h>
+#include <ripple/beast/unit_test.h>

 namespace ripple {

--- a/src/ripple/protocol/tests/InnerObjectFormats.test.cpp
+++ b/src/ripple/protocol/tests/InnerObjectFormats.test.cpp
@@ -23,7 +23,7 @@
 #include <ripple/protocol/ErrorCodes.h>          // RPC::containsError
 #include <ripple/json/json_reader.h>             // Json::Reader
 #include <ripple/protocol/STParsedJSON.h>        // STParsedJSONObject
-#include <beast/unit_test/suite.h>
+#include <ripple/beast/unit_test.h>

 namespace ripple {

--- a/src/ripple/protocol/tests/Issue.test.cpp
+++ b/src/ripple/protocol/tests/Issue.test.cpp
@@ -21,7 +21,7 @@
 #include <ripple/basics/UnorderedContainers.h>
 #include <ripple/protocol/Book.h>
 #include <ripple/protocol/Issue.h>
-#include <beast/unit_test/suite.h>
+#include <ripple/beast/unit_test.h>
 #include <map>
 #include <set>
 #include <typeinfo>
--- a/src/ripple/protocol/tests/PublicKey_test.cpp
+++ b/src/ripple/protocol/tests/PublicKey_test.cpp
@@ -20,7 +20,7 @@
 #include <BeastConfig.h>
 #include <ripple/protocol/PublicKey.h>
 #include <ripple/protocol/SecretKey.h>
-#include <beast/unit_test/suite.h>
+#include <ripple/beast/unit_test.h>
 #include <vector>

 namespace ripple {
--- a/src/ripple/protocol/tests/Quality.test.cpp
+++ b/src/ripple/protocol/tests/Quality.test.cpp
@@ -19,7 +19,7 @@

 #include <BeastConfig.h>
 #include <ripple/protocol/Quality.h>
-#include <beast/unit_test/suite.h>
+#include <ripple/beast/unit_test.h>
 #include <type_traits>

 namespace ripple {
--- a/src/ripple/protocol/tests/STAccount.test.cpp
+++ b/src/ripple/protocol/tests/STAccount.test.cpp
@@ -19,7 +19,7 @@

 #include <BeastConfig.h>
 #include <ripple/protocol/STAccount.h>
-#include <beast/unit_test/suite.h>
+#include <ripple/beast/unit_test.h>

 namespace ripple {

--- a/src/ripple/protocol/tests/STAmount.test.cpp
+++ b/src/ripple/protocol/tests/STAmount.test.cpp
@@ -22,7 +22,7 @@
 #include <ripple/basics/random.h>
 #include <ripple/crypto/CBigNum.h>
 #include <ripple/protocol/STAmount.h>
-#include <beast/unit_test/suite.h>
+#include <ripple/beast/unit_test.h>

 namespace ripple {

--- a/src/ripple/protocol/tests/STObject.test.cpp
+++ b/src/ripple/protocol/tests/STObject.test.cpp
@@ -23,7 +23,7 @@
 #include <ripple/protocol/st.h>
 #include <ripple/json/json_reader.h>
 #include <ripple/json/to_string.h>
-#include <beast/unit_test/suite.h>
+#include <ripple/beast/unit_test.h>
 #include <memory>
 #include <type_traits>

--- a/src/ripple/protocol/tests/STTx.test.cpp
+++ b/src/ripple/protocol/tests/STTx.test.cpp
@@ -23,7 +23,7 @@
 #include <ripple/protocol/STParsedJSON.h>
 #include <ripple/protocol/types.h>
 #include <ripple/json/to_string.h>
-#include <beast/unit_test/suite.h>
+#include <ripple/beast/unit_test.h>

 namespace ripple {

--- a/src/ripple/protocol/tests/SecretKey_test.cpp
+++ b/src/ripple/protocol/tests/SecretKey_test.cpp
@@ -22,7 +22,7 @@
 #include <ripple/protocol/PublicKey.h>
 #include <ripple/protocol/SecretKey.h>
 #include <ripple/protocol/Seed.h>
-#include <beast/unit_test/suite.h>
+#include <ripple/beast/unit_test.h>
 #include <ripple/beast/utility/rngfill.h>
 #include <algorithm>
 #include <string>
--- a/src/ripple/protocol/tests/Seed_test.cpp
+++ b/src/ripple/protocol/tests/Seed_test.cpp
@@ -22,9 +22,9 @@
 #include <ripple/protocol/PublicKey.h>
 #include <ripple/protocol/SecretKey.h>
 #include <ripple/protocol/Seed.h>
-#include <beast/unit_test/suite.h>
+#include <ripple/beast/unit_test.h>
 #include <ripple/beast/utility/rngfill.h>
-#include <beast/xor_shift_engine.h>
+#include <ripple/beast/xor_shift_engine.h>
 #include <algorithm>


--- a/src/ripple/protocol/tests/XRPAmount.test.cpp
+++ b/src/ripple/protocol/tests/XRPAmount.test.cpp
@@ -19,7 +19,7 @@

 #include <BeastConfig.h>
 #include <ripple/protocol/XRPAmount.h>
-#include <beast/unit_test/suite.h>
+#include <ripple/beast/unit_test.h>

 namespace ripple {

--- a/src/ripple/protocol/tests/digest_test.cpp
+++ b/src/ripple/protocol/tests/digest_test.cpp
@@ -20,8 +20,8 @@
 #include <BeastConfig.h>
 #include <ripple/protocol/digest.h>
 #include <ripple/beast/utility/rngfill.h>
-#include <beast/xor_shift_engine.h>
-#include <beast/unit_test/suite.h>
+#include <ripple/beast/xor_shift_engine.h>
+#include <ripple/beast/unit_test.h>
 #include <algorithm>
 #include <chrono>
 #include <cmath>
--- a/src/ripple/protocol/tests/types_test.cpp
+++ b/src/ripple/protocol/tests/types_test.cpp
@@ -19,7 +19,7 @@

 #include <BeastConfig.h>
 #include <ripple/protocol/types.h>
-#include <beast/unit_test/suite.h>
+#include <ripple/beast/unit_test.h>

 namespace ripple {