Clean up and restructure sources

SConstruct

@@ -559,7 +559,6 @@ for toolchain in all_toolchains:
         objects.append(addSource('src/ripple/unity/peerfinder.cpp', env, variant_dirs))
         objects.append(addSource('src/ripple/unity/protobuf.cpp', env, variant_dirs))
         objects.append(addSource('src/ripple/unity/ripple.proto.cpp', env, variant_dirs))
-        objects.append(addSource('src/ripple/unity/radmap.cpp', env, variant_dirs))
         objects.append(addSource('src/ripple/unity/resource.cpp', env, variant_dirs))
         objects.append(addSource('src/ripple/unity/rpcx.cpp', env, variant_dirs))
         objects.append(addSource('src/ripple/unity/sitefiles.cpp', env, variant_dirs))

src/ripple/algorithm/README.md

@@ -1,3 +0,0 @@
-# Algorithm
-
-Various utility classes

src/ripple/algorithm/TODO.md

@@ -1 +0,0 @@
-# Algorithm TODO

src/ripple/app/book/Amount.h

@@ -20,7 +20,7 @@
 #ifndef RIPPLE_CORE_AMOUNT_H_INCLUDED
 #define RIPPLE_CORE_AMOUNT_H_INCLUDED
 
-#include <ripple/module/data/protocol/STObject.h>
+#include <ripple/data/protocol/STObject.h>
 
 #include <beast/utility/noexcept.h>
 #include <beast/cxx14/type_traits.h> // <type_traits>

src/ripple/app/book/Amounts.h

@@ -20,7 +20,7 @@
 #ifndef RIPPLE_CORE_AMOUNTS_H_INCLUDED
 #define RIPPLE_CORE_AMOUNTS_H_INCLUDED
 
-#include <ripple/module/app/book/Amount.h>
+#include <ripple/app/book/Amount.h>
 
 #include <beast/utility/noexcept.h>
 

src/ripple/app/book/BookTip.h

@@ -20,8 +20,8 @@
 #ifndef RIPPLE_CORE_BOOKTIP_H_INCLUDED
 #define RIPPLE_CORE_BOOKTIP_H_INCLUDED
 
-#include <ripple/module/app/book/Quality.h>
+#include <ripple/app/book/Quality.h>
-#include <ripple/module/app/book/Types.h>
+#include <ripple/app/book/Types.h>
 
 #include <beast/utility/noexcept.h>
 

src/ripple/app/book/Offer.h

@@ -20,12 +20,12 @@
 #ifndef RIPPLE_CORE_OFFER_H_INCLUDED
 #define RIPPLE_CORE_OFFER_H_INCLUDED
 
-#include <ripple/module/app/book/Amounts.h>
+#include <ripple/app/book/Amounts.h>
-#include <ripple/module/app/book/Quality.h>
+#include <ripple/app/book/Quality.h>
-#include <ripple/module/app/book/Types.h>
+#include <ripple/app/book/Types.h>
 
-#include <ripple/module/app/misc/SerializedLedger.h>
+#include <ripple/app/misc/SerializedLedger.h>
-#include <ripple/module/data/protocol/SField.h>
+#include <ripple/data/protocol/SField.h>
 
 #include <beast/utility/noexcept.h>
 

src/ripple/app/book/OfferStream.h

@@ -20,10 +20,10 @@
 #ifndef RIPPLE_CORE_OFFERSTREAM_H_INCLUDED
 #define RIPPLE_CORE_OFFERSTREAM_H_INCLUDED
 
-#include <ripple/module/app/book/BookTip.h>
+#include <ripple/app/book/BookTip.h>
-#include <ripple/module/app/book/Offer.h>
+#include <ripple/app/book/Offer.h>
-#include <ripple/module/app/book/Quality.h>
+#include <ripple/app/book/Quality.h>
-#include <ripple/module/app/book/Types.h>
+#include <ripple/app/book/Types.h>
 
 #include <beast/utility/noexcept.h>
 

src/ripple/app/book/Quality.h

@@ -20,8 +20,8 @@
 #ifndef RIPPLE_CORE_QUALITY_H_INCLUDED
 #define RIPPLE_CORE_QUALITY_H_INCLUDED
 
-#include <ripple/module/app/book/Amount.h>
+#include <ripple/app/book/Amount.h>
-#include <ripple/module/app/book/Amounts.h>
+#include <ripple/app/book/Amounts.h>
 
 #include <cstdint>
 #include <ostream>

src/ripple/app/book/Taker.h

@@ -20,10 +20,10 @@
 #ifndef RIPPLE_CORE_TAKER_H_INCLUDED
 #define RIPPLE_CORE_TAKER_H_INCLUDED
 
-#include <ripple/module/app/book/Amounts.h>
+#include <ripple/app/book/Amounts.h>
-#include <ripple/module/app/book/Quality.h>
+#include <ripple/app/book/Quality.h>
-#include <ripple/module/app/book/Offer.h>
+#include <ripple/app/book/Offer.h>
-#include <ripple/module/app/book/Types.h>
+#include <ripple/app/book/Types.h>
 
 #include <beast/streams/debug_ostream.h>
 #include <beast/utility/noexcept.h>

src/ripple/app/book/Types.h

@@ -20,8 +20,8 @@
 #ifndef RIPPLE_CORE_TYPES_H_INCLUDED
 #define RIPPLE_CORE_TYPES_H_INCLUDED
 
-#include <ripple/module/app/ledger/LedgerEntrySet.h>
+#include <ripple/app/ledger/LedgerEntrySet.h>
-#include <ripple/types/api/Book.h>
+#include <ripple/types/Book.h>
 
 #include <chrono>
 #include <cstdint>

src/ripple/app/book/impl/BookTip.cpp

@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/module/app/book/BookTip.h>
+#include <ripple/app/book/BookTip.h>
 
 namespace ripple {
 namespace core {

src/ripple/app/book/impl/OfferStream.cpp

@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/module/app/book/OfferStream.h>
+#include <ripple/app/book/OfferStream.h>
 
 namespace ripple {
 namespace core {

src/ripple/app/book/impl/Quality.cpp

@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/module/app/book/Quality.h>
+#include <ripple/app/book/Quality.h>
 
 #include <cassert>
 #include <limits>

src/ripple/app/book/impl/Taker.cpp

@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/module/app/book/Taker.h>
+#include <ripple/app/book/Taker.h>
 
 namespace ripple {
 namespace core {

src/ripple/app/book/tests/OfferStream.test.cpp

@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/module/app/book/OfferStream.h>
+#include <ripple/app/book/OfferStream.h>
 
 #include <beast/unit_test/suite.h>
 

src/ripple/app/book/tests/Quality.test.cpp

@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/module/app/book/Quality.h>
+#include <ripple/app/book/Quality.h>
 
 #include <beast/unit_test/suite.h>
 #include <beast/cxx14/type_traits.h>

src/ripple/app/consensus/LedgerConsensus.cpp

@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/module/core/LoadFeeTrack.h>
+#include <ripple/core/LoadFeeTrack.h>
 #include <ripple/overlay/predicates.h>
-#include <ripple/types/api/UintTypes.h>
+#include <ripple/types/UintTypes.h>
 
 namespace ripple {
 

src/ripple/app/ledger/AcceptedLedgerTx.cpp

@@ -17,6 +17,9 @@
 */
 //==============================================================================
 
+#include <ripple/basics/StringUtilities.h>
+#include <boost/foreach.hpp>
+
 namespace ripple {
 
 AcceptedLedgerTx::AcceptedLedgerTx (Ledger::ref ledger, SerializerIterator& sit)

src/ripple/app/ledger/InboundLedgers.h

@@ -20,6 +20,7 @@
 #ifndef RIPPLE_INBOUNDLEDGERS_H
 #define RIPPLE_INBOUNDLEDGERS_H
 
+#include <beast/threads/Stoppable.h>
 #include <beast/cxx14/memory.h> // <memory>
 
 namespace ripple {

src/ripple/app/ledger/Ledger.cpp

@@ -17,12 +17,15 @@
 */
 //==============================================================================
 
-#include <ripple/basics/utility/Time.h>
+#include <ripple/basics/LoggedTimings.h>
+#include <ripple/basics/StringUtilities.h>
+#include <ripple/basics/Time.h>
 #include <ripple/common/jsonrpc_fields.h>
-#include <ripple/module/core/Config.h>
+#include <ripple/core/Config.h>
-#include <ripple/module/core/LoadFeeTrack.h>
+#include <ripple/core/LoadFeeTrack.h>
 #include <ripple/nodestore/Database.h>
 #include <beast/unit_test/suite.h>
+#include <boost/date_time/posix_time/posix_time.hpp>
 
 namespace ripple {
 

src/ripple/app/ledger/LedgerCleaner.cpp

@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/module/core/LoadFeeTrack.h>
+#include <ripple/core/LoadFeeTrack.h>
 #include <beast/cxx14/memory.h> // <memory>
 
 namespace ripple {

src/ripple/app/ledger/LedgerCleaner.h

@@ -21,6 +21,8 @@
 #define RIPPLE_LEDGERCLEANER_H_INCLUDED
 
 #include <beast/cxx14/memory.h> // <memory>
+#include <beast/threads/Stoppable.h>
+#include <beast/utility/Journal.h>
 
 namespace ripple {
 

src/ripple/app/ledger/LedgerEntrySet.cpp

@@ -17,7 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/module/app/book/Quality.h>
+#include <ripple/app/book/Quality.h>
+#include <ripple/basics/Log.h>
+#include <ripple/basics/StringUtilities.h>
 
 namespace ripple {
 

src/ripple/app/ledger/LedgerMaster.cpp

@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/basics/containers/RangeSet.h>
+#include <ripple/basics/RangeSet.h>
-#include <ripple/module/app/ledger/LedgerMaster.h>
+#include <ripple/app/ledger/LedgerMaster.h>
 #include <ripple/validators/Manager.h>
 #include <cassert>
 #include <beast/cxx14/memory.h> // <memory>

src/ripple/app/ledger/LedgerMaster.h

@@ -20,10 +20,10 @@
 #ifndef RIPPLE_LEDGERMASTER_H_INCLUDED
 #define RIPPLE_LEDGERMASTER_H_INCLUDED
 
-// VFALCO TODO Make a header that forward declares Collector and
+#include <ripple/basics/StringUtilities.h>
-//             its smart pointer container a-la boost.
-//
 #include <beast/insight/Collector.h>
+#include <beast/threads/Stoppable.h>
+#include <beast/threads/UnlockGuard.h>
 
 namespace ripple {
 

src/ripple/app/ledger/LedgerProposal.cpp

@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/module/core/Config.h>
+#include <ripple/core/Config.h>
 
 namespace ripple {
 

src/ripple/app/ledger/OrderBookDB.h

@@ -20,7 +20,7 @@
 #ifndef RIPPLE_ORDERBOOKDB_H_INCLUDED
 #define RIPPLE_ORDERBOOKDB_H_INCLUDED
 
-#include <ripple/module/app/ledger/BookListeners.h>
+#include <ripple/app/ledger/BookListeners.h>
 
 namespace ripple {
 

src/ripple/app/ledger/SerializedValidation.cpp

@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/module/core/Config.h>
+#include <ripple/core/Config.h>
 
 namespace ripple {
 

src/ripple/app/main/Application.cpp

@@ -17,20 +17,21 @@
 */
 //==============================================================================
 
-#include <beast/asio/io_latency_probe.h>
+#include <ripple/basics/Log.h>
-#include <beast/module/core/thread/DeadlineTimer.h>
+#include <ripple/basics/LoggedTimings.h>
-#include <ripple/basics/log/Log.h>
+#include <ripple/basics/Sustain.h>
-#include <ripple/basics/utility/Sustain.h>
 #include <ripple/common/seconds_clock.h>
-#include <ripple/module/app/main/Tuning.h>
+#include <ripple/app/main/Tuning.h>
-#include <ripple/module/app/misc/ProofOfWorkFactory.h>
+#include <ripple/app/misc/ProofOfWorkFactory.h>
-#include <ripple/module/core/LoadFeeTrack.h>
+#include <ripple/core/LoadFeeTrack.h>
-#include <ripple/module/rpc/Manager.h>
+#include <ripple/rpc/Manager.h>
 #include <ripple/nodestore/Database.h>
 #include <ripple/nodestore/DummyScheduler.h>
 #include <ripple/nodestore/Manager.h>
 #include <ripple/overlay/make_Overlay.h>
 #include <ripple/validators/Manager.h>
+#include <beast/asio/io_latency_probe.h>
+#include <beast/module/core/thread/DeadlineTimer.h>
 #include <fstream>
 
 namespace ripple {

src/ripple/app/main/Application.h

@@ -20,7 +20,7 @@
 #ifndef RIPPLE_APP_APPLICATION_H_INCLUDED
 #define RIPPLE_APP_APPLICATION_H_INCLUDED
 
-#include <ripple/module/app/main/FullBelowCache.h>
+#include <ripple/app/main/FullBelowCache.h>
 
 namespace ripple {
 

src/ripple/app/main/BasicFullBelowCache.h

@@ -20,14 +20,11 @@
 #ifndef RIPPLE_RADMAP_BASICFULLBELOWCACHE_H_INCLUDED
 #define RIPPLE_RADMAP_BASICFULLBELOWCACHE_H_INCLUDED
 
+#include <ripple/common/KeyCache.h>
+#include <ripple/app/main/Tuning.h>
 #include <beast/insight/Collector.h>
 
-#include <ripple/common/KeyCache.h>
-
-#include <ripple/radmap/api/Tuning.h>
-
 namespace ripple {
-namespace RadMap {
 
 /** Remembers which tree keys have all descendants resident.
     This optimizes the process of acquiring a complete tree.
@@ -111,7 +108,6 @@ private:
     KeyCache <Key> m_cache;
 };
 
-}
 }
 
 #endif

src/ripple/app/main/CollectorManager.cpp

@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/module/app/main/CollectorManager.h>
+#include <ripple/app/main/CollectorManager.h>
 
 namespace ripple {
 

src/ripple/app/main/FatalErrorReporter.cpp

@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/basics/log/Log.h>
+#include <ripple/basics/Log.h>
-#include <ripple/module/app/main/FatalErrorReporter.h>
+#include <ripple/app/main/FatalErrorReporter.h>
 #include <beast/unit_test/suite.h>
 
 namespace ripple {

src/ripple/app/main/FullBelowCache.h

@@ -20,12 +20,12 @@
 #ifndef RIPPLE_FULLBELOWCACHE_H_INCLUDED
 #define RIPPLE_FULLBELOWCACHE_H_INCLUDED
 
-#include <ripple/types/api/base_uint.h>
+#include <ripple/types/base_uint.h>
-#include <ripple/radmap/api/BasicFullBelowCache.h>
+#include <ripple/app/main/BasicFullBelowCache.h>
 
 namespace ripple {
 
-typedef RadMap::BasicFullBelowCache <uint256> FullBelowCache;
+typedef BasicFullBelowCache <uint256> FullBelowCache;
 
 }
 

src/ripple/app/main/IoServicePool.cpp

@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/module/app/main/IoServicePool.h>
+#include <ripple/app/main/IoServicePool.h>
 #include <beast/threads/Thread.h>
 #include <beast/cxx14/memory.h> // <memory>
 

src/ripple/app/main/LoadManager.cpp

@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/module/core/LoadFeeTrack.h>
+#include <ripple/core/LoadFeeTrack.h>
 // REMOVE ASAP
 #include <boost/thread.hpp>
 

src/ripple/app/main/LoadManager.h

@@ -20,6 +20,8 @@
 #ifndef RIPPLE_LOADMANAGER_H_INCLUDED
 #define RIPPLE_LOADMANAGER_H_INCLUDED
 
+#include <beast/threads/Stoppable.h>
+
 namespace ripple {
 
 /** Manages load sources.

src/ripple/app/main/LocalCredentials.cpp

@@ -17,7 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/module/core/Config.h>
+#include <ripple/basics/StringUtilities.h>
+#include <ripple/core/Config.h>
 
 namespace ripple {
 

src/ripple/app/main/Main.cpp

@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/basics/system/CheckLibraryVersions.h>
+#include <ripple/basics/CheckLibraryVersions.h>
-#include <ripple/basics/utility/Sustain.h>
+#include <ripple/basics/Sustain.h>
-#include <ripple/basics/utility/ThreadName.h>
+#include <ripple/basics/ThreadName.h>
-#include <ripple/module/core/ConfigSections.h>
+#include <ripple/core/ConfigSections.h>
 #include <beast/unit_test.h>
 #include <beast/streams/debug_ostream.h>
 

src/ripple/app/main/NodeStoreScheduler.cpp

@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/module/app/main/NodeStoreScheduler.h>
+#include <ripple/app/main/NodeStoreScheduler.h>
 
 namespace ripple {
 

src/ripple/app/main/NodeStoreScheduler.h

@@ -21,7 +21,7 @@
 #define RIPPLE_APP_NODESTORESCHEDULER_H_INCLUDED
 
 #include <ripple/nodestore/Scheduler.h>
-#include <ripple/module/core/JobQueue.h>
+#include <ripple/core/JobQueue.h>
 #include <beast/threads/Stoppable.h>
 #include <atomic>
 

src/ripple/app/main/ParameterTable.cpp

@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <ripple/common/jsonrpc_fields.h>
+#include <boost/foreach.hpp>
 
 namespace ripple {
 

src/ripple/app/main/RPCHTTPServer.cpp

@@ -19,9 +19,9 @@
 
 #include <ripple/common/RippleSSLContext.h>
 #include <ripple/http/Session.h>
-#include <ripple/module/app/main/RPCHTTPServer.h>
+#include <ripple/app/main/RPCHTTPServer.h>
-#include <ripple/module/rpc/RPCHandler.h>
+#include <ripple/rpc/RPCHandler.h>
-#include <ripple/module/rpc/RPCServerHandler.h>
+#include <ripple/rpc/RPCServerHandler.h>
 
 namespace ripple {
 

src/ripple/app/main/Tuning.h

@@ -27,6 +27,10 @@ enum
     fullBelowTargetSize = 524288
 
     ,fullBelowExpirationSeconds = 600
+
+    ,defaultCacheTargetSize = 0
+
+    ,defaultCacheExpirationSeconds = 120
 };
 
 }

src/ripple/app/misc/AccountState.cpp

@@ -17,6 +17,9 @@
 */
 //==============================================================================
 
+#include <ripple/basics/StringUtilities.h>
+#include <boost/format.hpp>
+
 namespace ripple {
 
 AccountState::AccountState (RippleAddress const& naAccountID)

src/ripple/app/misc/AmendmentTable.h

@@ -20,7 +20,7 @@
 #ifndef RIPPLE_AMENDMENT_TABLE_H
 #define RIPPLE_AMENDMENT_TABLE_H
 
-#include <ripple/module/app/book/Types.h>
+#include <ripple/app/book/Types.h>
 
 namespace ripple {
 

src/ripple/app/misc/HashRouter.cpp

@@ -17,6 +17,8 @@
 */
 //==============================================================================
 
+#include <boost/foreach.hpp>
+
 namespace ripple {
 
 // VFALCO TODO Inline the function definitions