Levelization, improve structure of source files:

Source files are moved between modules, includes changed and added, and some code rewritten, with the goal of reducing cross-module dependencies and eliminating cycles in the dependency graph of classes. * Remove RippleAddress dependency in CKey_test * ByteOrder.h, Blob.h, and strHex.h are moved to basics/. This makes the basics/ module fully independent of other ripple sources. * types/ is merged into protocol/. The protocol module now contains all primitive types specific to the Ripple protocol. * Move ErrorCodes to protocol/ * Move base_uint to basics/ * Move Base58 to crypto/ * Remove dependence on Serializer in GenerateDeterministicKey * Eliminate unity header json.h * Remove obsolete unity headers * Remove unnecessary includes
2025-12-06 17:27:55 +00:00 · 2014-12-19 08:57:30 -08:00
parent e3fbb83ad0
commit 60f27178b8
109 changed files with 859 additions and 493 deletions
--- a/src/ripple/app/book/Types.h
+++ b/src/ripple/app/book/Types.h
@@ -21,7 +21,7 @@
 #define RIPPLE_CORE_TYPES_H_INCLUDED

 #include <ripple/app/ledger/LedgerEntrySet.h>
-#include <ripple/types/Book.h>
+#include <ripple/protocol/Book.h>

 #include <chrono>
 #include <cstdint>
--- a/src/ripple/app/consensus/DisputedTx.h
+++ b/src/ripple/app/consensus/DisputedTx.h
@@ -22,7 +22,7 @@

 #include <ripple/protocol/UintTypes.h>
 #include <ripple/protocol/Serializer.h>
-#include <ripple/types/base_uint.h>
+#include <ripple/basics/base_uint.h>
 #include <memory>

 namespace ripple {
--- a/src/ripple/app/consensus/LedgerConsensus.cpp
+++ b/src/ripple/app/consensus/LedgerConsensus.cpp
@@ -19,6 +19,7 @@

 #include <ripple/app/consensus/DisputedTx.h>
 #include <ripple/app/consensus/LedgerConsensus.h>
+#include <ripple/json/to_string.h>
 #include <ripple/app/ledger/InboundLedgers.h>
 #include <ripple/app/ledger/LedgerMaster.h>
 #include <ripple/app/ledger/LedgerTiming.h>
--- a/src/ripple/app/consensus/LedgerConsensus.h
+++ b/src/ripple/app/consensus/LedgerConsensus.h
@@ -26,7 +26,7 @@
 #include <ripple/app/tx/LocalTxs.h>
 #include <ripple/json/json_value.h>
 #include <ripple/overlay/Peer.h>
-#include <ripple/types/RippleLedgerHash.h>
+#include <ripple/protocol/RippleLedgerHash.h>
 #include <beast/chrono/abstract_clock.h>
 #include <chrono>

--- a/src/ripple/app/data/Database.h
+++ b/src/ripple/app/data/Database.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_DATABASE_H_INCLUDED
 #define RIPPLE_DATABASE_H_INCLUDED

-#include <ripple/types/Blob.h>
+#include <ripple/basics/Blob.h>

 namespace ripple {

--- a/src/ripple/app/ledger/BookListeners.cpp
+++ b/src/ripple/app/ledger/BookListeners.cpp
@@ -17,6 +17,8 @@
 */
 //==============================================================================

+#include <ripple/json/to_string.h>
+
 namespace ripple {

 void BookListeners::addSubscriber (InfoSub::ref sub)
--- a/src/ripple/app/ledger/InboundLedgers.h
+++ b/src/ripple/app/ledger/InboundLedgers.h
@@ -21,7 +21,7 @@
 #define RIPPLE_INBOUNDLEDGERS_H

 #include <ripple/app/ledger/InboundLedger.h>
-#include <ripple/types/RippleLedgerHash.h>
+#include <ripple/protocol/RippleLedgerHash.h>
 #include <beast/threads/Stoppable.h>
 #include <beast/cxx14/memory.h> // <memory>

--- a/src/ripple/app/ledger/Ledger.cpp
+++ b/src/ripple/app/ledger/Ledger.cpp
@@ -25,6 +25,7 @@
 #include <ripple/core/Config.h>
 #include <ripple/core/JobQueue.h>
 #include <ripple/core/LoadFeeTrack.h>
+#include <ripple/json/to_string.h>
 #include <ripple/nodestore/Database.h>
 #include <ripple/protocol/HashPrefix.h>
 #include <beast/unit_test/suite.h>
--- a/src/ripple/app/ledger/Ledger.h
+++ b/src/ripple/app/ledger/Ledger.h
@@ -27,7 +27,7 @@
 #include <ripple/protocol/STLedgerEntry.h>
 #include <ripple/basics/CountedObject.h>
 #include <ripple/protocol/Serializer.h>
-#include <ripple/types/Book.h>
+#include <ripple/protocol/Book.h>
 #include <set>

 namespace ripple {
--- a/src/ripple/app/ledger/LedgerCleaner.h
+++ b/src/ripple/app/ledger/LedgerCleaner.h
@@ -22,6 +22,7 @@

 #include <beast/cxx14/memory.h> // <memory>
 #include <beast/threads/Stoppable.h>
+#include <beast/utility/PropertyStream.h>
 #include <beast/utility/Journal.h>

 namespace ripple {
--- a/src/ripple/app/ledger/LedgerHistory.h
+++ b/src/ripple/app/ledger/LedgerHistory.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_LEDGERHISTORY_H
 #define RIPPLE_LEDGERHISTORY_H

-#include <ripple/types/RippleLedgerHash.h>
+#include <ripple/protocol/RippleLedgerHash.h>
 #include <beast/insight/Event.h>

 namespace ripple {
--- a/src/ripple/app/ledger/LedgerMaster.h
+++ b/src/ripple/app/ledger/LedgerMaster.h
@@ -21,10 +21,11 @@
 #define RIPPLE_LEDGERMASTER_H_INCLUDED

 #include <ripple/basics/StringUtilities.h>
-#include <ripple/types/RippleLedgerHash.h>
+#include <ripple/protocol/RippleLedgerHash.h>
 #include <beast/insight/Collector.h>
 #include <beast/threads/Stoppable.h>
 #include <beast/threads/UnlockGuard.h>
+#include <beast/utility/PropertyStream.h>

 namespace ripple {

--- a/src/ripple/app/main/Application.cpp
+++ b/src/ripple/app/main/Application.cpp
@@ -19,13 +19,14 @@

 #include <ripple/app/impl/BasicApp.h>
 #include <ripple/app/main/Tuning.h>
+#include <ripple/app/misc/SHAMapStore.h>
 #include <ripple/app/paths/FindPaths.h>
 #include <ripple/basics/Log.h>
 #include <ripple/basics/LoggedTimings.h>
 #include <ripple/basics/Sustain.h>
 #include <ripple/basics/seconds_clock.h>
 #include <ripple/basics/make_SSLContext.h>
-#include <ripple/app/misc/SHAMapStore.h>
+#include <ripple/json/json_reader.h>
 #include <ripple/core/LoadFeeTrack.h>
 #include <ripple/net/SNTPClient.h>
 #include <ripple/nodestore/Database.h>
--- a/src/ripple/app/main/FullBelowCache.h
+++ b/src/ripple/app/main/FullBelowCache.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_FULLBELOWCACHE_H_INCLUDED
 #define RIPPLE_FULLBELOWCACHE_H_INCLUDED

-#include <ripple/types/base_uint.h>
+#include <ripple/basics/base_uint.h>
 #include <ripple/app/main/BasicFullBelowCache.h>

 namespace ripple {
--- a/src/ripple/app/main/Main.cpp
+++ b/src/ripple/app/main/Main.cpp
@@ -22,6 +22,7 @@
 #include <ripple/basics/ThreadName.h>
 #include <ripple/core/ConfigSections.h>
 #include <ripple/crypto/RandomNumbers.h>
+#include <ripple/json/to_string.h>
 #include <ripple/net/RPCCall.h>
 #include <ripple/resource/Fees.h>
 #include <ripple/protocol/BuildInfo.h>
--- a/src/ripple/app/misc/CanonicalTXSet.h
+++ b/src/ripple/app/misc/CanonicalTXSet.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_CANONICALTXSET_H
 #define RIPPLE_CANONICALTXSET_H

-#include <ripple/types/RippleLedgerHash.h>
+#include <ripple/protocol/RippleLedgerHash.h>

 namespace ripple {

--- a/src/ripple/app/misc/FeeVote.h
+++ b/src/ripple/app/misc/FeeVote.h
@@ -21,7 +21,7 @@
 #define RIPPLE_APP_FEEVOTE_H_INCLUDED

 #include <ripple/basics/BasicConfig.h>
-#include <ripple/core/SystemParameters.h>
+#include <ripple/protocol/SystemParameters.h>

 namespace ripple {

--- a/src/ripple/app/misc/NetworkOPs.cpp
+++ b/src/ripple/app/misc/NetworkOPs.cpp
@@ -28,6 +28,7 @@
 #include <ripple/core/LoadFeeTrack.h>
 #include <ripple/crypto/RandomNumbers.h>
 #include <ripple/crypto/RFC1751.h>
+#include <ripple/json/to_string.h>
 #include <ripple/overlay/predicates.h>
 #include <ripple/protocol/BuildInfo.h>
 #include <ripple/protocol/HashPrefix.h>
--- a/src/ripple/app/misc/SHAMapStore.h
+++ b/src/ripple/app/misc/SHAMapStore.h
@@ -23,7 +23,7 @@
 #include <ripple/core/Config.h>
 #include <ripple/nodestore/Manager.h>
 #include <ripple/nodestore/Scheduler.h>
-#include <ripple/rpc/ErrorCodes.h>
+#include <ripple/protocol/ErrorCodes.h>

 namespace ripple {

--- a/src/ripple/app/paths/PathRequest.cpp
+++ b/src/ripple/app/paths/PathRequest.cpp
@@ -23,7 +23,7 @@
 #include <ripple/core/Config.h>
 #include <ripple/core/LoadFeeTrack.h>
 #include <ripple/net/RPCErr.h>
-#include <ripple/rpc/ErrorCodes.h>
+#include <ripple/protocol/ErrorCodes.h>
 #include <ripple/protocol/UintTypes.h>
 #include <boost/log/trivial.hpp>
 #include <tuple>
--- a/src/ripple/app/paths/PathState.cpp
+++ b/src/ripple/app/paths/PathState.cpp
@@ -18,6 +18,7 @@
 //==============================================================================

 #include <ripple/app/paths/Credit.h>
+#include <ripple/json/to_string.h>

 namespace ripple {

--- a/src/ripple/app/paths/Pathfinder.cpp
+++ b/src/ripple/app/paths/Pathfinder.cpp
@@ -19,6 +19,7 @@

 #include <ripple/app/paths/Tuning.h>
 #include <ripple/app/paths/Pathfinder.h>
+#include <ripple/json/to_string.h>
 #include <ripple/core/JobQueue.h>
 #include <tuple>

--- a/src/ripple/app/paths/Types.h
+++ b/src/ripple/app/paths/Types.h
@@ -17,8 +17,8 @@
 */
 //==============================================================================

-#ifndef RIPPLE_TYPES_H
-#define RIPPLE_TYPES_H
+#ifndef RIPPLE_TYPES_H_INCLUDED
+#define RIPPLE_TYPES_H_INCLUDED

 namespace ripple {

--- a/src/ripple/app/shamap/SHAMapItem.h
+++ b/src/ripple/app/shamap/SHAMapItem.h
@@ -22,7 +22,7 @@

 #include <ripple/basics/CountedObject.h>
 #include <ripple/protocol/Serializer.h>
-#include <ripple/types/base_uint.h>
+#include <ripple/basics/base_uint.h>
 #include <memory>

 namespace ripple {
--- a/src/ripple/app/shamap/SHAMapNodeID.h
+++ b/src/ripple/app/shamap/SHAMapNodeID.h
@@ -21,7 +21,7 @@
 #define RIPPLE_SHAMAPNODEID_H

 #include <ripple/protocol/Serializer.h>
-#include <ripple/types/base_uint.h>
+#include <ripple/basics/base_uint.h>
 #include <ostream>
 #include <string>
 #include <tuple>
--- a/src/ripple/app/transactors/CreateOffer.cpp
+++ b/src/ripple/app/transactors/CreateOffer.cpp
@@ -21,6 +21,7 @@
 #include <ripple/app/book/Taker.h>
 #include <ripple/app/book/Types.h>
 #include <ripple/app/book/Amounts.h>
+#include <ripple/json/to_string.h>

 #include <beast/cxx14/memory.h>

--- a/src/ripple/app/tx/TransactionMeta.cpp
+++ b/src/ripple/app/tx/TransactionMeta.cpp
@@ -17,6 +17,7 @@
 */
 //==============================================================================

+#include <ripple/json/to_string.h>
 #include <ripple/protocol/STAccount.h>

 namespace ripple {
--- a/src/ripple/app/websocket/WSConnection.h
+++ b/src/ripple/app/websocket/WSConnection.h
@@ -23,6 +23,7 @@
 #include <ripple/core/Config.h>
 #include <ripple/resource/Manager.h>
 #include <ripple/server/Port.h>
+#include <ripple/json/to_string.h>
 #include <beast/asio/placeholders.h>
 #include <memory>

--- a/src/ripple/app/websocket/WSServerHandler.h
+++ b/src/ripple/app/websocket/WSServerHandler.h
@@ -23,6 +23,7 @@
 #include <ripple/protocol/JsonFields.h>
 #include <ripple/server/Port.h>
 #include <ripple/app/websocket/WSConnection.h>
+#include <ripple/json/json_reader.h>
 #include <memory>

 namespace ripple {