From 496efb71ca1049ca3314f2f49d02e1ea8c2bff75 Mon Sep 17 00:00:00 2001 From: Pratik Mankawde <3397372+pratikmankawde@users.noreply.github.com> Date: Thu, 11 Dec 2025 15:30:54 +0000 Subject: [PATCH] refactor: Move JobQueue and related classes into xrpl.core module (#6121) --- .github/scripts/levelization/README.md | 52 +++++++++++++------ .../scripts/levelization/results/loops.txt | 6 --- .../scripts/levelization/results/ordering.txt | 18 +++++-- cmake/XrplCore.cmake | 11 +++- cmake/XrplInstall.cmake | 1 + .../xrpl}/core/ClosureCounter.h | 0 {src/xrpld => include/xrpl}/core/Coro.ipp | 0 {src/xrpld => include/xrpl}/core/Job.h | 5 +- {src/xrpld => include/xrpl}/core/JobQueue.h | 11 ++-- .../xrpld => include/xrpl}/core/JobTypeData.h | 3 +- .../xrpld => include/xrpl}/core/JobTypeInfo.h | 2 +- {src/xrpld => include/xrpl}/core/JobTypes.h | 4 +- {src/xrpld => include/xrpl}/core/LoadEvent.h | 0 .../xrpld => include/xrpl}/core/LoadMonitor.h | 3 +- .../perflog => include/xrpl/core}/PerfLog.h | 11 ++-- .../xrpl}/core/detail/Workers.h | 3 +- .../xrpl}/core/detail/semaphore.h | 0 src/{xrpld => libxrpl}/core/detail/Job.cpp | 3 +- .../core/detail/JobQueue.cpp | 5 +- .../core/detail/LoadEvent.cpp | 5 +- .../core/detail/LoadMonitor.cpp | 3 +- .../core/detail/Workers.cpp | 5 +- src/test/app/Path_test.cpp | 2 +- src/test/app/Transaction_ordering_test.cpp | 2 +- src/test/basics/PerfLog_test.cpp | 2 +- src/test/core/ClosureCounter_test.cpp | 3 +- src/test/core/Coroutine_test.cpp | 2 +- src/test/core/JobQueue_test.cpp | 3 +- src/test/core/Workers_test.cpp | 5 +- src/test/rpc/RobustTransaction_test.cpp | 3 +- src/xrpld/app/consensus/RCLConsensus.h | 2 +- src/xrpld/app/consensus/RCLValidations.cpp | 4 +- src/xrpld/app/ledger/ConsensusTransSetSF.cpp | 2 +- src/xrpld/app/ledger/Ledger.cpp | 2 +- src/xrpld/app/ledger/OrderBookDB.cpp | 2 +- src/xrpld/app/ledger/detail/InboundLedger.cpp | 2 +- .../app/ledger/detail/InboundLedgers.cpp | 4 +- .../app/ledger/detail/InboundTransactions.cpp | 2 +- .../app/ledger/detail/LedgerDeltaAcquire.cpp | 3 +- .../app/ledger/detail/TimeoutCounter.cpp | 3 +- src/xrpld/app/ledger/detail/TimeoutCounter.h | 2 +- src/xrpld/app/main/Application.cpp | 2 +- src/xrpld/app/main/GRPCServer.h | 2 +- src/xrpld/app/main/NodeStoreScheduler.h | 3 +- src/xrpld/app/misc/NetworkOPs.cpp | 2 +- src/xrpld/app/misc/NetworkOPs.h | 2 +- src/xrpld/app/paths/PathRequests.cpp | 2 +- src/xrpld/app/paths/Pathfinder.cpp | 2 +- src/xrpld/app/paths/Pathfinder.h | 2 +- src/xrpld/core/DatabaseCon.h | 3 +- src/xrpld/core/SociDB.h | 3 +- src/xrpld/overlay/detail/OverlayImpl.h | 2 +- src/xrpld/overlay/detail/PeerImp.cpp | 2 +- src/xrpld/overlay/detail/PeerSet.cpp | 3 +- src/xrpld/perflog/detail/PerfLogImp.cpp | 2 +- src/xrpld/perflog/detail/PerfLogImp.h | 2 +- src/xrpld/rpc/Context.h | 2 +- src/xrpld/rpc/RPCSub.h | 3 +- src/xrpld/rpc/ServerHandler.h | 2 +- src/xrpld/rpc/detail/LegacyPathFind.cpp | 5 +- src/xrpld/rpc/detail/RPCHandler.cpp | 4 +- src/xrpld/rpc/detail/ServerHandler.cpp | 2 +- src/xrpld/rpc/handlers/LogRotate.cpp | 2 +- 63 files changed, 139 insertions(+), 116 deletions(-) rename {src/xrpld => include/xrpl}/core/ClosureCounter.h (100%) rename {src/xrpld => include/xrpl}/core/Coro.ipp (100%) rename {src/xrpld => include/xrpl}/core/Job.h (98%) rename {src/xrpld => include/xrpl}/core/JobQueue.h (98%) rename {src/xrpld => include/xrpl}/core/JobTypeData.h (97%) rename {src/xrpld => include/xrpl}/core/JobTypeInfo.h (98%) rename {src/xrpld => include/xrpl}/core/JobTypes.h (99%) rename {src/xrpld => include/xrpl}/core/LoadEvent.h (100%) rename {src/xrpld => include/xrpl}/core/LoadMonitor.h (97%) rename {src/xrpld/perflog => include/xrpl/core}/PerfLog.h (96%) rename {src/xrpld => include/xrpl}/core/detail/Workers.h (99%) rename {src/xrpld => include/xrpl}/core/detail/semaphore.h (100%) rename src/{xrpld => libxrpl}/core/detail/Job.cpp (98%) rename src/{xrpld => libxrpl}/core/detail/JobQueue.cpp (99%) rename src/{xrpld => libxrpl}/core/detail/LoadEvent.cpp (94%) rename src/{xrpld => libxrpl}/core/detail/LoadMonitor.cpp (99%) rename src/{xrpld => libxrpl}/core/detail/Workers.cpp (98%) diff --git a/.github/scripts/levelization/README.md b/.github/scripts/levelization/README.md index f3ba1e2518..3b77a192b9 100644 --- a/.github/scripts/levelization/README.md +++ b/.github/scripts/levelization/README.md @@ -3,21 +3,26 @@ Levelization is the term used to describe efforts to prevent rippled from having or creating cyclic dependencies. -rippled code is organized into directories under `src/rippled` (and +rippled code is organized into directories under `src/xrpld`, `src/libxrpl` (and `src/test`) representing modules. The modules are intended to be organized into "tiers" or "levels" such that a module from one level can only include code from lower levels. Additionally, a module -in one level should never include code in an `impl` folder of any level +in one level should never include code in an `impl` or `detail` folder of any level other than it's own. +The codebase is split into two main areas: + +- **libxrpl** (`src/libxrpl`, `include/xrpl`): Reusable library modules with public interfaces +- **xrpld** (`src/xrpld`): Application-specific implementation code + Unfortunately, over time, enforcement of levelization has been inconsistent, so the current state of the code doesn't necessarily reflect these rules. Whenever possible, developers should refactor any levelization violations they find (by moving files or individual classes). At the very least, don't make things worse. -The table below summarizes the _desired_ division of modules, based on the -state of the rippled code when it was created. The levels are numbered from +The table below summarizes the _desired_ division of modules, based on the current +state of the rippled code. The levels are numbered from the bottom up with the lower level, lower numbered, more independent modules listed first, and the higher level, higher numbered modules with more dependencies listed later. @@ -25,18 +30,33 @@ more dependencies listed later. **tl;dr:** The modules listed first are more independent than the modules listed later. +## libxrpl Modules (Reusable Libraries) + +| Level / Tier | Module(s) | +| ------------ | ----------------------------------- | +| 01 | xrpl/beast | +| 02 | xrpl/basics | +| 03 | xrpl/json xrpl/crypto | +| 04 | xrpl/protocol | +| 05 | xrpl/core xrpl/resource xrpl/server | +| 06 | xrpl/ledger xrpl/nodestore xrpl/net | +| 07 | xrpl/shamap | + +## xrpld Modules (Application Implementation) + +| Level / Tier | Module(s) | +| ------------ | -------------------------------- | +| 05 | xrpld/conditions xrpld/consensus | +| 06 | xrpld/core xrpld/peerfinder | +| 07 | xrpld/shamap xrpld/overlay | +| 08 | xrpld/app | +| 09 | xrpld/rpc | +| 10 | xrpld/perflog | + +## Test Modules + | Level / Tier | Module(s) | | ------------ | -------------------------------------------------------------------------------------------------------- | -| 01 | ripple/beast ripple/unity | -| 02 | ripple/basics | -| 03 | ripple/json ripple/crypto | -| 04 | ripple/protocol | -| 05 | ripple/core ripple/conditions ripple/consensus ripple/resource ripple/server | -| 06 | ripple/peerfinder ripple/ledger ripple/nodestore ripple/net | -| 07 | ripple/shamap ripple/overlay | -| 08 | ripple/app | -| 09 | ripple/rpc | -| 10 | ripple/perflog | | 11 | test/jtx test/beast test/csf | | 12 | test/unit_test | | 13 | test/crypto test/conditions test/json test/resource test/shamap test/peerfinder test/basics test/overlay | @@ -45,8 +65,8 @@ listed later. | 16 | test/rpc test/app | (Note that `test` levelization is _much_ less important and _much_ less -strictly enforced than `ripple` levelization, other than the requirement -that `test` code should _never_ be included in `ripple` code.) +strictly enforced than `xrpl`/`xrpld` levelization, other than the requirement +that `test` code should _never_ be included in `xrpl` or `xrpld` code.) ## Validation diff --git a/.github/scripts/levelization/results/loops.txt b/.github/scripts/levelization/results/loops.txt index d057391be9..d15843ceb0 100644 --- a/.github/scripts/levelization/results/loops.txt +++ b/.github/scripts/levelization/results/loops.txt @@ -19,12 +19,6 @@ Loop: xrpld.app xrpld.rpc Loop: xrpld.app xrpld.shamap xrpld.shamap ~= xrpld.app -Loop: xrpld.core xrpld.perflog - xrpld.perflog == xrpld.core - Loop: xrpld.overlay xrpld.rpc xrpld.rpc ~= xrpld.overlay -Loop: xrpld.perflog xrpld.rpc - xrpld.rpc ~= xrpld.perflog - diff --git a/.github/scripts/levelization/results/ordering.txt b/.github/scripts/levelization/results/ordering.txt index 251e9c1957..c9c65fb0dd 100644 --- a/.github/scripts/levelization/results/ordering.txt +++ b/.github/scripts/levelization/results/ordering.txt @@ -1,4 +1,6 @@ libxrpl.basics > xrpl.basics +libxrpl.core > xrpl.basics +libxrpl.core > xrpl.core libxrpl.crypto > xrpl.basics libxrpl.json > xrpl.basics libxrpl.json > xrpl.json @@ -30,6 +32,7 @@ test.app > test.rpc test.app > test.toplevel test.app > test.unit_test test.app > xrpl.basics +test.app > xrpl.core test.app > xrpld.app test.app > xrpld.core test.app > xrpld.overlay @@ -42,7 +45,7 @@ test.app > xrpl.resource test.basics > test.jtx test.basics > test.unit_test test.basics > xrpl.basics -test.basics > xrpld.perflog +test.basics > xrpl.core test.basics > xrpld.rpc test.basics > xrpl.json test.basics > xrpl.protocol @@ -61,8 +64,8 @@ test.core > test.jtx test.core > test.toplevel test.core > test.unit_test test.core > xrpl.basics +test.core > xrpl.core test.core > xrpld.core -test.core > xrpld.perflog test.core > xrpl.json test.core > xrpl.server test.csf > xrpl.basics @@ -119,6 +122,7 @@ test.resource > xrpl.resource test.rpc > test.jtx test.rpc > test.toplevel test.rpc > xrpl.basics +test.rpc > xrpl.core test.rpc > xrpld.app test.rpc > xrpld.core test.rpc > xrpld.overlay @@ -146,6 +150,8 @@ test.unit_test > xrpl.basics tests.libxrpl > xrpl.basics tests.libxrpl > xrpl.json tests.libxrpl > xrpl.net +xrpl.core > xrpl.basics +xrpl.core > xrpl.json xrpl.json > xrpl.basics xrpl.ledger > xrpl.basics xrpl.ledger > xrpl.protocol @@ -165,9 +171,9 @@ xrpl.shamap > xrpl.nodestore xrpl.shamap > xrpl.protocol xrpld.app > test.unit_test xrpld.app > xrpl.basics +xrpld.app > xrpl.core xrpld.app > xrpld.conditions xrpld.app > xrpld.consensus -xrpld.app > xrpld.perflog xrpld.app > xrpl.json xrpld.app > xrpl.ledger xrpld.app > xrpl.net @@ -181,13 +187,14 @@ xrpld.consensus > xrpl.basics xrpld.consensus > xrpl.json xrpld.consensus > xrpl.protocol xrpld.core > xrpl.basics +xrpld.core > xrpl.core xrpld.core > xrpl.json xrpld.core > xrpl.net xrpld.core > xrpl.protocol xrpld.overlay > xrpl.basics +xrpld.overlay > xrpl.core xrpld.overlay > xrpld.core xrpld.overlay > xrpld.peerfinder -xrpld.overlay > xrpld.perflog xrpld.overlay > xrpl.json xrpld.overlay > xrpl.protocol xrpld.overlay > xrpl.resource @@ -196,8 +203,11 @@ xrpld.peerfinder > xrpl.basics xrpld.peerfinder > xrpld.core xrpld.peerfinder > xrpl.protocol xrpld.perflog > xrpl.basics +xrpld.perflog > xrpl.core +xrpld.perflog > xrpld.rpc xrpld.perflog > xrpl.json xrpld.rpc > xrpl.basics +xrpld.rpc > xrpl.core xrpld.rpc > xrpld.core xrpld.rpc > xrpl.json xrpld.rpc > xrpl.ledger diff --git a/cmake/XrplCore.cmake b/cmake/XrplCore.cmake index e4f97c46c3..12ba58d499 100644 --- a/cmake/XrplCore.cmake +++ b/cmake/XrplCore.cmake @@ -94,10 +94,18 @@ target_link_libraries(xrpl.libxrpl.protocol PUBLIC ) # Level 05 +add_module(xrpl core) +target_link_libraries(xrpl.libxrpl.core PUBLIC + xrpl.libxrpl.basics + xrpl.libxrpl.json + xrpl.libxrpl.protocol +) + +# Level 06 add_module(xrpl resource) target_link_libraries(xrpl.libxrpl.resource PUBLIC xrpl.libxrpl.protocol) -# Level 06 +# Level 07 add_module(xrpl net) target_link_libraries(xrpl.libxrpl.net PUBLIC xrpl.libxrpl.basics @@ -144,6 +152,7 @@ target_sources(xrpl.libxrpl PRIVATE ${sources}) target_link_modules(xrpl PUBLIC basics beast + core crypto json protocol diff --git a/cmake/XrplInstall.cmake b/cmake/XrplInstall.cmake index ca3ad11d74..67aca8f048 100644 --- a/cmake/XrplInstall.cmake +++ b/cmake/XrplInstall.cmake @@ -16,6 +16,7 @@ install ( xrpl.libxrpl xrpl.libxrpl.basics xrpl.libxrpl.beast + xrpl.libxrpl.core xrpl.libxrpl.crypto xrpl.libxrpl.json xrpl.libxrpl.ledger diff --git a/src/xrpld/core/ClosureCounter.h b/include/xrpl/core/ClosureCounter.h similarity index 100% rename from src/xrpld/core/ClosureCounter.h rename to include/xrpl/core/ClosureCounter.h diff --git a/src/xrpld/core/Coro.ipp b/include/xrpl/core/Coro.ipp similarity index 100% rename from src/xrpld/core/Coro.ipp rename to include/xrpl/core/Coro.ipp diff --git a/src/xrpld/core/Job.h b/include/xrpl/core/Job.h similarity index 98% rename from src/xrpld/core/Job.h rename to include/xrpl/core/Job.h index ac6278b3c8..35d42cfd0b 100644 --- a/src/xrpld/core/Job.h +++ b/include/xrpl/core/Job.h @@ -1,10 +1,9 @@ #ifndef XRPL_CORE_JOB_H_INCLUDED #define XRPL_CORE_JOB_H_INCLUDED -#include -#include - #include +#include +#include #include diff --git a/src/xrpld/core/JobQueue.h b/include/xrpl/core/JobQueue.h similarity index 98% rename from src/xrpld/core/JobQueue.h rename to include/xrpl/core/JobQueue.h index c5d36cd993..f8b727471b 100644 --- a/src/xrpld/core/JobQueue.h +++ b/include/xrpl/core/JobQueue.h @@ -1,12 +1,11 @@ #ifndef XRPL_CORE_JOBQUEUE_H_INCLUDED #define XRPL_CORE_JOBQUEUE_H_INCLUDED -#include -#include -#include -#include - #include +#include +#include +#include +#include #include #include @@ -385,7 +384,7 @@ private: } // namespace ripple -#include +#include namespace ripple { diff --git a/src/xrpld/core/JobTypeData.h b/include/xrpl/core/JobTypeData.h similarity index 97% rename from src/xrpld/core/JobTypeData.h rename to include/xrpl/core/JobTypeData.h index 337adcb0da..eb678d1a9a 100644 --- a/src/xrpld/core/JobTypeData.h +++ b/include/xrpl/core/JobTypeData.h @@ -1,10 +1,9 @@ #ifndef XRPL_CORE_JOBTYPEDATA_H_INCLUDED #define XRPL_CORE_JOBTYPEDATA_H_INCLUDED -#include - #include #include +#include namespace ripple { diff --git a/src/xrpld/core/JobTypeInfo.h b/include/xrpl/core/JobTypeInfo.h similarity index 98% rename from src/xrpld/core/JobTypeInfo.h rename to include/xrpl/core/JobTypeInfo.h index a58d5316a8..09c644fc23 100644 --- a/src/xrpld/core/JobTypeInfo.h +++ b/include/xrpl/core/JobTypeInfo.h @@ -1,7 +1,7 @@ #ifndef XRPL_CORE_JOBTYPEINFO_H_INCLUDED #define XRPL_CORE_JOBTYPEINFO_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/xrpld/core/JobTypes.h b/include/xrpl/core/JobTypes.h similarity index 99% rename from src/xrpld/core/JobTypes.h rename to include/xrpl/core/JobTypes.h index bb5a8baf9c..d8e7b23bdf 100644 --- a/src/xrpld/core/JobTypes.h +++ b/include/xrpl/core/JobTypes.h @@ -1,8 +1,8 @@ #ifndef XRPL_CORE_JOBTYPES_H_INCLUDED #define XRPL_CORE_JOBTYPES_H_INCLUDED -#include -#include +#include +#include #include #include diff --git a/src/xrpld/core/LoadEvent.h b/include/xrpl/core/LoadEvent.h similarity index 100% rename from src/xrpld/core/LoadEvent.h rename to include/xrpl/core/LoadEvent.h diff --git a/src/xrpld/core/LoadMonitor.h b/include/xrpl/core/LoadMonitor.h similarity index 97% rename from src/xrpld/core/LoadMonitor.h rename to include/xrpl/core/LoadMonitor.h index a9ed66e0fe..539a4a0b99 100644 --- a/src/xrpld/core/LoadMonitor.h +++ b/include/xrpl/core/LoadMonitor.h @@ -1,10 +1,9 @@ #ifndef XRPL_CORE_LOADMONITOR_H_INCLUDED #define XRPL_CORE_LOADMONITOR_H_INCLUDED -#include - #include #include +#include #include #include diff --git a/src/xrpld/perflog/PerfLog.h b/include/xrpl/core/PerfLog.h similarity index 96% rename from src/xrpld/perflog/PerfLog.h rename to include/xrpl/core/PerfLog.h index f6c3d3b9ac..c74608d82a 100644 --- a/src/xrpld/perflog/PerfLog.h +++ b/include/xrpl/core/PerfLog.h @@ -1,9 +1,8 @@ -#ifndef XRPL_BASICS_PERFLOG_H -#define XRPL_BASICS_PERFLOG_H - -#include -#include +#ifndef XRPL_CORE_PERFLOG_H +#define XRPL_CORE_PERFLOG_H +#include +#include #include #include @@ -190,4 +189,4 @@ measureDurationAndLog( } // namespace perf } // namespace ripple -#endif // XRPL_BASICS_PERFLOG_H +#endif // XRPL_CORE_PERFLOG_H diff --git a/src/xrpld/core/detail/Workers.h b/include/xrpl/core/detail/Workers.h similarity index 99% rename from src/xrpld/core/detail/Workers.h rename to include/xrpl/core/detail/Workers.h index f6fe9226fc..5877638722 100644 --- a/src/xrpld/core/detail/Workers.h +++ b/include/xrpl/core/detail/Workers.h @@ -1,9 +1,8 @@ #ifndef XRPL_CORE_WORKERS_H_INCLUDED #define XRPL_CORE_WORKERS_H_INCLUDED -#include - #include +#include #include #include diff --git a/src/xrpld/core/detail/semaphore.h b/include/xrpl/core/detail/semaphore.h similarity index 100% rename from src/xrpld/core/detail/semaphore.h rename to include/xrpl/core/detail/semaphore.h diff --git a/src/xrpld/core/detail/Job.cpp b/src/libxrpl/core/detail/Job.cpp similarity index 98% rename from src/xrpld/core/detail/Job.cpp rename to src/libxrpl/core/detail/Job.cpp index e1e85d34eb..9caf8d180d 100644 --- a/src/xrpld/core/detail/Job.cpp +++ b/src/libxrpl/core/detail/Job.cpp @@ -1,6 +1,5 @@ -#include - #include +#include namespace ripple { diff --git a/src/xrpld/core/detail/JobQueue.cpp b/src/libxrpl/core/detail/JobQueue.cpp similarity index 99% rename from src/xrpld/core/detail/JobQueue.cpp rename to src/libxrpl/core/detail/JobQueue.cpp index ff5c2211ef..817744cbc1 100644 --- a/src/xrpld/core/detail/JobQueue.cpp +++ b/src/libxrpl/core/detail/JobQueue.cpp @@ -1,7 +1,6 @@ -#include -#include - #include +#include +#include #include diff --git a/src/xrpld/core/detail/LoadEvent.cpp b/src/libxrpl/core/detail/LoadEvent.cpp similarity index 94% rename from src/xrpld/core/detail/LoadEvent.cpp rename to src/libxrpl/core/detail/LoadEvent.cpp index 878bb92d11..3237daabcf 100644 --- a/src/xrpld/core/detail/LoadEvent.cpp +++ b/src/libxrpl/core/detail/LoadEvent.cpp @@ -1,7 +1,6 @@ -#include -#include - #include +#include +#include namespace ripple { diff --git a/src/xrpld/core/detail/LoadMonitor.cpp b/src/libxrpl/core/detail/LoadMonitor.cpp similarity index 99% rename from src/xrpld/core/detail/LoadMonitor.cpp rename to src/libxrpl/core/detail/LoadMonitor.cpp index 5a03ab607b..7a1cce05f3 100644 --- a/src/xrpld/core/detail/LoadMonitor.cpp +++ b/src/libxrpl/core/detail/LoadMonitor.cpp @@ -1,7 +1,6 @@ -#include - #include #include +#include namespace ripple { diff --git a/src/xrpld/core/detail/Workers.cpp b/src/libxrpl/core/detail/Workers.cpp similarity index 98% rename from src/xrpld/core/detail/Workers.cpp rename to src/libxrpl/core/detail/Workers.cpp index 29328533ae..b354353844 100644 --- a/src/xrpld/core/detail/Workers.cpp +++ b/src/libxrpl/core/detail/Workers.cpp @@ -1,8 +1,7 @@ -#include -#include - #include #include +#include +#include namespace ripple { diff --git a/src/test/app/Path_test.cpp b/src/test/app/Path_test.cpp index f84a87ac8c..e481bd673b 100644 --- a/src/test/app/Path_test.cpp +++ b/src/test/app/Path_test.cpp @@ -4,11 +4,11 @@ #include #include -#include #include #include #include +#include #include #include #include diff --git a/src/test/app/Transaction_ordering_test.cpp b/src/test/app/Transaction_ordering_test.cpp index 80e7d43de6..2f67d8b414 100644 --- a/src/test/app/Transaction_ordering_test.cpp +++ b/src/test/app/Transaction_ordering_test.cpp @@ -1,6 +1,6 @@ #include -#include +#include namespace ripple { namespace test { diff --git a/src/test/basics/PerfLog_test.cpp b/src/test/basics/PerfLog_test.cpp index 5862889354..dcb91d0fd3 100644 --- a/src/test/basics/PerfLog_test.cpp +++ b/src/test/basics/PerfLog_test.cpp @@ -1,12 +1,12 @@ #include #include -#include #include #include #include #include +#include #include #include diff --git a/src/test/core/ClosureCounter_test.cpp b/src/test/core/ClosureCounter_test.cpp index dbe846c02d..23359596fd 100644 --- a/src/test/core/ClosureCounter_test.cpp +++ b/src/test/core/ClosureCounter_test.cpp @@ -1,8 +1,7 @@ #include -#include - #include +#include #include #include diff --git a/src/test/core/Coroutine_test.cpp b/src/test/core/Coroutine_test.cpp index 2b9bd0a248..47bd74a4a6 100644 --- a/src/test/core/Coroutine_test.cpp +++ b/src/test/core/Coroutine_test.cpp @@ -1,6 +1,6 @@ #include -#include +#include #include #include diff --git a/src/test/core/JobQueue_test.cpp b/src/test/core/JobQueue_test.cpp index 0b6bbb13ae..2451827bda 100644 --- a/src/test/core/JobQueue_test.cpp +++ b/src/test/core/JobQueue_test.cpp @@ -1,8 +1,7 @@ #include -#include - #include +#include namespace ripple { namespace test { diff --git a/src/test/core/Workers_test.cpp b/src/test/core/Workers_test.cpp index d8152d3ea8..2ba8c2a0e0 100644 --- a/src/test/core/Workers_test.cpp +++ b/src/test/core/Workers_test.cpp @@ -1,7 +1,6 @@ -#include -#include - #include +#include +#include #include #include diff --git a/src/test/rpc/RobustTransaction_test.cpp b/src/test/rpc/RobustTransaction_test.cpp index 29305092c4..d52e08f7ac 100644 --- a/src/test/rpc/RobustTransaction_test.cpp +++ b/src/test/rpc/RobustTransaction_test.cpp @@ -1,9 +1,8 @@ #include #include -#include - #include +#include #include namespace ripple { diff --git a/src/xrpld/app/consensus/RCLConsensus.h b/src/xrpld/app/consensus/RCLConsensus.h index b9580be08a..a6a15395a3 100644 --- a/src/xrpld/app/consensus/RCLConsensus.h +++ b/src/xrpld/app/consensus/RCLConsensus.h @@ -8,9 +8,9 @@ #include #include #include -#include #include +#include #include #include diff --git a/src/xrpld/app/consensus/RCLValidations.cpp b/src/xrpld/app/consensus/RCLValidations.cpp index d24f24a5f1..827c417ba8 100644 --- a/src/xrpld/app/consensus/RCLValidations.cpp +++ b/src/xrpld/app/consensus/RCLValidations.cpp @@ -4,12 +4,12 @@ #include #include #include -#include #include -#include #include #include +#include +#include #include diff --git a/src/xrpld/app/ledger/ConsensusTransSetSF.cpp b/src/xrpld/app/ledger/ConsensusTransSetSF.cpp index fbac9c8553..d248a36987 100644 --- a/src/xrpld/app/ledger/ConsensusTransSetSF.cpp +++ b/src/xrpld/app/ledger/ConsensusTransSetSF.cpp @@ -2,9 +2,9 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/src/xrpld/app/ledger/Ledger.cpp b/src/xrpld/app/ledger/Ledger.cpp index 055d9ddc9d..bf5f442eee 100644 --- a/src/xrpld/app/ledger/Ledger.cpp +++ b/src/xrpld/app/ledger/Ledger.cpp @@ -7,12 +7,12 @@ #include #include #include -#include #include #include #include #include +#include #include #include #include diff --git a/src/xrpld/app/ledger/OrderBookDB.cpp b/src/xrpld/app/ledger/OrderBookDB.cpp index 1a407d0d3d..00907ee2ce 100644 --- a/src/xrpld/app/ledger/OrderBookDB.cpp +++ b/src/xrpld/app/ledger/OrderBookDB.cpp @@ -4,9 +4,9 @@ #include #include #include -#include #include +#include #include namespace ripple { diff --git a/src/xrpld/app/ledger/detail/InboundLedger.cpp b/src/xrpld/app/ledger/detail/InboundLedger.cpp index 24de3cce14..cd42b4fe82 100644 --- a/src/xrpld/app/ledger/detail/InboundLedger.cpp +++ b/src/xrpld/app/ledger/detail/InboundLedger.cpp @@ -4,10 +4,10 @@ #include #include #include -#include #include #include +#include #include #include #include diff --git a/src/xrpld/app/ledger/detail/InboundLedgers.cpp b/src/xrpld/app/ledger/detail/InboundLedgers.cpp index 7e1ba88094..fafcdb9161 100644 --- a/src/xrpld/app/ledger/detail/InboundLedgers.cpp +++ b/src/xrpld/app/ledger/detail/InboundLedgers.cpp @@ -2,13 +2,13 @@ #include #include #include -#include -#include #include #include #include #include +#include +#include #include #include diff --git a/src/xrpld/app/ledger/detail/InboundTransactions.cpp b/src/xrpld/app/ledger/detail/InboundTransactions.cpp index 93e0fbdec0..b84a03e7bb 100644 --- a/src/xrpld/app/ledger/detail/InboundTransactions.cpp +++ b/src/xrpld/app/ledger/detail/InboundTransactions.cpp @@ -3,9 +3,9 @@ #include #include #include -#include #include +#include #include #include diff --git a/src/xrpld/app/ledger/detail/LedgerDeltaAcquire.cpp b/src/xrpld/app/ledger/detail/LedgerDeltaAcquire.cpp index c803c0bdd4..9c190ee376 100644 --- a/src/xrpld/app/ledger/detail/LedgerDeltaAcquire.cpp +++ b/src/xrpld/app/ledger/detail/LedgerDeltaAcquire.cpp @@ -4,9 +4,10 @@ #include #include #include -#include #include +#include + namespace ripple { LedgerDeltaAcquire::LedgerDeltaAcquire( diff --git a/src/xrpld/app/ledger/detail/TimeoutCounter.cpp b/src/xrpld/app/ledger/detail/TimeoutCounter.cpp index 6db280ce8e..d4e7e9a73c 100644 --- a/src/xrpld/app/ledger/detail/TimeoutCounter.cpp +++ b/src/xrpld/app/ledger/detail/TimeoutCounter.cpp @@ -1,5 +1,6 @@ #include -#include + +#include namespace ripple { diff --git a/src/xrpld/app/ledger/detail/TimeoutCounter.h b/src/xrpld/app/ledger/detail/TimeoutCounter.h index e97882ef1e..1ce4c48415 100644 --- a/src/xrpld/app/ledger/detail/TimeoutCounter.h +++ b/src/xrpld/app/ledger/detail/TimeoutCounter.h @@ -2,9 +2,9 @@ #define XRPL_APP_LEDGER_TIMEOUTCOUNTER_H_INCLUDED #include -#include #include +#include #include diff --git a/src/xrpld/app/main/Application.cpp b/src/xrpld/app/main/Application.cpp index 79b48e42b1..e28cd559e9 100644 --- a/src/xrpld/app/main/Application.cpp +++ b/src/xrpld/app/main/Application.cpp @@ -33,7 +33,6 @@ #include #include #include -#include #include #include @@ -41,6 +40,7 @@ #include #include #include +#include #include #include #include diff --git a/src/xrpld/app/main/GRPCServer.h b/src/xrpld/app/main/GRPCServer.h index 1ea8706e40..eba666cc35 100644 --- a/src/xrpld/app/main/GRPCServer.h +++ b/src/xrpld/app/main/GRPCServer.h @@ -2,13 +2,13 @@ #define XRPL_CORE_GRPCSERVER_H_INCLUDED #include -#include #include #include #include #include #include +#include #include #include diff --git a/src/xrpld/app/main/NodeStoreScheduler.h b/src/xrpld/app/main/NodeStoreScheduler.h index c1234a84c4..6a5cb8e8ee 100644 --- a/src/xrpld/app/main/NodeStoreScheduler.h +++ b/src/xrpld/app/main/NodeStoreScheduler.h @@ -1,8 +1,7 @@ #ifndef XRPL_APP_MAIN_NODESTORESCHEDULER_H_INCLUDED #define XRPL_APP_MAIN_NODESTORESCHEDULER_H_INCLUDED -#include - +#include #include namespace ripple { diff --git a/src/xrpld/app/misc/NetworkOPs.cpp b/src/xrpld/app/misc/NetworkOPs.cpp index 1b0b4e5143..39ec0b78c9 100644 --- a/src/xrpld/app/misc/NetworkOPs.cpp +++ b/src/xrpld/app/misc/NetworkOPs.cpp @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include @@ -39,6 +38,7 @@ #include #include #include +#include #include #include #include diff --git a/src/xrpld/app/misc/NetworkOPs.h b/src/xrpld/app/misc/NetworkOPs.h index 544e6bfe93..15545153c7 100644 --- a/src/xrpld/app/misc/NetworkOPs.h +++ b/src/xrpld/app/misc/NetworkOPs.h @@ -3,9 +3,9 @@ #include #include -#include #include +#include #include #include #include diff --git a/src/xrpld/app/paths/PathRequests.cpp b/src/xrpld/app/paths/PathRequests.cpp index d489dafcea..2d5b52d1f9 100644 --- a/src/xrpld/app/paths/PathRequests.cpp +++ b/src/xrpld/app/paths/PathRequests.cpp @@ -1,9 +1,9 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/src/xrpld/app/paths/Pathfinder.cpp b/src/xrpld/app/paths/Pathfinder.cpp index 2debdc76b2..d3ed3fc38c 100644 --- a/src/xrpld/app/paths/Pathfinder.cpp +++ b/src/xrpld/app/paths/Pathfinder.cpp @@ -4,10 +4,10 @@ #include #include #include -#include #include #include +#include #include #include diff --git a/src/xrpld/app/paths/Pathfinder.h b/src/xrpld/app/paths/Pathfinder.h index d019a8307e..91c0a033f1 100644 --- a/src/xrpld/app/paths/Pathfinder.h +++ b/src/xrpld/app/paths/Pathfinder.h @@ -3,9 +3,9 @@ #include #include -#include #include +#include #include #include diff --git a/src/xrpld/core/DatabaseCon.h b/src/xrpld/core/DatabaseCon.h index 84d2c375e0..b2f400780b 100644 --- a/src/xrpld/core/DatabaseCon.h +++ b/src/xrpld/core/DatabaseCon.h @@ -4,7 +4,8 @@ #include #include #include -#include + +#include #include diff --git a/src/xrpld/core/SociDB.h b/src/xrpld/core/SociDB.h index bf209d79f7..7e2c7323d8 100644 --- a/src/xrpld/core/SociDB.h +++ b/src/xrpld/core/SociDB.h @@ -14,9 +14,8 @@ #pragma clang diagnostic ignored "-Wdeprecated" #endif -#include - #include +#include #define SOCI_USE_BOOST #include diff --git a/src/xrpld/overlay/detail/OverlayImpl.h b/src/xrpld/overlay/detail/OverlayImpl.h index 765d2f38eb..18f2aa0c3f 100644 --- a/src/xrpld/overlay/detail/OverlayImpl.h +++ b/src/xrpld/overlay/detail/OverlayImpl.h @@ -2,7 +2,6 @@ #define XRPL_OVERLAY_OVERLAYIMPL_H_INCLUDED #include -#include #include #include #include @@ -16,6 +15,7 @@ #include #include #include +#include #include #include diff --git a/src/xrpld/overlay/detail/PeerImp.cpp b/src/xrpld/overlay/detail/PeerImp.cpp index 097eaae4d9..7adfef4064 100644 --- a/src/xrpld/overlay/detail/PeerImp.cpp +++ b/src/xrpld/overlay/detail/PeerImp.cpp @@ -12,12 +12,12 @@ #include #include #include -#include #include #include #include #include +#include #include #include diff --git a/src/xrpld/overlay/detail/PeerSet.cpp b/src/xrpld/overlay/detail/PeerSet.cpp index ecf1164b2c..9f5b810ffc 100644 --- a/src/xrpld/overlay/detail/PeerSet.cpp +++ b/src/xrpld/overlay/detail/PeerSet.cpp @@ -1,8 +1,9 @@ #include -#include #include #include +#include + namespace ripple { class PeerSetImpl : public PeerSet diff --git a/src/xrpld/perflog/detail/PerfLogImp.cpp b/src/xrpld/perflog/detail/PerfLogImp.cpp index 170da708eb..8d6d68137a 100644 --- a/src/xrpld/perflog/detail/PerfLogImp.cpp +++ b/src/xrpld/perflog/detail/PerfLogImp.cpp @@ -1,9 +1,9 @@ -#include #include #include #include #include +#include #include #include diff --git a/src/xrpld/perflog/detail/PerfLogImp.h b/src/xrpld/perflog/detail/PerfLogImp.h index ec4c87c29d..d8e5e7943d 100644 --- a/src/xrpld/perflog/detail/PerfLogImp.h +++ b/src/xrpld/perflog/detail/PerfLogImp.h @@ -1,10 +1,10 @@ #ifndef XRPL_BASICS_PERFLOGIMP_H #define XRPL_BASICS_PERFLOGIMP_H -#include #include #include +#include #include diff --git a/src/xrpld/rpc/Context.h b/src/xrpld/rpc/Context.h index 0e15da3a39..1faafa1627 100644 --- a/src/xrpld/rpc/Context.h +++ b/src/xrpld/rpc/Context.h @@ -1,11 +1,11 @@ #ifndef XRPL_RPC_CONTEXT_H_INCLUDED #define XRPL_RPC_CONTEXT_H_INCLUDED -#include #include #include #include +#include namespace ripple { diff --git a/src/xrpld/rpc/RPCSub.h b/src/xrpld/rpc/RPCSub.h index db96ae79ee..ea0cc993e8 100644 --- a/src/xrpld/rpc/RPCSub.h +++ b/src/xrpld/rpc/RPCSub.h @@ -1,9 +1,10 @@ #ifndef XRPL_NET_RPCSUB_H_INCLUDED #define XRPL_NET_RPCSUB_H_INCLUDED -#include #include +#include + #include namespace ripple { diff --git a/src/xrpld/rpc/ServerHandler.h b/src/xrpld/rpc/ServerHandler.h index c499411366..4cf5a0ce88 100644 --- a/src/xrpld/rpc/ServerHandler.h +++ b/src/xrpld/rpc/ServerHandler.h @@ -3,9 +3,9 @@ #include #include -#include #include +#include #include #include #include diff --git a/src/xrpld/rpc/detail/LegacyPathFind.cpp b/src/xrpld/rpc/detail/LegacyPathFind.cpp index 7bf4758e37..c3bcd928cd 100644 --- a/src/xrpld/rpc/detail/LegacyPathFind.cpp +++ b/src/xrpld/rpc/detail/LegacyPathFind.cpp @@ -1,10 +1,11 @@ #include #include -#include -#include #include #include +#include +#include + namespace ripple { namespace RPC { diff --git a/src/xrpld/rpc/detail/RPCHandler.cpp b/src/xrpld/rpc/detail/RPCHandler.cpp index c712430f92..fca926a1c7 100644 --- a/src/xrpld/rpc/detail/RPCHandler.cpp +++ b/src/xrpld/rpc/detail/RPCHandler.cpp @@ -4,8 +4,6 @@ #include #include #include -#include -#include #include #include #include @@ -14,6 +12,8 @@ #include #include +#include +#include #include #include #include diff --git a/src/xrpld/rpc/detail/ServerHandler.cpp b/src/xrpld/rpc/detail/ServerHandler.cpp index 8a42153105..de44f93749 100644 --- a/src/xrpld/rpc/detail/ServerHandler.cpp +++ b/src/xrpld/rpc/detail/ServerHandler.cpp @@ -1,7 +1,6 @@ #include #include #include -#include #include #include #include @@ -16,6 +15,7 @@ #include #include #include +#include #include #include #include diff --git a/src/xrpld/rpc/handlers/LogRotate.cpp b/src/xrpld/rpc/handlers/LogRotate.cpp index 379d694c0f..595d84b191 100644 --- a/src/xrpld/rpc/handlers/LogRotate.cpp +++ b/src/xrpld/rpc/handlers/LogRotate.cpp @@ -1,8 +1,8 @@ #include -#include #include #include +#include namespace ripple {