From 52f298f150fc1530d201d3140c80d3eaf781cb5f Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Fri, 22 May 2015 08:34:26 -0700 Subject: [PATCH] Tidy up app unity sources --- Builds/VisualStudio2013/RippleD.vcxproj | 368 +++++------------- .../VisualStudio2013/RippleD.vcxproj.filters | 161 ++++---- SConstruct | 18 +- src/ripple/app/TODO.md | 29 -- .../app/{consensus => ledger}/DisputedTx.cpp | 2 +- .../app/{consensus => ledger}/DisputedTx.h | 0 src/ripple/app/ledger/Ledger.cpp | 4 +- .../{consensus => ledger}/LedgerConsensus.cpp | 4 +- .../{consensus => ledger}/LedgerConsensus.h | 0 .../app/ledger/tests/DeferredCredits.test.cpp | 2 +- src/ripple/app/ledger/tests/Ledger_test.cpp | 2 +- .../app/{ => ledger}/tests/common_ledger.cpp | 2 +- .../app/{ => ledger}/tests/common_ledger.h | 2 +- src/ripple/app/main/Application.cpp | 8 +- src/ripple/app/{impl => main}/BasicApp.cpp | 2 +- src/ripple/app/{impl => main}/BasicApp.h | 0 src/ripple/app/{data => main}/DBInit.cpp | 2 +- src/ripple/app/{data => main}/DBInit.h | 0 src/ripple/app/main/LocalCredentials.cpp | 4 +- src/ripple/app/misc/AmendmentTableImpl.cpp | 2 +- src/ripple/app/misc/NetworkOPs.cpp | 8 +- src/ripple/app/misc/SHAMapStoreImp.h | 4 +- .../app/{peers => misc}/UniqueNodeList.cpp | 6 +- .../app/{peers => misc}/UniqueNodeList.h | 2 +- src/ripple/app/misc/Validations.cpp | 4 +- src/ripple/app/misc/impl/AccountTxPaging.h | 2 +- .../app/misc/tests/AccountTxPaging.test.cpp | 2 +- .../app/{ => paths}/tests/Path_test.cpp | 2 +- src/ripple/app/peers/README.md | 89 ----- src/ripple/app/peers/TODO.md | 66 ---- src/ripple/app/tx/impl/Transaction.cpp | 2 +- src/ripple/app/tx/tests/common_transactor.cpp | 4 +- src/ripple/{app/data => core}/DatabaseCon.h | 2 +- src/ripple/{app/data => core}/SociDB.h | 0 .../{app/data => core/impl}/DatabaseCon.cpp | 4 +- .../impl}/DummySociDynamicBackend.cpp | 2 +- src/ripple/{app/data => core/impl}/SociDB.cpp | 2 +- .../{app/data => core}/tests/SociDB.test.cpp | 4 +- .../peers => overlay}/ClusterNodeStatus.h | 0 src/ripple/overlay/README.md | 90 +++++ src/ripple/overlay/impl/ConnectAttempt.h | 2 +- src/ripple/overlay/impl/PeerImp.cpp | 4 +- src/ripple/peerfinder/impl/Manager.cpp | 2 +- src/ripple/peerfinder/impl/StoreSqdb.h | 2 +- src/ripple/rpc/handlers/GetCounts.cpp | 2 +- src/ripple/rpc/handlers/Peers.cpp | 2 +- src/ripple/rpc/handlers/UnlAdd.cpp | 2 +- src/ripple/unity/app.cpp | 6 - src/ripple/unity/app1.cpp | 4 - src/ripple/unity/app2.cpp | 12 - src/ripple/unity/app3.cpp | 9 +- src/ripple/unity/app4.cpp | 32 -- src/ripple/unity/app5.cpp | 2 - src/ripple/unity/app6.cpp | 14 - src/ripple/unity/app7.cpp | 5 - src/ripple/unity/app_ledger.cpp | 48 +++ src/ripple/unity/app_main.cpp | 29 ++ src/ripple/unity/app_misc.cpp | 35 ++ src/ripple/unity/{app8.cpp => app_paths.cpp} | 10 +- src/ripple/unity/app_tx.cpp | 49 +++ src/ripple/unity/core.cpp | 1 + src/ripple/unity/soci_ripple.cpp | 6 +- src/ripple/validators/impl/StoreSqdb.h | 2 +- 63 files changed, 481 insertions(+), 706 deletions(-) delete mode 100644 src/ripple/app/TODO.md rename src/ripple/app/{consensus => ledger}/DisputedTx.cpp (99%) rename src/ripple/app/{consensus => ledger}/DisputedTx.h (100%) rename src/ripple/app/{consensus => ledger}/LedgerConsensus.cpp (99%) rename src/ripple/app/{consensus => ledger}/LedgerConsensus.h (100%) rename src/ripple/app/{ => ledger}/tests/common_ledger.cpp (99%) rename src/ripple/app/{ => ledger}/tests/common_ledger.h (99%) rename src/ripple/app/{impl => main}/BasicApp.cpp (97%) rename src/ripple/app/{impl => main}/BasicApp.h (100%) rename src/ripple/app/{data => main}/DBInit.cpp (99%) rename src/ripple/app/{data => main}/DBInit.h (100%) rename src/ripple/app/{peers => misc}/UniqueNodeList.cpp (99%) rename src/ripple/app/{peers => misc}/UniqueNodeList.h (98%) rename src/ripple/app/{ => paths}/tests/Path_test.cpp (99%) delete mode 100644 src/ripple/app/peers/README.md delete mode 100644 src/ripple/app/peers/TODO.md rename src/ripple/{app/data => core}/DatabaseCon.h (98%) rename src/ripple/{app/data => core}/SociDB.h (100%) rename src/ripple/{app/data => core/impl}/DatabaseCon.cpp (96%) rename src/ripple/{app/data => core/impl}/DummySociDynamicBackend.cpp (98%) rename src/ripple/{app/data => core/impl}/SociDB.cpp (99%) rename src/ripple/{app/data => core}/tests/SociDB.test.cpp (99%) rename src/ripple/{app/peers => overlay}/ClusterNodeStatus.h (100%) create mode 100644 src/ripple/unity/app_ledger.cpp create mode 100644 src/ripple/unity/app_main.cpp create mode 100644 src/ripple/unity/app_misc.cpp rename src/ripple/unity/{app8.cpp => app_paths.cpp} (87%) create mode 100644 src/ripple/unity/app_tx.cpp diff --git a/Builds/VisualStudio2013/RippleD.vcxproj b/Builds/VisualStudio2013/RippleD.vcxproj index b76313505..9bc98acfa 100644 --- a/Builds/VisualStudio2013/RippleD.vcxproj +++ b/Builds/VisualStudio2013/RippleD.vcxproj @@ -1352,165 +1352,91 @@ - - True - True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - - - - - True - True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - - - - - True - True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - - - - - True - True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - - - - - True - True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - - - True - True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - - - - - True - True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - - - True - True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - - - True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) + + True + True + + + True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) + + True + True + + + True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) @@ -1519,8 +1445,6 @@ True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) @@ -1529,24 +1453,18 @@ True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) @@ -1555,84 +1473,80 @@ True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) + + True + True + + + True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) + + True + True + + + True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) + + True + True + + + True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) @@ -1641,8 +1555,6 @@ True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) @@ -1651,14 +1563,10 @@ True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) @@ -1667,30 +1575,22 @@ True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) @@ -1701,124 +1601,94 @@ True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) + + True + True + + + True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) @@ -1827,228 +1697,150 @@ True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) + + True + True + - - - - True - True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - - - - - True - True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - - - - - True - True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) @@ -2059,28 +1851,20 @@ True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) @@ -2238,31 +2022,63 @@ + + True True + ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) + ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) + + + True + True + ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) + ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) + + + True + True + ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) + ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True + ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) + ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True + ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) + ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True + ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) + ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True + ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) + ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True + ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) + ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) + + + True + True + ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) + ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) @@ -2280,13 +2096,25 @@ + + True True + ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) + ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) True True + ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) + ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) + + + True + True + ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) + ..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) @@ -2644,6 +2472,8 @@ + + True True @@ -3517,39 +3347,23 @@ - + True True - + True True - + True True - + True True - - True - True - - - True - True - - - True - True - - - True - True - - + True True diff --git a/Builds/VisualStudio2013/RippleD.vcxproj.filters b/Builds/VisualStudio2013/RippleD.vcxproj.filters index 9e3782d18..d78733c09 100644 --- a/Builds/VisualStudio2013/RippleD.vcxproj.filters +++ b/Builds/VisualStudio2013/RippleD.vcxproj.filters @@ -247,18 +247,6 @@ {83B96C00-A786-6597-826D-E12FA6187AA8} - - {0E8BC18A-9853-B13E-1A9D-C55FA29DA60F} - - - {44B63F90-BC60-A7C7-24A1-632A358E285B} - - - {29C76FB9-636F-FBFC-3CFA-2979281BC279} - - - {17F94278-7CDE-3EBE-7CD3-372F08902314} - {CE126498-A44D-30A2-345B-0F672BCDF947} @@ -286,11 +274,8 @@ {9AD8D049-10A8-704C-D51A-FAD55B1F235F} - - {07831F2A-6752-E81C-87AF-4D47D425BE8E} - - - {2E791662-6ED0-D1E1-03A4-0CB35473EC56} + + {1025719B-6A8F-D9FB-A6BA-02B93756DE09} {50FDCDC1-EC9C-9F3B-34C9-EF4137E132B4} @@ -2088,48 +2073,6 @@ protobuf\vsprojects - - ripple\app\consensus - - - ripple\app\consensus - - - ripple\app\consensus - - - ripple\app\consensus - - - ripple\app\data - - - ripple\app\data - - - ripple\app\data - - - ripple\app\data - - - ripple\app\data - - - ripple\app\data - - - ripple\app\data - - - ripple\app\data\tests - - - ripple\app\impl - - - ripple\app\impl - ripple\app\ledger @@ -2172,6 +2115,12 @@ ripple\app\ledger + + ripple\app\ledger + + + ripple\app\ledger + ripple\app\ledger\impl @@ -2199,6 +2148,12 @@ ripple\app\ledger + + ripple\app\ledger + + + ripple\app\ledger + ripple\app\ledger @@ -2253,6 +2208,12 @@ ripple\app\ledger + + ripple\app\ledger\tests + + + ripple\app\ledger\tests + ripple\app\ledger\tests @@ -2271,12 +2232,24 @@ ripple\app\main + + ripple\app\main + + + ripple\app\main + ripple\app\main ripple\app\main + + ripple\app\main + + + ripple\app\main + ripple\app\main @@ -2361,6 +2334,12 @@ ripple\app\misc\tests + + ripple\app\misc + + + ripple\app\misc + ripple\app\misc @@ -2472,30 +2451,15 @@ ripple\app\paths + + ripple\app\paths\tests + ripple\app\paths ripple\app\paths - - ripple\app\peers - - - ripple\app\peers - - - ripple\app\peers - - - ripple\app\tests - - - ripple\app\tests - - - ripple\app\tests - ripple\app\tx\impl @@ -2775,9 +2739,18 @@ ripple\core + + ripple\core + ripple\core\impl + + ripple\core\impl + + + ripple\core\impl + ripple\core\impl @@ -2796,6 +2769,9 @@ ripple\core\impl + + ripple\core\impl + ripple\core @@ -2820,12 +2796,18 @@ ripple\core + + ripple\core + ripple\core\tests ripple\core\tests + + ripple\core\tests + ripple\crypto @@ -3147,6 +3129,9 @@ ripple\nodestore + + ripple\overlay + ripple\overlay\impl @@ -4086,31 +4071,19 @@ ripple\shamap - + ripple\unity - + ripple\unity - + ripple\unity - + ripple\unity - - ripple\unity - - - ripple\unity - - - ripple\unity - - - ripple\unity - - + ripple\unity diff --git a/SConstruct b/SConstruct index adf5d5ce0..615d46075 100644 --- a/SConstruct +++ b/SConstruct @@ -637,13 +637,13 @@ def get_classic_sources(): result = [] append_sources( result, - *list_sources('src/ripple/app', '.cpp'), + *list_sources('src/ripple/core', '.cpp'), CPPPATH=[ 'src/soci/src/core', 'src/sqlite'] ) + append_sources(result, *list_sources('src/ripple/app', '.cpp')) append_sources(result, *list_sources('src/ripple/basics', '.cpp')) - append_sources(result, *list_sources('src/ripple/core', '.cpp')) append_sources(result, *list_sources('src/ripple/crypto', '.cpp')) append_sources(result, *list_sources('src/ripple/json', '.cpp')) append_sources(result, *list_sources('src/ripple/legacy', '.cpp')) @@ -669,15 +669,11 @@ def get_unity_sources(): result = [] append_sources( result, - 'src/ripple/unity/app.cpp', - 'src/ripple/unity/app1.cpp', - 'src/ripple/unity/app2.cpp', - 'src/ripple/unity/app3.cpp', - 'src/ripple/unity/app4.cpp', - 'src/ripple/unity/app5.cpp', - 'src/ripple/unity/app6.cpp', - 'src/ripple/unity/app7.cpp', - 'src/ripple/unity/app8.cpp', + 'src/ripple/unity/app_ledger.cpp', + 'src/ripple/unity/app_main.cpp', + 'src/ripple/unity/app_misc.cpp', + 'src/ripple/unity/app_paths.cpp', + 'src/ripple/unity/app_tx.cpp', 'src/ripple/unity/core.cpp', 'src/ripple/unity/basics.cpp', 'src/ripple/unity/crypto.cpp', diff --git a/src/ripple/app/TODO.md b/src/ripple/app/TODO.md deleted file mode 100644 index 4c5d46516..000000000 --- a/src/ripple/app/TODO.md +++ /dev/null @@ -1,29 +0,0 @@ -# ripple_app - -## LedgerMaster.cpp - -- Change getLedgerByHash() to not use "all bits zero" to mean - "return the current ledger" - -- replace uint32 with LedgerIndex and choose appropriate names - -## IHashRouter.h - -- Rename to HashRouter.h - -## HashRouter.cpp - -- Rename HashRouter to HashRouterImp - -- Inline functions - -- Comment appropriately - -- Determine the semantics of the uint256, replace it with an appropriate - typedef like RipplePublicKey or whatever is appropriate. - -- Provide good symbolic names for the config tunables. - -## Beast - -- Change Stoppable to not require a constructor with parameters diff --git a/src/ripple/app/consensus/DisputedTx.cpp b/src/ripple/app/ledger/DisputedTx.cpp similarity index 99% rename from src/ripple/app/consensus/DisputedTx.cpp rename to src/ripple/app/ledger/DisputedTx.cpp index f1f64c302..62ddf2599 100644 --- a/src/ripple/app/consensus/DisputedTx.cpp +++ b/src/ripple/app/ledger/DisputedTx.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include #include #include diff --git a/src/ripple/app/consensus/DisputedTx.h b/src/ripple/app/ledger/DisputedTx.h similarity index 100% rename from src/ripple/app/consensus/DisputedTx.h rename to src/ripple/app/ledger/DisputedTx.h diff --git a/src/ripple/app/ledger/Ledger.cpp b/src/ripple/app/ledger/Ledger.cpp index 223fc2d10..ac37c2b30 100644 --- a/src/ripple/app/ledger/Ledger.cpp +++ b/src/ripple/app/ledger/Ledger.cpp @@ -26,8 +26,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/src/ripple/app/consensus/LedgerConsensus.cpp b/src/ripple/app/ledger/LedgerConsensus.cpp similarity index 99% rename from src/ripple/app/consensus/LedgerConsensus.cpp rename to src/ripple/app/ledger/LedgerConsensus.cpp index 25b0e6b2a..0ff919745 100644 --- a/src/ripple/app/consensus/LedgerConsensus.cpp +++ b/src/ripple/app/ledger/LedgerConsensus.cpp @@ -18,8 +18,8 @@ //============================================================================== #include -#include -#include +#include +#include #include #include #include diff --git a/src/ripple/app/consensus/LedgerConsensus.h b/src/ripple/app/ledger/LedgerConsensus.h similarity index 100% rename from src/ripple/app/consensus/LedgerConsensus.h rename to src/ripple/app/ledger/LedgerConsensus.h diff --git a/src/ripple/app/ledger/tests/DeferredCredits.test.cpp b/src/ripple/app/ledger/tests/DeferredCredits.test.cpp index 69e93441e..51d580a87 100644 --- a/src/ripple/app/ledger/tests/DeferredCredits.test.cpp +++ b/src/ripple/app/ledger/tests/DeferredCredits.test.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { namespace test { diff --git a/src/ripple/app/ledger/tests/Ledger_test.cpp b/src/ripple/app/ledger/tests/Ledger_test.cpp index 83421426f..e6534b11c 100644 --- a/src/ripple/app/ledger/tests/Ledger_test.cpp +++ b/src/ripple/app/ledger/tests/Ledger_test.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { namespace test { diff --git a/src/ripple/app/tests/common_ledger.cpp b/src/ripple/app/ledger/tests/common_ledger.cpp similarity index 99% rename from src/ripple/app/tests/common_ledger.cpp rename to src/ripple/app/ledger/tests/common_ledger.cpp index 866c0c96b..94e807c2f 100644 --- a/src/ripple/app/tests/common_ledger.cpp +++ b/src/ripple/app/ledger/tests/common_ledger.cpp @@ -17,7 +17,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ //============================================================================== -#include +#include #include #include diff --git a/src/ripple/app/tests/common_ledger.h b/src/ripple/app/ledger/tests/common_ledger.h similarity index 99% rename from src/ripple/app/tests/common_ledger.h rename to src/ripple/app/ledger/tests/common_ledger.h index e3eb29e16..0fbcdf7ca 100644 --- a/src/ripple/app/tests/common_ledger.h +++ b/src/ripple/app/ledger/tests/common_ledger.h @@ -21,7 +21,7 @@ #define RIPPLE_APP_TESTS_COMMON_LEDGER_H_INCLUDED #include -#include +#include #include #include #include diff --git a/src/ripple/app/main/Application.cpp b/src/ripple/app/main/Application.cpp index b3b4046e5..5b2d5ecc4 100644 --- a/src/ripple/app/main/Application.cpp +++ b/src/ripple/app/main/Application.cpp @@ -19,9 +19,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/ripple/app/impl/BasicApp.cpp b/src/ripple/app/main/BasicApp.cpp similarity index 97% rename from src/ripple/app/impl/BasicApp.cpp rename to src/ripple/app/main/BasicApp.cpp index d7318ae28..0dff41f1f 100644 --- a/src/ripple/app/impl/BasicApp.cpp +++ b/src/ripple/app/main/BasicApp.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include BasicApp::BasicApp(std::size_t numberOfThreads) diff --git a/src/ripple/app/impl/BasicApp.h b/src/ripple/app/main/BasicApp.h similarity index 100% rename from src/ripple/app/impl/BasicApp.h rename to src/ripple/app/main/BasicApp.h diff --git a/src/ripple/app/data/DBInit.cpp b/src/ripple/app/main/DBInit.cpp similarity index 99% rename from src/ripple/app/data/DBInit.cpp rename to src/ripple/app/main/DBInit.cpp index 74fb159e8..0aee5ab58 100644 --- a/src/ripple/app/data/DBInit.cpp +++ b/src/ripple/app/main/DBInit.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include namespace ripple { diff --git a/src/ripple/app/data/DBInit.h b/src/ripple/app/main/DBInit.h similarity index 100% rename from src/ripple/app/data/DBInit.h rename to src/ripple/app/main/DBInit.h diff --git a/src/ripple/app/main/LocalCredentials.cpp b/src/ripple/app/main/LocalCredentials.cpp index 25ff7d5c0..1760446f5 100644 --- a/src/ripple/app/main/LocalCredentials.cpp +++ b/src/ripple/app/main/LocalCredentials.cpp @@ -18,10 +18,10 @@ //============================================================================== #include -#include +#include #include #include -#include +#include #include #include #include diff --git a/src/ripple/app/misc/AmendmentTableImpl.cpp b/src/ripple/app/misc/AmendmentTableImpl.cpp index 2e66cee5c..0d1d9b79a 100644 --- a/src/ripple/app/misc/AmendmentTableImpl.cpp +++ b/src/ripple/app/misc/AmendmentTableImpl.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/ripple/app/misc/NetworkOPs.cpp b/src/ripple/app/misc/NetworkOPs.cpp index e05dd2c96..a5bf4fa79 100644 --- a/src/ripple/app/misc/NetworkOPs.cpp +++ b/src/ripple/app/misc/NetworkOPs.cpp @@ -19,8 +19,8 @@ #include #include -#include -#include +#include +#include #include #include #include @@ -36,8 +36,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/src/ripple/app/misc/SHAMapStoreImp.h b/src/ripple/app/misc/SHAMapStoreImp.h index 3bafa80fb..76ea5ee5c 100644 --- a/src/ripple/app/misc/SHAMapStoreImp.h +++ b/src/ripple/app/misc/SHAMapStoreImp.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_APP_MISC_SHAMAPSTOREIMP_H_INCLUDED #define RIPPLE_APP_MISC_SHAMAPSTOREIMP_H_INCLUDED -#include +#include #include #include -#include +#include #include #include #include diff --git a/src/ripple/app/peers/UniqueNodeList.cpp b/src/ripple/app/misc/UniqueNodeList.cpp similarity index 99% rename from src/ripple/app/peers/UniqueNodeList.cpp rename to src/ripple/app/misc/UniqueNodeList.cpp index f7338fa8e..bc68cbc92 100644 --- a/src/ripple/app/peers/UniqueNodeList.cpp +++ b/src/ripple/app/misc/UniqueNodeList.cpp @@ -20,10 +20,10 @@ #include #include #include -#include +#include #include -#include -#include +#include +#include #include #include #include diff --git a/src/ripple/app/peers/UniqueNodeList.h b/src/ripple/app/misc/UniqueNodeList.h similarity index 98% rename from src/ripple/app/peers/UniqueNodeList.h rename to src/ripple/app/misc/UniqueNodeList.h index c6897f316..a73e684e7 100644 --- a/src/ripple/app/peers/UniqueNodeList.h +++ b/src/ripple/app/misc/UniqueNodeList.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_APP_PEERS_UNIQUENODELIST_H_INCLUDED #define RIPPLE_APP_PEERS_UNIQUENODELIST_H_INCLUDED -#include +#include #include // #include #include diff --git a/src/ripple/app/misc/Validations.cpp b/src/ripple/app/misc/Validations.cpp index 6d4682432..c099e027c 100644 --- a/src/ripple/app/misc/Validations.cpp +++ b/src/ripple/app/misc/Validations.cpp @@ -19,12 +19,12 @@ #include #include -#include +#include #include #include #include #include -#include +#include #include #include #include diff --git a/src/ripple/app/misc/impl/AccountTxPaging.h b/src/ripple/app/misc/impl/AccountTxPaging.h index 2c0241d16..3707baf87 100644 --- a/src/ripple/app/misc/impl/AccountTxPaging.h +++ b/src/ripple/app/misc/impl/AccountTxPaging.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_APP_MISC_IMPL_ACCOUNTTXPAGING_H_INCLUDED #define RIPPLE_APP_MISC_IMPL_ACCOUNTTXPAGING_H_INCLUDED -#include +#include #include #include #include diff --git a/src/ripple/app/misc/tests/AccountTxPaging.test.cpp b/src/ripple/app/misc/tests/AccountTxPaging.test.cpp index 08032b8cd..45369dd07 100644 --- a/src/ripple/app/misc/tests/AccountTxPaging.test.cpp +++ b/src/ripple/app/misc/tests/AccountTxPaging.test.cpp @@ -16,7 +16,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ //============================================================================== -#include +#include #include #include // #include diff --git a/src/ripple/app/tests/Path_test.cpp b/src/ripple/app/paths/tests/Path_test.cpp similarity index 99% rename from src/ripple/app/tests/Path_test.cpp rename to src/ripple/app/paths/tests/Path_test.cpp index 049cf98af..ca355eebb 100644 --- a/src/ripple/app/tests/Path_test.cpp +++ b/src/ripple/app/paths/tests/Path_test.cpp @@ -17,7 +17,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ //============================================================================== -#include +#include #include #include #include diff --git a/src/ripple/app/peers/README.md b/src/ripple/app/peers/README.md deleted file mode 100644 index 858c48b36..000000000 --- a/src/ripple/app/peers/README.md +++ /dev/null @@ -1,89 +0,0 @@ -# Ripple Clustering # - -A cluster consists of more than one Ripple server under common -administration that share load information, distribute cryptography -operations, and provide greater response consistency. - -Cluster nodes are identified by their public node keys. Cluster nodes -exchange information about endpoints that are imposing load upon them. -Cluster nodes share information about their internal load status. Cluster -nodes do not have to verify the cryptographic signatures on messages -received from other cluster nodes. - -## Configuration ## - -A server's public key can be determined from the output of the `server_info` -command. The key is in the `pubkey_node` value, and is a text string -beginning with the letter `n`. The key is maintained across runs in a -database. - -Cluster members are configured in the `rippled.cfg` file under -`[cluster_nodes]`. Each member should be configured on a line beginning -with the node public key, followed optionally by a space and a friendly -name. - -Because cluster members can introduce other cluster members, it is not -necessary to configure every cluster member on every other cluster member. -If a hub and spoke system is used, it is sufficient to configure every -cluster member on the hub(s) and only configure the hubs on the spokes. -That is, each spoke does not need to be configured on every other spoke. - -New spokes can be added as follows: - -- In the new spoke's `[cluster_nodes]`, include each hub's public node key -- Start the spoke server and determine its public node key -- Configure each hub with the new spoke's public key -- Restart each hub, one by one -- Restart the spoke - -## Transaction Behavior ## - -When a transaction is received from a cluster member, several normal checks -are bypassed: - -Signature checking is bypassed because we trust that a cluster member would -not relay a transaction with an incorrect signature. Validators may wish to -disable this feature, preferring the additional load to get the additional -security of having validators check each transaction. - -Local checks for transaction checking are also bypassed. For example, a -server will not reject a transaction from a cluster peer because the fee -does not meet its current relay fee. It is preferable to keep the cluster -in agreement and permit confirmation from one cluster member to more -reliably indicate the transaction's acceptance by the cluster. - -## Server Load Information ## - -Cluster members exchange information on their server's load level. The load -level is essentially the amount by which the normal fee levels are multiplied -to get the server's fee for relaying transactions. - -A server's effective load level, and the one it uses to determine its relay -fee, is the highest of its local load level, the network load level, and the -cluster load level. The cluster load level is the median load level reported -by a cluster member. - -## Gossip ## - -Gossip is the mechanism by which cluster members share information about -endpoints (typically IPv4 addresses) that are imposing unusually high load -on them. The endpoint load manager takes into account gossip to reduce the -amount of load the endpoint is permitted to impose on the local server -before it is warned, disconnected, or banned. - -Suppose, for example, that an attacker controls a large number of IP -addresses, and with these, he can send sufficient requests to overload a -server. Without gossip, he could use these same addresses to overload all -the servers in a cluster. With gossip, if he chooses to use the same IP -address to impose load on more than one server, he will find that the amount -of load he can impose before getting disconnected is much lower. - -## Monitoring ## - -The `peers` command will report on the status of the cluster. The `cluster` -object will contain one entry for each member of the cluster (either configured -or introduced by another cluster member). The `age` field is the number of -seconds since the server was last heard from. If the server is reporting an -elevated cluster fee, that will be reported as well. - -In the `peers` object, cluster members will contain a `cluster` field set to `true`. diff --git a/src/ripple/app/peers/TODO.md b/src/ripple/app/peers/TODO.md deleted file mode 100644 index 6ca873551..000000000 --- a/src/ripple/app/peers/TODO.md +++ /dev/null @@ -1,66 +0,0 @@ -# Peer.cpp - -- Move magic number constants into Tuning.h / Peer constants enum - -- Wrap lines to 80 columns - -- Use Journal - -- Pass Journal in the ctor argument list - -- Use m_socket->remote_endpoint() instead of m_remoteAddress in all cases. - For async_connect pass the IPAddress in the bind to onConnect completion - handler (so we know the address if the connect fails). For PROXY, to recover - the original remote address (of the ELB) use m_socket->next_layer()->remote_endpoint(), - and use m_socket->remote_endpoint() to get the "real IP" reported in the PROXY - handshake. - -- Handle operation_aborted correctly, work with Peers.cpp to properly handle - a stop. Peers need to be gracefully disconnected, the listening socket closed - on the stop to prevent new connections (and new connections that slip - through should be refused). The Peers object needs to know when the last - Peer has finished closing either gracefully or from an expired graceful - close timer. - -- Handle graceful connection closure (With a graceful close timeout). During - a graceful close, throttle incoming data (by not issuing new socket reads), - discard any received messages, drain the outbound queue, and tear down - the socket when the last send completes. - -- PeerImp should construct with the socket, using a move-assign or swap. - PeerDoor should not have to create a Peer object, it should just create a - socket, accept the connection, and then construct the Peer object. - -- No more strings for IP addresses and ports. Always use IPAddress. We can - have a version of connect() that takes a string but it should either convert - it to IPAddress if its parseable, else perform a name resolution. - -- Stop calling getNativeSocket() this and that, just go through m_socket. - -- Properly handle operation_aborted in all the callbacks. - -- Move all the function definitions into the class declaration. - -- Replace macros with language constants. - -- Stop checking for exceptions, just handle errors correctly. - -- Move the business logic out of the Peer class. Socket operations and business - logic should not be mixed together. We can declare a new class PeerLogic to - abstract the details of message processing. - -- Change m_nodePublicKey from RippleAddress to RipplePublicKey, change the - header, and modify all call sites to use the new type instead of the old. This - might require adding some compatibility functions to RipplePublicKey. - -- Remove public functions that are not used outside of Peer.cpp - -# Peers.cpp - -- Add Peer::Config instead of using getConfig() to pass in configuration data - -# PeerSet.cpp - -- Remove to cyclic dependency on InboundLedger (logging only) - -- Convert to Journal diff --git a/src/ripple/app/tx/impl/Transaction.cpp b/src/ripple/app/tx/impl/Transaction.cpp index 8b7984240..0de032755 100644 --- a/src/ripple/app/tx/impl/Transaction.cpp +++ b/src/ripple/app/tx/impl/Transaction.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/ripple/app/tx/tests/common_transactor.cpp b/src/ripple/app/tx/tests/common_transactor.cpp index d5942d306..a02de08d4 100644 --- a/src/ripple/app/tx/tests/common_transactor.cpp +++ b/src/ripple/app/tx/tests/common_transactor.cpp @@ -16,9 +16,9 @@ //============================================================================== #include -#include +#include #include -#include +#include #include #include #include diff --git a/src/ripple/app/data/DatabaseCon.h b/src/ripple/core/DatabaseCon.h similarity index 98% rename from src/ripple/app/data/DatabaseCon.h rename to src/ripple/core/DatabaseCon.h index a2762e12b..205afbe12 100644 --- a/src/ripple/app/data/DatabaseCon.h +++ b/src/ripple/core/DatabaseCon.h @@ -21,7 +21,7 @@ #define RIPPLE_APP_DATA_DATABASECON_H_INCLUDED #include -#include +#include #include #include #include diff --git a/src/ripple/app/data/SociDB.h b/src/ripple/core/SociDB.h similarity index 100% rename from src/ripple/app/data/SociDB.h rename to src/ripple/core/SociDB.h diff --git a/src/ripple/app/data/DatabaseCon.cpp b/src/ripple/core/impl/DatabaseCon.cpp similarity index 96% rename from src/ripple/app/data/DatabaseCon.cpp rename to src/ripple/core/impl/DatabaseCon.cpp index f51842a3f..b8ce18d40 100644 --- a/src/ripple/app/data/DatabaseCon.cpp +++ b/src/ripple/core/impl/DatabaseCon.cpp @@ -18,8 +18,8 @@ //============================================================================== #include -#include -#include +#include +#include #include #include // diff --git a/src/ripple/app/data/DummySociDynamicBackend.cpp b/src/ripple/core/impl/DummySociDynamicBackend.cpp similarity index 98% rename from src/ripple/app/data/DummySociDynamicBackend.cpp rename to src/ripple/core/impl/DummySociDynamicBackend.cpp index 69076d67f..a5fdde972 100644 --- a/src/ripple/app/data/DummySociDynamicBackend.cpp +++ b/src/ripple/core/impl/DummySociDynamicBackend.cpp @@ -26,7 +26,7 @@ #include -#include +#include // dummy soci-backend namespace soci { diff --git a/src/ripple/app/data/SociDB.cpp b/src/ripple/core/impl/SociDB.cpp similarity index 99% rename from src/ripple/app/data/SociDB.cpp rename to src/ripple/core/impl/SociDB.cpp index 4088f1978..a1a42fc08 100644 --- a/src/ripple/app/data/SociDB.cpp +++ b/src/ripple/core/impl/SociDB.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include // #include diff --git a/src/ripple/app/data/tests/SociDB.test.cpp b/src/ripple/core/tests/SociDB.test.cpp similarity index 99% rename from src/ripple/app/data/tests/SociDB.test.cpp rename to src/ripple/core/tests/SociDB.test.cpp index af8c29fbc..1841cac58 100644 --- a/src/ripple/app/data/tests/SociDB.test.cpp +++ b/src/ripple/core/tests/SociDB.test.cpp @@ -19,8 +19,8 @@ #include -#include #include +#include #include #include #include @@ -374,6 +374,6 @@ public: } }; -BEAST_DEFINE_TESTSUITE (SociDB, app, ripple); +BEAST_DEFINE_TESTSUITE(SociDB,core,ripple); } // ripple diff --git a/src/ripple/app/peers/ClusterNodeStatus.h b/src/ripple/overlay/ClusterNodeStatus.h similarity index 100% rename from src/ripple/app/peers/ClusterNodeStatus.h rename to src/ripple/overlay/ClusterNodeStatus.h diff --git a/src/ripple/overlay/README.md b/src/ripple/overlay/README.md index a4c831746..47b7ee4a7 100644 --- a/src/ripple/overlay/README.md +++ b/src/ripple/overlay/README.md @@ -183,6 +183,96 @@ Content-Type: application/json through the configuration. These headers will be transmitted in the corresponding request or response messages. +# Ripple Clustering # + +A cluster consists of more than one Ripple server under common +administration that share load information, distribute cryptography +operations, and provide greater response consistency. + +Cluster nodes are identified by their public node keys. Cluster nodes +exchange information about endpoints that are imposing load upon them. +Cluster nodes share information about their internal load status. Cluster +nodes do not have to verify the cryptographic signatures on messages +received from other cluster nodes. + +## Configuration ## + +A server's public key can be determined from the output of the `server_info` +command. The key is in the `pubkey_node` value, and is a text string +beginning with the letter `n`. The key is maintained across runs in a +database. + +Cluster members are configured in the `rippled.cfg` file under +`[cluster_nodes]`. Each member should be configured on a line beginning +with the node public key, followed optionally by a space and a friendly +name. + +Because cluster members can introduce other cluster members, it is not +necessary to configure every cluster member on every other cluster member. +If a hub and spoke system is used, it is sufficient to configure every +cluster member on the hub(s) and only configure the hubs on the spokes. +That is, each spoke does not need to be configured on every other spoke. + +New spokes can be added as follows: + +- In the new spoke's `[cluster_nodes]`, include each hub's public node key +- Start the spoke server and determine its public node key +- Configure each hub with the new spoke's public key +- Restart each hub, one by one +- Restart the spoke + +## Transaction Behavior ## + +When a transaction is received from a cluster member, several normal checks +are bypassed: + +Signature checking is bypassed because we trust that a cluster member would +not relay a transaction with an incorrect signature. Validators may wish to +disable this feature, preferring the additional load to get the additional +security of having validators check each transaction. + +Local checks for transaction checking are also bypassed. For example, a +server will not reject a transaction from a cluster peer because the fee +does not meet its current relay fee. It is preferable to keep the cluster +in agreement and permit confirmation from one cluster member to more +reliably indicate the transaction's acceptance by the cluster. + +## Server Load Information ## + +Cluster members exchange information on their server's load level. The load +level is essentially the amount by which the normal fee levels are multiplied +to get the server's fee for relaying transactions. + +A server's effective load level, and the one it uses to determine its relay +fee, is the highest of its local load level, the network load level, and the +cluster load level. The cluster load level is the median load level reported +by a cluster member. + +## Gossip ## + +Gossip is the mechanism by which cluster members share information about +endpoints (typically IPv4 addresses) that are imposing unusually high load +on them. The endpoint load manager takes into account gossip to reduce the +amount of load the endpoint is permitted to impose on the local server +before it is warned, disconnected, or banned. + +Suppose, for example, that an attacker controls a large number of IP +addresses, and with these, he can send sufficient requests to overload a +server. Without gossip, he could use these same addresses to overload all +the servers in a cluster. With gossip, if he chooses to use the same IP +address to impose load on more than one server, he will find that the amount +of load he can impose before getting disconnected is much lower. + +## Monitoring ## + +The `peers` command will report on the status of the cluster. The `cluster` +object will contain one entry for each member of the cluster (either configured +or introduced by another cluster member). The `age` field is the number of +seconds since the server was last heard from. If the server is reporting an +elevated cluster fee, that will be reported as well. + +In the `peers` object, cluster members will contain a `cluster` field set to `true`. + --- [overlay_network]: http://en.wikipedia.org/wiki/Overlay_network diff --git a/src/ripple/overlay/impl/ConnectAttempt.h b/src/ripple/overlay/impl/ConnectAttempt.h index ac83e7dec..739164993 100644 --- a/src/ripple/overlay/impl/ConnectAttempt.h +++ b/src/ripple/overlay/impl/ConnectAttempt.h @@ -26,7 +26,7 @@ #include #include #include -#include // move to .cpp +#include // move to .cpp #include #include #include diff --git a/src/ripple/overlay/impl/PeerImp.cpp b/src/ripple/overlay/impl/PeerImp.cpp index 2d9f6c07b..d5e4a1efc 100644 --- a/src/ripple/overlay/impl/PeerImp.cpp +++ b/src/ripple/overlay/impl/PeerImp.cpp @@ -25,8 +25,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/src/ripple/peerfinder/impl/Manager.cpp b/src/ripple/peerfinder/impl/Manager.cpp index 20d968da3..adc35dc2b 100644 --- a/src/ripple/peerfinder/impl/Manager.cpp +++ b/src/ripple/peerfinder/impl/Manager.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include // diff --git a/src/ripple/peerfinder/impl/StoreSqdb.h b/src/ripple/peerfinder/impl/StoreSqdb.h index 1b516731d..beaf233eb 100644 --- a/src/ripple/peerfinder/impl/StoreSqdb.h +++ b/src/ripple/peerfinder/impl/StoreSqdb.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_PEERFINDER_STORESQDB_H_INCLUDED #define RIPPLE_PEERFINDER_STORESQDB_H_INCLUDED -#include +#include #include #include diff --git a/src/ripple/rpc/handlers/GetCounts.cpp b/src/ripple/rpc/handlers/GetCounts.cpp index 948481085..d718c7520 100644 --- a/src/ripple/rpc/handlers/GetCounts.cpp +++ b/src/ripple/rpc/handlers/GetCounts.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include #include #include diff --git a/src/ripple/rpc/handlers/Peers.cpp b/src/ripple/rpc/handlers/Peers.cpp index 1c14d17c2..4c32e2f24 100644 --- a/src/ripple/rpc/handlers/Peers.cpp +++ b/src/ripple/rpc/handlers/Peers.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include #include diff --git a/src/ripple/rpc/handlers/UnlAdd.cpp b/src/ripple/rpc/handlers/UnlAdd.cpp index 9a882eb8f..1689eedca 100644 --- a/src/ripple/rpc/handlers/UnlAdd.cpp +++ b/src/ripple/rpc/handlers/UnlAdd.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include namespace ripple { diff --git a/src/ripple/unity/app.cpp b/src/ripple/unity/app.cpp index e8e7ea960..914f7b8ad 100644 --- a/src/ripple/unity/app.cpp +++ b/src/ripple/unity/app.cpp @@ -18,11 +18,5 @@ //============================================================================== #include -#include -#include -#include -#include -#include #include #include -#include diff --git a/src/ripple/unity/app1.cpp b/src/ripple/unity/app1.cpp index 01cf34bc7..536d08fae 100644 --- a/src/ripple/unity/app1.cpp +++ b/src/ripple/unity/app1.cpp @@ -18,7 +18,3 @@ //============================================================================== #include - -#include -#include -#include diff --git a/src/ripple/unity/app2.cpp b/src/ripple/unity/app2.cpp index d1b4cb817..536d08fae 100644 --- a/src/ripple/unity/app2.cpp +++ b/src/ripple/unity/app2.cpp @@ -18,15 +18,3 @@ //============================================================================== #include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include diff --git a/src/ripple/unity/app3.cpp b/src/ripple/unity/app3.cpp index 1be28f760..a680facdd 100644 --- a/src/ripple/unity/app3.cpp +++ b/src/ripple/unity/app3.cpp @@ -19,10 +19,5 @@ #include -#include -#include -#include - -#include -#include -#include +#include +#include diff --git a/src/ripple/unity/app4.cpp b/src/ripple/unity/app4.cpp index bddecf949..807983703 100644 --- a/src/ripple/unity/app4.cpp +++ b/src/ripple/unity/app4.cpp @@ -19,35 +19,3 @@ #include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include diff --git a/src/ripple/unity/app5.cpp b/src/ripple/unity/app5.cpp index 4245ac22e..53ee994bc 100644 --- a/src/ripple/unity/app5.cpp +++ b/src/ripple/unity/app5.cpp @@ -19,8 +19,6 @@ #include -#include -#include #include #include #include diff --git a/src/ripple/unity/app6.cpp b/src/ripple/unity/app6.cpp index c1f2b3577..807983703 100644 --- a/src/ripple/unity/app6.cpp +++ b/src/ripple/unity/app6.cpp @@ -19,17 +19,3 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include diff --git a/src/ripple/unity/app7.cpp b/src/ripple/unity/app7.cpp index 815890fd6..807983703 100644 --- a/src/ripple/unity/app7.cpp +++ b/src/ripple/unity/app7.cpp @@ -19,8 +19,3 @@ #include -#include -#include -#include -#include -#include diff --git a/src/ripple/unity/app_ledger.cpp b/src/ripple/unity/app_ledger.cpp new file mode 100644 index 000000000..9b8f674cf --- /dev/null +++ b/src/ripple/unity/app_ledger.cpp @@ -0,0 +1,48 @@ +//------------------------------------------------------------------------------ +/* + This file is part of rippled: https://github.com/ripple/rippled + Copyright (c) 2012, 2013 Ripple Labs Inc. + + Permission to use, copy, modify, and/or distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +*/ +//============================================================================== + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include +#include diff --git a/src/ripple/unity/app_main.cpp b/src/ripple/unity/app_main.cpp new file mode 100644 index 000000000..440d48924 --- /dev/null +++ b/src/ripple/unity/app_main.cpp @@ -0,0 +1,29 @@ +//------------------------------------------------------------------------------ +/* + This file is part of rippled: https://github.com/ripple/rippled + Copyright (c) 2012, 2013 Ripple Labs Inc. + + Permission to use, copy, modify, and/or distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +*/ +//============================================================================== + +#include + +#include +#include +#include +#include +#include +#include +#include +#include diff --git a/src/ripple/unity/app_misc.cpp b/src/ripple/unity/app_misc.cpp new file mode 100644 index 000000000..d0798a847 --- /dev/null +++ b/src/ripple/unity/app_misc.cpp @@ -0,0 +1,35 @@ +//------------------------------------------------------------------------------ +/* + This file is part of rippled: https://github.com/ripple/rippled + Copyright (c) 2012, 2013 Ripple Labs Inc. + + Permission to use, copy, modify, and/or distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +*/ +//============================================================================== + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include diff --git a/src/ripple/unity/app8.cpp b/src/ripple/unity/app_paths.cpp similarity index 87% rename from src/ripple/unity/app8.cpp rename to src/ripple/unity/app_paths.cpp index e0214942e..1ba8189ba 100644 --- a/src/ripple/unity/app8.cpp +++ b/src/ripple/unity/app_paths.cpp @@ -19,9 +19,15 @@ #include +#include +#include +#include +#include +#include + #ifdef _MSC_VER #pragma warning (push) -#pragma warning (disable: 4309) // truncation of constant value +//#pragma warning (disable: 4309) // truncation of constant value #endif #include #include @@ -38,9 +44,7 @@ #include #include #include - #include - #ifdef _MSC_VER #pragma warning (pop) #endif diff --git a/src/ripple/unity/app_tx.cpp b/src/ripple/unity/app_tx.cpp new file mode 100644 index 000000000..63a1d88ef --- /dev/null +++ b/src/ripple/unity/app_tx.cpp @@ -0,0 +1,49 @@ +//------------------------------------------------------------------------------ +/* + This file is part of rippled: https://github.com/ripple/rippled + Copyright (c) 2012, 2013 Ripple Labs Inc. + + Permission to use, copy, modify, and/or distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +*/ +//============================================================================== + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include diff --git a/src/ripple/unity/core.cpp b/src/ripple/unity/core.cpp index 033e90b08..3cbdc8f1d 100644 --- a/src/ripple/unity/core.cpp +++ b/src/ripple/unity/core.cpp @@ -20,6 +20,7 @@ #include #include +#include #include #include #include diff --git a/src/ripple/unity/soci_ripple.cpp b/src/ripple/unity/soci_ripple.cpp index 9a9af2ad1..89c601147 100644 --- a/src/ripple/unity/soci_ripple.cpp +++ b/src/ripple/unity/soci_ripple.cpp @@ -19,6 +19,6 @@ #include -#include -#include -#include +#include +#include +#include diff --git a/src/ripple/validators/impl/StoreSqdb.h b/src/ripple/validators/impl/StoreSqdb.h index 4df8dbb61..f5a5082dc 100644 --- a/src/ripple/validators/impl/StoreSqdb.h +++ b/src/ripple/validators/impl/StoreSqdb.h @@ -23,7 +23,7 @@ #include #include #include -#include +#include namespace ripple { namespace Validators {