Skip to content

Commit 4239880

Browse files
vinniefalcovinniefalco
committed
Clean up and restructure sources
1 parent 1dcd06a commit 4239880

File tree

522 files changed

+2830
-2966
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

522 files changed

+2830
-2966
lines changed

‎Builds/VisualStudio2013/RippleD.vcxproj

+710-727
Large diffs are not rendered by default.

‎Builds/VisualStudio2013/RippleD.vcxproj.filters

+1,200-1,266
Large diffs are not rendered by default.

‎SConstruct

-1
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,6 @@ for toolchain in all_toolchains:
559559
objects.append(addSource('src/ripple/unity/peerfinder.cpp', env, variant_dirs))
560560
objects.append(addSource('src/ripple/unity/protobuf.cpp', env, variant_dirs))
561561
objects.append(addSource('src/ripple/unity/ripple.proto.cpp', env, variant_dirs))
562-
objects.append(addSource('src/ripple/unity/radmap.cpp', env, variant_dirs))
563562
objects.append(addSource('src/ripple/unity/resource.cpp', env, variant_dirs))
564563
objects.append(addSource('src/ripple/unity/rpcx.cpp', env, variant_dirs))
565564
objects.append(addSource('src/ripple/unity/sitefiles.cpp', env, variant_dirs))

‎src/ripple/algorithm/README.md

-3
This file was deleted.

‎src/ripple/algorithm/TODO.md

-1
This file was deleted.

‎src/ripple/module/app/TODO.md ‎src/ripple/app/TODO.md

‎src/ripple/module/app/book/Amount.h ‎src/ripple/app/book/Amount.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#ifndef RIPPLE_CORE_AMOUNT_H_INCLUDED
2121
#define RIPPLE_CORE_AMOUNT_H_INCLUDED
2222

23-
#include <ripple/module/data/protocol/STObject.h>
23+
#include <ripple/data/protocol/STObject.h>
2424

2525
#include <beast/utility/noexcept.h>
2626
#include <beast/cxx14/type_traits.h> // <type_traits>

‎src/ripple/module/app/book/Amounts.h ‎src/ripple/app/book/Amounts.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#ifndef RIPPLE_CORE_AMOUNTS_H_INCLUDED
2121
#define RIPPLE_CORE_AMOUNTS_H_INCLUDED
2222

23-
#include <ripple/module/app/book/Amount.h>
23+
#include <ripple/app/book/Amount.h>
2424

2525
#include <beast/utility/noexcept.h>
2626

‎src/ripple/module/app/book/BookTip.h ‎src/ripple/app/book/BookTip.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
#ifndef RIPPLE_CORE_BOOKTIP_H_INCLUDED
2121
#define RIPPLE_CORE_BOOKTIP_H_INCLUDED
2222

23-
#include <ripple/module/app/book/Quality.h>
24-
#include <ripple/module/app/book/Types.h>
23+
#include <ripple/app/book/Quality.h>
24+
#include <ripple/app/book/Types.h>
2525

2626
#include <beast/utility/noexcept.h>
2727

‎src/ripple/module/app/book/Offer.h ‎src/ripple/app/book/Offer.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
#ifndef RIPPLE_CORE_OFFER_H_INCLUDED
2121
#define RIPPLE_CORE_OFFER_H_INCLUDED
2222

23-
#include <ripple/module/app/book/Amounts.h>
24-
#include <ripple/module/app/book/Quality.h>
25-
#include <ripple/module/app/book/Types.h>
23+
#include <ripple/app/book/Amounts.h>
24+
#include <ripple/app/book/Quality.h>
25+
#include <ripple/app/book/Types.h>
2626

27-
#include <ripple/module/app/misc/SerializedLedger.h>
28-
#include <ripple/module/data/protocol/SField.h>
27+
#include <ripple/app/misc/SerializedLedger.h>
28+
#include <ripple/data/protocol/SField.h>
2929

3030
#include <beast/utility/noexcept.h>
3131

‎src/ripple/module/app/book/OfferStream.h ‎src/ripple/app/book/OfferStream.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
#ifndef RIPPLE_CORE_OFFERSTREAM_H_INCLUDED
2121
#define RIPPLE_CORE_OFFERSTREAM_H_INCLUDED
2222

23-
#include <ripple/module/app/book/BookTip.h>
24-
#include <ripple/module/app/book/Offer.h>
25-
#include <ripple/module/app/book/Quality.h>
26-
#include <ripple/module/app/book/Types.h>
23+
#include <ripple/app/book/BookTip.h>
24+
#include <ripple/app/book/Offer.h>
25+
#include <ripple/app/book/Quality.h>
26+
#include <ripple/app/book/Types.h>
2727

2828
#include <beast/utility/noexcept.h>
2929

‎src/ripple/module/app/book/Quality.h ‎src/ripple/app/book/Quality.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
#ifndef RIPPLE_CORE_QUALITY_H_INCLUDED
2121
#define RIPPLE_CORE_QUALITY_H_INCLUDED
2222

23-
#include <ripple/module/app/book/Amount.h>
24-
#include <ripple/module/app/book/Amounts.h>
23+
#include <ripple/app/book/Amount.h>
24+
#include <ripple/app/book/Amounts.h>
2525

2626
#include <cstdint>
2727
#include <ostream>

‎src/ripple/module/app/book/Taker.h ‎src/ripple/app/book/Taker.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
#ifndef RIPPLE_CORE_TAKER_H_INCLUDED
2121
#define RIPPLE_CORE_TAKER_H_INCLUDED
2222

23-
#include <ripple/module/app/book/Amounts.h>
24-
#include <ripple/module/app/book/Quality.h>
25-
#include <ripple/module/app/book/Offer.h>
26-
#include <ripple/module/app/book/Types.h>
23+
#include <ripple/app/book/Amounts.h>
24+
#include <ripple/app/book/Quality.h>
25+
#include <ripple/app/book/Offer.h>
26+
#include <ripple/app/book/Types.h>
2727

2828
#include <beast/streams/debug_ostream.h>
2929
#include <beast/utility/noexcept.h>

‎src/ripple/module/app/book/Types.h ‎src/ripple/app/book/Types.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
#ifndef RIPPLE_CORE_TYPES_H_INCLUDED
2121
#define RIPPLE_CORE_TYPES_H_INCLUDED
2222

23-
#include <ripple/module/app/ledger/LedgerEntrySet.h>
24-
#include <ripple/types/api/Book.h>
23+
#include <ripple/app/ledger/LedgerEntrySet.h>
24+
#include <ripple/types/Book.h>
2525

2626
#include <chrono>
2727
#include <cstdint>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
//==============================================================================
1919

20-
#include <ripple/module/app/book/BookTip.h>
20+
#include <ripple/app/book/BookTip.h>
2121

2222
namespace ripple {
2323
namespace core {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
//==============================================================================
1919

20-
#include <ripple/module/app/book/OfferStream.h>
20+
#include <ripple/app/book/OfferStream.h>
2121

2222
namespace ripple {
2323
namespace core {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
//==============================================================================
1919

20-
#include <ripple/module/app/book/Quality.h>
20+
#include <ripple/app/book/Quality.h>
2121

2222
#include <cassert>
2323
#include <limits>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
//==============================================================================
1919

20-
#include <ripple/module/app/book/Taker.h>
20+
#include <ripple/app/book/Taker.h>
2121

2222
namespace ripple {
2323
namespace core {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
//==============================================================================
1919

20-
#include <ripple/module/app/book/OfferStream.h>
20+
#include <ripple/app/book/OfferStream.h>
2121

2222
#include <beast/unit_test/suite.h>
2323

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
//==============================================================================
1919

20-
#include <ripple/module/app/book/Quality.h>
20+
#include <ripple/app/book/Quality.h>
2121

2222
#include <beast/unit_test/suite.h>
2323
#include <beast/cxx14/type_traits.h>

‎src/ripple/module/app/consensus/DisputedTx.cpp ‎src/ripple/app/consensus/DisputedTx.cpp

File renamed without changes.

‎src/ripple/module/app/consensus/DisputedTx.h ‎src/ripple/app/consensus/DisputedTx.h

File renamed without changes.

‎src/ripple/module/app/consensus/LedgerConsensus.cpp ‎src/ripple/app/consensus/LedgerConsensus.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
*/
1818
//==============================================================================
1919

20-
#include <ripple/module/core/LoadFeeTrack.h>
20+
#include <ripple/core/LoadFeeTrack.h>
2121
#include <ripple/overlay/predicates.h>
22-
#include <ripple/types/api/UintTypes.h>
22+
#include <ripple/types/UintTypes.h>
2323

2424
namespace ripple {
2525

‎src/ripple/module/app/consensus/LedgerConsensus.h ‎src/ripple/app/consensus/LedgerConsensus.h

File renamed without changes.

‎src/ripple/module/app/data/DBInit.cpp ‎src/ripple/app/data/DBInit.cpp

File renamed without changes.

‎src/ripple/module/app/data/DBInit.h ‎src/ripple/app/data/DBInit.h

File renamed without changes.

‎src/ripple/module/app/data/Database.cpp ‎src/ripple/app/data/Database.cpp

File renamed without changes.

‎src/ripple/module/app/data/Database.h ‎src/ripple/app/data/Database.h

File renamed without changes.

‎src/ripple/module/app/data/DatabaseCon.cpp ‎src/ripple/app/data/DatabaseCon.cpp

File renamed without changes.

‎src/ripple/module/app/data/DatabaseCon.h ‎src/ripple/app/data/DatabaseCon.h

File renamed without changes.

‎src/ripple/module/app/data/SqliteDatabase.cpp ‎src/ripple/app/data/SqliteDatabase.cpp

File renamed without changes.

‎src/ripple/module/app/data/SqliteDatabase.h ‎src/ripple/app/data/SqliteDatabase.h

File renamed without changes.

‎src/ripple/module/app/ledger/AcceptedLedger.cpp ‎src/ripple/app/ledger/AcceptedLedger.cpp

File renamed without changes.

‎src/ripple/module/app/ledger/AcceptedLedger.h ‎src/ripple/app/ledger/AcceptedLedger.h

File renamed without changes.

‎src/ripple/module/app/ledger/AcceptedLedgerTx.cpp ‎src/ripple/app/ledger/AcceptedLedgerTx.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
*/
1818
//==============================================================================
1919

20+
#include <ripple/basics/StringUtilities.h>
21+
#include <boost/foreach.hpp>
22+
2023
namespace ripple {
2124

2225
AcceptedLedgerTx::AcceptedLedgerTx (Ledger::ref ledger, SerializerIterator& sit)

‎src/ripple/module/app/ledger/AcceptedLedgerTx.h ‎src/ripple/app/ledger/AcceptedLedgerTx.h

File renamed without changes.

‎src/ripple/module/app/ledger/BookListeners.cpp ‎src/ripple/app/ledger/BookListeners.cpp

File renamed without changes.

‎src/ripple/module/app/ledger/BookListeners.h ‎src/ripple/app/ledger/BookListeners.h

File renamed without changes.

‎src/ripple/module/app/ledger/DirectoryEntryIterator.cpp ‎src/ripple/app/ledger/DirectoryEntryIterator.cpp

File renamed without changes.

‎src/ripple/module/app/ledger/DirectoryEntryIterator.h ‎src/ripple/app/ledger/DirectoryEntryIterator.h

File renamed without changes.

‎src/ripple/module/app/ledger/InboundLedger.cpp ‎src/ripple/app/ledger/InboundLedger.cpp

File renamed without changes.

‎src/ripple/module/app/ledger/InboundLedger.h ‎src/ripple/app/ledger/InboundLedger.h

File renamed without changes.

‎src/ripple/module/app/ledger/InboundLedgers.cpp ‎src/ripple/app/ledger/InboundLedgers.cpp

File renamed without changes.

‎src/ripple/module/app/ledger/InboundLedgers.h ‎src/ripple/app/ledger/InboundLedgers.h

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#ifndef RIPPLE_INBOUNDLEDGERS_H
2121
#define RIPPLE_INBOUNDLEDGERS_H
2222

23+
#include <beast/threads/Stoppable.h>
2324
#include <beast/cxx14/memory.h> // <memory>
2425

2526
namespace ripple {

‎src/ripple/module/app/ledger/Ledger.cpp ‎src/ripple/app/ledger/Ledger.cpp

+6-3
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,15 @@
1717
*/
1818
//==============================================================================
1919

20-
#include <ripple/basics/utility/Time.h>
20+
#include <ripple/basics/LoggedTimings.h>
21+
#include <ripple/basics/StringUtilities.h>
22+
#include <ripple/basics/Time.h>
2123
#include <ripple/common/jsonrpc_fields.h>
22-
#include <ripple/module/core/Config.h>
23-
#include <ripple/module/core/LoadFeeTrack.h>
24+
#include <ripple/core/Config.h>
25+
#include <ripple/core/LoadFeeTrack.h>
2426
#include <ripple/nodestore/Database.h>
2527
#include <beast/unit_test/suite.h>
28+
#include <boost/date_time/posix_time/posix_time.hpp>
2629

2730
namespace ripple {
2831

‎src/ripple/module/app/ledger/Ledger.h ‎src/ripple/app/ledger/Ledger.h

File renamed without changes.

‎src/ripple/module/app/ledger/LedgerCleaner.cpp ‎src/ripple/app/ledger/LedgerCleaner.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
//==============================================================================
1919

20-
#include <ripple/module/core/LoadFeeTrack.h>
20+
#include <ripple/core/LoadFeeTrack.h>
2121
#include <beast/cxx14/memory.h> // <memory>
2222

2323
namespace ripple {

‎src/ripple/module/app/ledger/LedgerCleaner.h ‎src/ripple/app/ledger/LedgerCleaner.h

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
#define RIPPLE_LEDGERCLEANER_H_INCLUDED
2222

2323
#include <beast/cxx14/memory.h> // <memory>
24+
#include <beast/threads/Stoppable.h>
25+
#include <beast/utility/Journal.h>
2426

2527
namespace ripple {
2628

‎src/ripple/module/app/ledger/LedgerEntrySet.cpp ‎src/ripple/app/ledger/LedgerEntrySet.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717
*/
1818
//==============================================================================
1919

20-
#include <ripple/module/app/book/Quality.h>
20+
#include <ripple/app/book/Quality.h>
21+
#include <ripple/basics/Log.h>
22+
#include <ripple/basics/StringUtilities.h>
2123

2224
namespace ripple {
2325

‎src/ripple/module/app/ledger/LedgerEntrySet.h ‎src/ripple/app/ledger/LedgerEntrySet.h

File renamed without changes.

‎src/ripple/module/app/ledger/LedgerHistory.cpp ‎src/ripple/app/ledger/LedgerHistory.cpp

File renamed without changes.

‎src/ripple/module/app/ledger/LedgerHistory.h ‎src/ripple/app/ledger/LedgerHistory.h

File renamed without changes.

‎src/ripple/module/app/ledger/LedgerHolder.h ‎src/ripple/app/ledger/LedgerHolder.h

File renamed without changes.

‎src/ripple/module/app/ledger/LedgerMaster.cpp ‎src/ripple/app/ledger/LedgerMaster.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
*/
1818
//==============================================================================
1919

20-
#include <ripple/basics/containers/RangeSet.h>
21-
#include <ripple/module/app/ledger/LedgerMaster.h>
20+
#include <ripple/basics/RangeSet.h>
21+
#include <ripple/app/ledger/LedgerMaster.h>
2222
#include <ripple/validators/Manager.h>
2323
#include <cassert>
2424
#include <beast/cxx14/memory.h> // <memory>

‎src/ripple/module/app/ledger/LedgerMaster.h ‎src/ripple/app/ledger/LedgerMaster.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
#ifndef RIPPLE_LEDGERMASTER_H_INCLUDED
2121
#define RIPPLE_LEDGERMASTER_H_INCLUDED
2222

23-
// VFALCO TODO Make a header that forward declares Collector and
24-
// its smart pointer container a-la boost.
25-
//
23+
#include <ripple/basics/StringUtilities.h>
2624
#include <beast/insight/Collector.h>
25+
#include <beast/threads/Stoppable.h>
26+
#include <beast/threads/UnlockGuard.h>
2727

2828
namespace ripple {
2929

‎src/ripple/module/app/ledger/LedgerProposal.cpp ‎src/ripple/app/ledger/LedgerProposal.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
//==============================================================================
1919

20-
#include <ripple/module/core/Config.h>
20+
#include <ripple/core/Config.h>
2121

2222
namespace ripple {
2323

‎src/ripple/module/app/ledger/LedgerProposal.h ‎src/ripple/app/ledger/LedgerProposal.h

File renamed without changes.

‎src/ripple/module/app/ledger/LedgerTiming.cpp ‎src/ripple/app/ledger/LedgerTiming.cpp

File renamed without changes.

‎src/ripple/module/app/ledger/LedgerTiming.h ‎src/ripple/app/ledger/LedgerTiming.h

File renamed without changes.

‎src/ripple/module/app/ledger/OrderBookDB.cpp ‎src/ripple/app/ledger/OrderBookDB.cpp

File renamed without changes.

‎src/ripple/module/app/ledger/OrderBookDB.h ‎src/ripple/app/ledger/OrderBookDB.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#ifndef RIPPLE_ORDERBOOKDB_H_INCLUDED
2121
#define RIPPLE_ORDERBOOKDB_H_INCLUDED
2222

23-
#include <ripple/module/app/ledger/BookListeners.h>
23+
#include <ripple/app/ledger/BookListeners.h>
2424

2525
namespace ripple {
2626

‎src/ripple/module/app/ledger/OrderBookIterator.cpp ‎src/ripple/app/ledger/OrderBookIterator.cpp

File renamed without changes.

‎src/ripple/module/app/ledger/OrderBookIterator.h ‎src/ripple/app/ledger/OrderBookIterator.h

File renamed without changes.

‎src/ripple/module/app/ledger/README.md ‎src/ripple/app/ledger/README.md

‎src/ripple/module/app/ledger/SerializedValidation.cpp ‎src/ripple/app/ledger/SerializedValidation.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
//==============================================================================
1919

20-
#include <ripple/module/core/Config.h>
20+
#include <ripple/core/Config.h>
2121

2222
namespace ripple {
2323

‎src/ripple/module/app/ledger/SerializedValidation.h ‎src/ripple/app/ledger/SerializedValidation.h

File renamed without changes.

‎src/ripple/module/app/ledger/TODO.md ‎src/ripple/app/ledger/TODO.md

‎src/ripple/module/app/main/Application.cpp ‎src/ripple/app/main/Application.cpp

+9-8
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,21 @@
1717
*/
1818
//==============================================================================
1919

20-
#include <beast/asio/io_latency_probe.h>
21-
#include <beast/module/core/thread/DeadlineTimer.h>
22-
#include <ripple/basics/log/Log.h>
23-
#include <ripple/basics/utility/Sustain.h>
20+
#include <ripple/basics/Log.h>
21+
#include <ripple/basics/LoggedTimings.h>
22+
#include <ripple/basics/Sustain.h>
2423
#include <ripple/common/seconds_clock.h>
25-
#include <ripple/module/app/main/Tuning.h>
26-
#include <ripple/module/app/misc/ProofOfWorkFactory.h>
27-
#include <ripple/module/core/LoadFeeTrack.h>
28-
#include <ripple/module/rpc/Manager.h>
24+
#include <ripple/app/main/Tuning.h>
25+
#include <ripple/app/misc/ProofOfWorkFactory.h>
26+
#include <ripple/core/LoadFeeTrack.h>
27+
#include <ripple/rpc/Manager.h>
2928
#include <ripple/nodestore/Database.h>
3029
#include <ripple/nodestore/DummyScheduler.h>
3130
#include <ripple/nodestore/Manager.h>
3231
#include <ripple/overlay/make_Overlay.h>
3332
#include <ripple/validators/Manager.h>
33+
#include <beast/asio/io_latency_probe.h>
34+
#include <beast/module/core/thread/DeadlineTimer.h>
3435
#include <fstream>
3536

3637
namespace ripple {

‎src/ripple/module/app/main/Application.h ‎src/ripple/app/main/Application.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#ifndef RIPPLE_APP_APPLICATION_H_INCLUDED
2121
#define RIPPLE_APP_APPLICATION_H_INCLUDED
2222

23-
#include <ripple/module/app/main/FullBelowCache.h>
23+
#include <ripple/app/main/FullBelowCache.h>
2424

2525
namespace ripple {
2626

‎src/ripple/radmap/impl/BasicFullBelowCache.cpp ‎src/ripple/app/main/BasicFullBelowCache.cpp

File renamed without changes.

‎src/ripple/radmap/api/BasicFullBelowCache.h ‎src/ripple/app/main/BasicFullBelowCache.h

+2-6
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,11 @@
2020
#ifndef RIPPLE_RADMAP_BASICFULLBELOWCACHE_H_INCLUDED
2121
#define RIPPLE_RADMAP_BASICFULLBELOWCACHE_H_INCLUDED
2222

23-
#include <beast/insight/Collector.h>
24-
2523
#include <ripple/common/KeyCache.h>
26-
27-
#include <ripple/radmap/api/Tuning.h>
24+
#include <ripple/app/main/Tuning.h>
25+
#include <beast/insight/Collector.h>
2826

2927
namespace ripple {
30-
namespace RadMap {
3128

3229
/** Remembers which tree keys have all descendants resident.
3330
This optimizes the process of acquiring a complete tree.
@@ -111,7 +108,6 @@ class BasicFullBelowCache
111108
KeyCache <Key> m_cache;
112109
};
113110

114-
}
115111
}
116112

117113
#endif

‎src/ripple/module/app/main/CollectorManager.cpp ‎src/ripple/app/main/CollectorManager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
//==============================================================================
1919

20-
#include <ripple/module/app/main/CollectorManager.h>
20+
#include <ripple/app/main/CollectorManager.h>
2121

2222
namespace ripple {
2323

‎src/ripple/module/app/main/CollectorManager.h ‎src/ripple/app/main/CollectorManager.h

File renamed without changes.

‎src/ripple/module/app/main/FatalErrorReporter.cpp ‎src/ripple/app/main/FatalErrorReporter.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
*/
1818
//==============================================================================
1919

20-
#include <ripple/basics/log/Log.h>
21-
#include <ripple/module/app/main/FatalErrorReporter.h>
20+
#include <ripple/basics/Log.h>
21+
#include <ripple/app/main/FatalErrorReporter.h>
2222
#include <beast/unit_test/suite.h>
2323

2424
namespace ripple {

‎src/ripple/module/app/main/FatalErrorReporter.h ‎src/ripple/app/main/FatalErrorReporter.h

File renamed without changes.

‎src/ripple/module/app/main/FullBelowCache.h ‎src/ripple/app/main/FullBelowCache.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
#ifndef RIPPLE_FULLBELOWCACHE_H_INCLUDED
2121
#define RIPPLE_FULLBELOWCACHE_H_INCLUDED
2222

23-
#include <ripple/types/api/base_uint.h>
24-
#include <ripple/radmap/api/BasicFullBelowCache.h>
23+
#include <ripple/types/base_uint.h>
24+
#include <ripple/app/main/BasicFullBelowCache.h>
2525

2626
namespace ripple {
2727

28-
typedef RadMap::BasicFullBelowCache <uint256> FullBelowCache;
28+
typedef BasicFullBelowCache <uint256> FullBelowCache;
2929

3030
}
3131

0 commit comments

Comments
 (0)