diff --git a/Builds/CMake/RippledCore.cmake b/Builds/CMake/RippledCore.cmake index c3d28381b..02631ea93 100644 --- a/Builds/CMake/RippledCore.cmake +++ b/Builds/CMake/RippledCore.cmake @@ -99,6 +99,7 @@ target_sources (xrpl_core PRIVATE src/ripple/protocol/impl/PublicKey.cpp src/ripple/protocol/impl/Quality.cpp src/ripple/protocol/impl/QualityFunction.cpp + src/ripple/protocol/impl/RPCErr.cpp src/ripple/protocol/impl/Rate2.cpp src/ripple/protocol/impl/Rules.cpp src/ripple/protocol/impl/SField.cpp @@ -170,54 +171,54 @@ target_link_libraries (xrpl_core #]=================================] install ( FILES - src/ripple/basics/algorithm.h src/ripple/basics/Archive.h - src/ripple/basics/base64.h - src/ripple/basics/base_uint.h src/ripple/basics/BasicConfig.h src/ripple/basics/Blob.h src/ripple/basics/Buffer.h src/ripple/basics/ByteUtilities.h - src/ripple/basics/chrono.h - src/ripple/basics/comparators.h src/ripple/basics/CompressionAlgorithms.h - src/ripple/basics/contract.h src/ripple/basics/CountedObject.h src/ripple/basics/DecayingSample.h src/ripple/basics/Expected.h src/ripple/basics/FeeUnits.h src/ripple/basics/FileUtilities.h - src/ripple/basics/hardened_hash.h src/ripple/basics/IOUAmount.h - src/ripple/basics/join.h src/ripple/basics/KeyCache.h src/ripple/basics/LocalValue.h src/ripple/basics/Log.h - src/ripple/basics/make_SSLContext.h src/ripple/basics/MathUtilities.h - src/ripple/basics/mulDiv.h src/ripple/basics/Number.h - src/ripple/basics/partitioned_unordered_map.h src/ripple/basics/PerfLog.h - src/ripple/basics/random.h - src/ripple/basics/RangeSet.h src/ripple/basics/README.md - src/ripple/basics/ResolverAsio.h + src/ripple/basics/RangeSet.h src/ripple/basics/Resolver.h - src/ripple/basics/safe_cast.h - src/ripple/basics/scope.h + src/ripple/basics/ResolverAsio.h src/ripple/basics/SHAMapHash.h src/ripple/basics/Slice.h - src/ripple/basics/spinlock.h - src/ripple/basics/strHex.h src/ripple/basics/StringUtilities.h src/ripple/basics/TaggedCache.h - src/ripple/basics/tagged_integer.h src/ripple/basics/ThreadSafetyAnalysis.h src/ripple/basics/ToString.h src/ripple/basics/UnorderedContainers.h src/ripple/basics/UptimeClock.h src/ripple/basics/XRPAmount.h + src/ripple/basics/algorithm.h + src/ripple/basics/base64.h + src/ripple/basics/base_uint.h + src/ripple/basics/chrono.h + src/ripple/basics/comparators.h + src/ripple/basics/contract.h + src/ripple/basics/hardened_hash.h + src/ripple/basics/join.h + src/ripple/basics/make_SSLContext.h + src/ripple/basics/mulDiv.h + src/ripple/basics/partitioned_unordered_map.h + src/ripple/basics/random.h + src/ripple/basics/safe_cast.h + src/ripple/basics/scope.h + src/ripple/basics/spinlock.h + src/ripple/basics/strHex.h + src/ripple/basics/tagged_integer.h DESTINATION include/ripple/basics) install ( FILES @@ -242,11 +243,6 @@ install ( FILES src/ripple/json/impl/json_assert.h DESTINATION include/ripple/json/impl) - -install ( - FILES - src/ripple/net/RPCErr.h - DESTINATION include/ripple/net) install ( FILES src/ripple/protocol/AccountID.h @@ -262,94 +258,110 @@ install ( src/ripple/protocol/InnerObjectFormats.h src/ripple/protocol/Issue.h src/ripple/protocol/json_get_or_throw.h - src/ripple/protocol/KeyType.h src/ripple/protocol/Keylet.h + src/ripple/protocol/KeyType.h src/ripple/protocol/KnownFormats.h src/ripple/protocol/LedgerFormats.h src/ripple/protocol/LedgerHeader.h - src/ripple/protocol/NFTSyntheticSerializer.h src/ripple/protocol/NFTokenID.h src/ripple/protocol/NFTokenOfferID.h + src/ripple/protocol/NFTSyntheticSerializer.h src/ripple/protocol/Protocol.h src/ripple/protocol/PublicKey.h src/ripple/protocol/Quality.h src/ripple/protocol/QualityFunction.h src/ripple/protocol/Rate.h + src/ripple/protocol/RPCErr.h src/ripple/protocol/Rules.h + src/ripple/protocol/SecretKey.h + src/ripple/protocol/Seed.h + src/ripple/protocol/SeqProxy.h + src/ripple/protocol/Serializer.h src/ripple/protocol/SField.h + src/ripple/protocol/Sign.h src/ripple/protocol/SOTemplate.h src/ripple/protocol/STAccount.h src/ripple/protocol/STAmount.h - src/ripple/protocol/STCurrency.h - src/ripple/protocol/STIssue.h src/ripple/protocol/STArray.h src/ripple/protocol/STBase.h src/ripple/protocol/STBitString.h src/ripple/protocol/STBlob.h + src/ripple/protocol/STCurrency.h src/ripple/protocol/STExchange.h src/ripple/protocol/STInteger.h + src/ripple/protocol/STIssue.h src/ripple/protocol/STLedgerEntry.h src/ripple/protocol/STObject.h src/ripple/protocol/STParsedJSON.h src/ripple/protocol/STPathSet.h src/ripple/protocol/STTx.h - src/ripple/protocol/XChainAttestations.h - src/ripple/protocol/STXChainBridge.h src/ripple/protocol/STValidation.h src/ripple/protocol/STVector256.h - src/ripple/protocol/SecretKey.h - src/ripple/protocol/Seed.h - src/ripple/protocol/SeqProxy.h - src/ripple/protocol/Serializer.h - src/ripple/protocol/Sign.h + src/ripple/protocol/STXChainBridge.h src/ripple/protocol/SystemParameters.h src/ripple/protocol/TER.h src/ripple/protocol/TxFlags.h src/ripple/protocol/TxFormats.h src/ripple/protocol/TxMeta.h src/ripple/protocol/UintTypes.h + src/ripple/protocol/XChainAttestations.h src/ripple/protocol/digest.h src/ripple/protocol/jss.h - src/ripple/protocol/serialize.h src/ripple/protocol/nft.h src/ripple/protocol/nftPageMask.h + src/ripple/protocol/serialize.h src/ripple/protocol/tokens.h DESTINATION include/ripple/protocol) install ( FILES + src/ripple/protocol/impl/STVar.h src/ripple/protocol/impl/b58_utils.h - src/ripple/protocol/impl/STVar.h src/ripple/protocol/impl/secp256k1.h src/ripple/protocol/impl/token_errors.h DESTINATION include/ripple/protocol/impl) install ( - FILES - src/ripple/resource/Fees.h - src/ripple/resource/Charge.h - DESTINATION include/ripple/resource) + FILES + src/ripple/resource/Charge.h + src/ripple/resource/Consumer.h + src/ripple/resource/Disposition.h + src/ripple/resource/Fees.h + src/ripple/resource/Gossip.h + src/ripple/resource/ResourceManager.h + src/ripple/resource/Types.h + DESTINATION include/ripple/resource) install ( FILES + src/ripple/resource/impl/Entry.h + src/ripple/resource/impl/Import.h + src/ripple/resource/impl/Key.h + src/ripple/resource/impl/Kind.h + src/ripple/resource/impl/Logic.h + src/ripple/resource/impl/Tuning.h + DESTINATION include/ripple/resource/impl) +install ( + FILES + src/ripple/server/Handoff.h src/ripple/server/Port.h src/ripple/server/Server.h src/ripple/server/Session.h src/ripple/server/SimpleWriter.h src/ripple/server/Writer.h src/ripple/server/WSSession.h - src/ripple/server/Handoff.h DESTINATION include/ripple/server) install ( FILES - src/ripple/server/impl/ServerImpl.h - src/ripple/server/impl/io_list.h + src/ripple/server/impl/BaseHTTPPeer.h + src/ripple/server/impl/BasePeer.h + src/ripple/server/impl/BaseWSPeer.h src/ripple/server/impl/Door.h + src/ripple/server/impl/JSONRPCUtil.h + src/ripple/server/impl/LowestLayer.h src/ripple/server/impl/PlainHTTPPeer.h src/ripple/server/impl/PlainWSPeer.h - src/ripple/server/impl/BaseHTTPPeer.h - src/ripple/server/impl/BaseWSPeer.h - src/ripple/server/impl/BasePeer.h - src/ripple/server/impl/LowestLayer.h + src/ripple/server/impl/ServerImpl.h src/ripple/server/impl/SSLHTTPPeer.h src/ripple/server/impl/SSLWSPeer.h + src/ripple/server/impl/io_list.h DESTINATION include/ripple/server/impl) #[===================================[ beast/legacy headers installation @@ -378,11 +390,11 @@ install ( DESTINATION include/ripple/beast/hash/impl) install ( FILES - src/ripple/beast/net/IPAddress.h - src/ripple/beast/net/IPAddressConversion.h - src/ripple/beast/net/IPAddressV4.h - src/ripple/beast/net/IPAddressV6.h - src/ripple/beast/net/IPEndpoint.h + src/ripple/beast/net/IPAddress.h + src/ripple/beast/net/IPAddressConversion.h + src/ripple/beast/net/IPAddressV4.h + src/ripple/beast/net/IPAddressV6.h + src/ripple/beast/net/IPEndpoint.h DESTINATION include/ripple/beast/net) install ( FILES @@ -396,15 +408,14 @@ install ( src/ripple/beast/unit_test/amount.hpp src/ripple/beast/unit_test/dstream.hpp src/ripple/beast/unit_test/global_suites.hpp - src/ripple/beast/unit_test/main.cpp src/ripple/beast/unit_test/match.hpp src/ripple/beast/unit_test/recorder.hpp src/ripple/beast/unit_test/reporter.hpp src/ripple/beast/unit_test/results.hpp src/ripple/beast/unit_test/runner.hpp - src/ripple/beast/unit_test/suite.hpp src/ripple/beast/unit_test/suite_info.hpp src/ripple/beast/unit_test/suite_list.hpp + src/ripple/beast/unit_test/suite.hpp src/ripple/beast/unit_test/thread.hpp DESTINATION include/ripple/beast/unit_test) install ( @@ -415,34 +426,10 @@ install ( FILES src/ripple/beast/utility/Journal.h src/ripple/beast/utility/PropertyStream.h + src/ripple/beast/utility/WrappedSink.h src/ripple/beast/utility/Zero.h src/ripple/beast/utility/rngfill.h - src/ripple/beast/utility/WrappedSink.h DESTINATION include/ripple/beast/utility) -# WARNING!! -- horrible levelization ahead -# (these files should be isolated or moved...but -# unfortunately unit_test.h above creates this dependency) -if (tests) - install ( - FILES - src/ripple/beast/unit_test/amount.hpp - src/ripple/beast/unit_test/dstream.hpp - src/ripple/beast/unit_test/global_suites.hpp - src/ripple/beast/unit_test/match.hpp - src/ripple/beast/unit_test/recorder.hpp - src/ripple/beast/unit_test/reporter.hpp - src/ripple/beast/unit_test/results.hpp - src/ripple/beast/unit_test/runner.hpp - src/ripple/beast/unit_test/suite.hpp - src/ripple/beast/unit_test/suite_info.hpp - src/ripple/beast/unit_test/suite_list.hpp - src/ripple/beast/unit_test/thread.hpp - DESTINATION include/ripple/beast/extras/unit_test) - install ( - FILES - src/ripple/beast/unit_test/detail/const_container.hpp - DESTINATION include/ripple/beast/unit_test/detail) -endif () #tests #[===================================================================[ rippled executable #]===================================================================] @@ -665,7 +652,6 @@ target_sources (rippled PRIVATE src/ripple/net/impl/HTTPStream.cpp src/ripple/net/impl/InfoSub.cpp src/ripple/net/impl/RPCCall.cpp - src/ripple/net/impl/RPCErr.cpp src/ripple/net/impl/RPCSub.cpp src/ripple/net/impl/RegisterSSLCerts.cpp #[===============================[ diff --git a/src/ripple/app/misc/NetworkOPs.cpp b/src/ripple/app/misc/NetworkOPs.cpp index 110698265..af7c78353 100644 --- a/src/ripple/app/misc/NetworkOPs.cpp +++ b/src/ripple/app/misc/NetworkOPs.cpp @@ -56,13 +56,13 @@ #include #include #include -#include #include #include #include #include #include #include +#include #include #include #include diff --git a/src/ripple/app/paths/PathRequest.cpp b/src/ripple/app/paths/PathRequest.cpp index ae95a6d9f..519c9b2a5 100644 --- a/src/ripple/app/paths/PathRequest.cpp +++ b/src/ripple/app/paths/PathRequest.cpp @@ -28,8 +28,8 @@ #include #include #include -#include #include +#include #include #include diff --git a/src/ripple/app/paths/PathRequests.cpp b/src/ripple/app/paths/PathRequests.cpp index ac051e5f0..700cf1372 100644 --- a/src/ripple/app/paths/PathRequests.cpp +++ b/src/ripple/app/paths/PathRequests.cpp @@ -22,8 +22,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/src/ripple/net/impl/RPCCall.cpp b/src/ripple/net/impl/RPCCall.cpp index b0d430a9f..e6aae2297 100644 --- a/src/ripple/net/impl/RPCCall.cpp +++ b/src/ripple/net/impl/RPCCall.cpp @@ -30,9 +30,9 @@ #include #include #include -#include #include #include +#include #include #include #include diff --git a/src/ripple/net/RPCErr.h b/src/ripple/protocol/RPCErr.h similarity index 100% rename from src/ripple/net/RPCErr.h rename to src/ripple/protocol/RPCErr.h diff --git a/src/ripple/net/impl/RPCErr.cpp b/src/ripple/protocol/impl/RPCErr.cpp similarity index 97% rename from src/ripple/net/impl/RPCErr.cpp rename to src/ripple/protocol/impl/RPCErr.cpp index 47fdaa220..633a4135f 100644 --- a/src/ripple/net/impl/RPCErr.cpp +++ b/src/ripple/protocol/impl/RPCErr.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/AMMInfo.cpp b/src/ripple/rpc/handlers/AMMInfo.cpp index c6711fa7b..b240c8c2a 100644 --- a/src/ripple/rpc/handlers/AMMInfo.cpp +++ b/src/ripple/rpc/handlers/AMMInfo.cpp @@ -20,9 +20,9 @@ #include #include #include -#include #include #include +#include #include #include #include diff --git a/src/ripple/rpc/handlers/AccountChannels.cpp b/src/ripple/rpc/handlers/AccountChannels.cpp index 229222b6a..27dce263a 100644 --- a/src/ripple/rpc/handlers/AccountChannels.cpp +++ b/src/ripple/rpc/handlers/AccountChannels.cpp @@ -20,9 +20,9 @@ #include #include #include -#include #include #include +#include #include #include #include diff --git a/src/ripple/rpc/handlers/AccountCurrenciesHandler.cpp b/src/ripple/rpc/handlers/AccountCurrenciesHandler.cpp index 64956a7d0..45dc8b545 100644 --- a/src/ripple/rpc/handlers/AccountCurrenciesHandler.cpp +++ b/src/ripple/rpc/handlers/AccountCurrenciesHandler.cpp @@ -20,8 +20,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/src/ripple/rpc/handlers/AccountLines.cpp b/src/ripple/rpc/handlers/AccountLines.cpp index ace5b3898..9c5e5ed02 100644 --- a/src/ripple/rpc/handlers/AccountLines.cpp +++ b/src/ripple/rpc/handlers/AccountLines.cpp @@ -20,8 +20,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/src/ripple/rpc/handlers/AccountNamespace.cpp b/src/ripple/rpc/handlers/AccountNamespace.cpp index c7c969867..e401bb67d 100644 --- a/src/ripple/rpc/handlers/AccountNamespace.cpp +++ b/src/ripple/rpc/handlers/AccountNamespace.cpp @@ -20,10 +20,10 @@ #include #include #include -#include #include #include #include +#include #include #include #include diff --git a/src/ripple/rpc/handlers/AccountObjects.cpp b/src/ripple/rpc/handlers/AccountObjects.cpp index d4d6d61e8..6ee530dc7 100644 --- a/src/ripple/rpc/handlers/AccountObjects.cpp +++ b/src/ripple/rpc/handlers/AccountObjects.cpp @@ -20,10 +20,10 @@ #include #include #include -#include #include #include #include +#include #include #include #include diff --git a/src/ripple/rpc/handlers/AccountOffers.cpp b/src/ripple/rpc/handlers/AccountOffers.cpp index 1afd27325..867f888e2 100644 --- a/src/ripple/rpc/handlers/AccountOffers.cpp +++ b/src/ripple/rpc/handlers/AccountOffers.cpp @@ -21,8 +21,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/src/ripple/rpc/handlers/AccountTx.cpp b/src/ripple/rpc/handlers/AccountTx.cpp index 40395aae3..7fe747272 100644 --- a/src/ripple/rpc/handlers/AccountTx.cpp +++ b/src/ripple/rpc/handlers/AccountTx.cpp @@ -28,9 +28,9 @@ #include #include #include -#include #include #include +#include #include #include #include diff --git a/src/ripple/rpc/handlers/BookOffers.cpp b/src/ripple/rpc/handlers/BookOffers.cpp index e85b6029b..e21d7047f 100644 --- a/src/ripple/rpc/handlers/BookOffers.cpp +++ b/src/ripple/rpc/handlers/BookOffers.cpp @@ -21,8 +21,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/src/ripple/rpc/handlers/Catalogue.cpp b/src/ripple/rpc/handlers/Catalogue.cpp index 8ca4425d6..232fe7112 100644 --- a/src/ripple/rpc/handlers/Catalogue.cpp +++ b/src/ripple/rpc/handlers/Catalogue.cpp @@ -24,9 +24,9 @@ #include #include #include -#include #include #include +#include #include #include #include diff --git a/src/ripple/rpc/handlers/Connect.cpp b/src/ripple/rpc/handlers/Connect.cpp index ed366f64b..46fac457c 100644 --- a/src/ripple/rpc/handlers/Connect.cpp +++ b/src/ripple/rpc/handlers/Connect.cpp @@ -19,9 +19,9 @@ #include #include -#include #include #include +#include #include #include #include diff --git a/src/ripple/rpc/handlers/ConsensusInfo.cpp b/src/ripple/rpc/handlers/ConsensusInfo.cpp index f6847e37a..ee7eb10e6 100644 --- a/src/ripple/rpc/handlers/ConsensusInfo.cpp +++ b/src/ripple/rpc/handlers/ConsensusInfo.cpp @@ -20,8 +20,8 @@ #include #include #include -#include #include +#include #include #include diff --git a/src/ripple/rpc/handlers/CrawlShards.cpp b/src/ripple/rpc/handlers/CrawlShards.cpp index 87292e57b..41b74860c 100644 --- a/src/ripple/rpc/handlers/CrawlShards.cpp +++ b/src/ripple/rpc/handlers/CrawlShards.cpp @@ -19,10 +19,10 @@ #include #include -#include #include #include #include +#include #include #include #include diff --git a/src/ripple/rpc/handlers/DepositAuthorized.cpp b/src/ripple/rpc/handlers/DepositAuthorized.cpp index a5c9c9a21..bb6e3b07a 100644 --- a/src/ripple/rpc/handlers/DepositAuthorized.cpp +++ b/src/ripple/rpc/handlers/DepositAuthorized.cpp @@ -18,9 +18,9 @@ //============================================================================== #include -#include #include #include +#include #include #include #include diff --git a/src/ripple/rpc/handlers/DownloadShard.cpp b/src/ripple/rpc/handlers/DownloadShard.cpp index d646379d7..eacf499df 100644 --- a/src/ripple/rpc/handlers/DownloadShard.cpp +++ b/src/ripple/rpc/handlers/DownloadShard.cpp @@ -19,9 +19,9 @@ #include #include -#include #include #include +#include #include #include #include diff --git a/src/ripple/rpc/handlers/Feature1.cpp b/src/ripple/rpc/handlers/Feature1.cpp index 131a1e5d0..94a205e62 100644 --- a/src/ripple/rpc/handlers/Feature1.cpp +++ b/src/ripple/rpc/handlers/Feature1.cpp @@ -20,9 +20,9 @@ #include #include #include -#include #include #include +#include #include #include diff --git a/src/ripple/rpc/handlers/FetchInfo.cpp b/src/ripple/rpc/handlers/FetchInfo.cpp index 13ead3d38..79d82b646 100644 --- a/src/ripple/rpc/handlers/FetchInfo.cpp +++ b/src/ripple/rpc/handlers/FetchInfo.cpp @@ -20,8 +20,8 @@ #include #include #include -#include #include +#include #include #include diff --git a/src/ripple/rpc/handlers/GatewayBalances.cpp b/src/ripple/rpc/handlers/GatewayBalances.cpp index fc6a7b49f..89be6290f 100644 --- a/src/ripple/rpc/handlers/GatewayBalances.cpp +++ b/src/ripple/rpc/handlers/GatewayBalances.cpp @@ -20,10 +20,10 @@ #include #include #include -#include #include #include #include +#include #include #include #include diff --git a/src/ripple/rpc/handlers/GetCounts.cpp b/src/ripple/rpc/handlers/GetCounts.cpp index cf3e72902..131cf7d36 100644 --- a/src/ripple/rpc/handlers/GetCounts.cpp +++ b/src/ripple/rpc/handlers/GetCounts.cpp @@ -26,10 +26,10 @@ #include #include #include -#include #include #include #include +#include #include #include #include diff --git a/src/ripple/rpc/handlers/LedgerAccept.cpp b/src/ripple/rpc/handlers/LedgerAccept.cpp index 3a01a3950..141777911 100644 --- a/src/ripple/rpc/handlers/LedgerAccept.cpp +++ b/src/ripple/rpc/handlers/LedgerAccept.cpp @@ -21,9 +21,9 @@ #include #include #include -#include #include #include +#include #include #include diff --git a/src/ripple/rpc/handlers/LedgerCurrent.cpp b/src/ripple/rpc/handlers/LedgerCurrent.cpp index fa2620642..3539c8009 100644 --- a/src/ripple/rpc/handlers/LedgerCurrent.cpp +++ b/src/ripple/rpc/handlers/LedgerCurrent.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/ripple/rpc/handlers/LedgerEntry.cpp b/src/ripple/rpc/handlers/LedgerEntry.cpp index 17e1e9116..85de54028 100644 --- a/src/ripple/rpc/handlers/LedgerEntry.cpp +++ b/src/ripple/rpc/handlers/LedgerEntry.cpp @@ -23,10 +23,10 @@ #include #include #include -#include #include #include #include +#include #include #include #include diff --git a/src/ripple/rpc/handlers/LedgerRequest.cpp b/src/ripple/rpc/handlers/LedgerRequest.cpp index 88d26176d..83e7a2184 100644 --- a/src/ripple/rpc/handlers/LedgerRequest.cpp +++ b/src/ripple/rpc/handlers/LedgerRequest.cpp @@ -21,8 +21,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/src/ripple/rpc/handlers/LogLevel.cpp b/src/ripple/rpc/handlers/LogLevel.cpp index e84700725..20931898d 100644 --- a/src/ripple/rpc/handlers/LogLevel.cpp +++ b/src/ripple/rpc/handlers/LogLevel.cpp @@ -20,8 +20,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/src/ripple/rpc/handlers/Manifest.cpp b/src/ripple/rpc/handlers/Manifest.cpp index daf6cc226..22abfde8a 100644 --- a/src/ripple/rpc/handlers/Manifest.cpp +++ b/src/ripple/rpc/handlers/Manifest.cpp @@ -20,8 +20,8 @@ #include #include #include -#include #include +#include #include #include diff --git a/src/ripple/rpc/handlers/NFTOffers.cpp b/src/ripple/rpc/handlers/NFTOffers.cpp index 69a090e27..bca862d27 100644 --- a/src/ripple/rpc/handlers/NFTOffers.cpp +++ b/src/ripple/rpc/handlers/NFTOffers.cpp @@ -21,8 +21,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/src/ripple/rpc/handlers/NoRippleCheck.cpp b/src/ripple/rpc/handlers/NoRippleCheck.cpp index 1942372f3..91d69df96 100644 --- a/src/ripple/rpc/handlers/NoRippleCheck.cpp +++ b/src/ripple/rpc/handlers/NoRippleCheck.cpp @@ -21,8 +21,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/src/ripple/rpc/handlers/NodeToShard.cpp b/src/ripple/rpc/handlers/NodeToShard.cpp index fd48797cb..552900d15 100644 --- a/src/ripple/rpc/handlers/NodeToShard.cpp +++ b/src/ripple/rpc/handlers/NodeToShard.cpp @@ -20,9 +20,9 @@ #include #include #include -#include #include #include +#include #include #include diff --git a/src/ripple/rpc/handlers/OwnerInfo.cpp b/src/ripple/rpc/handlers/OwnerInfo.cpp index 2bd9f258d..546a2e709 100644 --- a/src/ripple/rpc/handlers/OwnerInfo.cpp +++ b/src/ripple/rpc/handlers/OwnerInfo.cpp @@ -20,8 +20,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/src/ripple/rpc/handlers/PathFind.cpp b/src/ripple/rpc/handlers/PathFind.cpp index 6c3a27302..9c8794b59 100644 --- a/src/ripple/rpc/handlers/PathFind.cpp +++ b/src/ripple/rpc/handlers/PathFind.cpp @@ -21,8 +21,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/src/ripple/rpc/handlers/PayChanClaim.cpp b/src/ripple/rpc/handlers/PayChanClaim.cpp index f0c7f40c9..3fbf831a6 100644 --- a/src/ripple/rpc/handlers/PayChanClaim.cpp +++ b/src/ripple/rpc/handlers/PayChanClaim.cpp @@ -20,9 +20,9 @@ #include #include #include -#include #include #include +#include #include #include #include diff --git a/src/ripple/rpc/handlers/Peers.cpp b/src/ripple/rpc/handlers/Peers.cpp index d617da737..4f377da72 100644 --- a/src/ripple/rpc/handlers/Peers.cpp +++ b/src/ripple/rpc/handlers/Peers.cpp @@ -19,10 +19,10 @@ #include #include -#include #include #include #include +#include #include #include diff --git a/src/ripple/rpc/handlers/Random.cpp b/src/ripple/rpc/handlers/Random.cpp index 35120c484..536296966 100644 --- a/src/ripple/rpc/handlers/Random.cpp +++ b/src/ripple/rpc/handlers/Random.cpp @@ -21,8 +21,8 @@ #include #include #include -#include #include +#include #include namespace ripple { diff --git a/src/ripple/rpc/handlers/Reservations.cpp b/src/ripple/rpc/handlers/Reservations.cpp index 0d4ad65eb..ffbfd0f98 100644 --- a/src/ripple/rpc/handlers/Reservations.cpp +++ b/src/ripple/rpc/handlers/Reservations.cpp @@ -18,9 +18,9 @@ //============================================================================== #include -#include #include #include +#include #include #include #include diff --git a/src/ripple/rpc/handlers/RipplePathFind.cpp b/src/ripple/rpc/handlers/RipplePathFind.cpp index 5e23a47bd..19bce9984 100644 --- a/src/ripple/rpc/handlers/RipplePathFind.cpp +++ b/src/ripple/rpc/handlers/RipplePathFind.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/ripple/rpc/handlers/ServerDefinitions.cpp b/src/ripple/rpc/handlers/ServerDefinitions.cpp index 652fc42ca..bcc669d31 100644 --- a/src/ripple/rpc/handlers/ServerDefinitions.cpp +++ b/src/ripple/rpc/handlers/ServerDefinitions.cpp @@ -25,8 +25,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/src/ripple/rpc/handlers/ServerInfo.cpp b/src/ripple/rpc/handlers/ServerInfo.cpp index a31e57e67..17c45a1fd 100644 --- a/src/ripple/rpc/handlers/ServerInfo.cpp +++ b/src/ripple/rpc/handlers/ServerInfo.cpp @@ -21,8 +21,9 @@ #include #include #include -#include +#include #include +#include #include #include #include diff --git a/src/ripple/rpc/handlers/ServerState.cpp b/src/ripple/rpc/handlers/ServerState.cpp index bc7cc8fcd..05d408a72 100644 --- a/src/ripple/rpc/handlers/ServerState.cpp +++ b/src/ripple/rpc/handlers/ServerState.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/ripple/rpc/handlers/Submit.cpp b/src/ripple/rpc/handlers/Submit.cpp index fe911059d..656c0e9a1 100644 --- a/src/ripple/rpc/handlers/Submit.cpp +++ b/src/ripple/rpc/handlers/Submit.cpp @@ -22,8 +22,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/src/ripple/rpc/handlers/Subscribe.cpp b/src/ripple/rpc/handlers/Subscribe.cpp index 40dbd33b9..0bbb8ad13 100644 --- a/src/ripple/rpc/handlers/Subscribe.cpp +++ b/src/ripple/rpc/handlers/Subscribe.cpp @@ -22,9 +22,9 @@ #include #include #include -#include #include #include +#include #include #include #include diff --git a/src/ripple/rpc/handlers/Tx.cpp b/src/ripple/rpc/handlers/Tx.cpp index f13aeb7e7..17a6c67ff 100644 --- a/src/ripple/rpc/handlers/Tx.cpp +++ b/src/ripple/rpc/handlers/Tx.cpp @@ -24,9 +24,9 @@ #include #include #include -#include #include #include +#include #include #include #include diff --git a/src/ripple/rpc/handlers/TxHistory.cpp b/src/ripple/rpc/handlers/TxHistory.cpp index 0f3e353fc..8759d4af1 100644 --- a/src/ripple/rpc/handlers/TxHistory.cpp +++ b/src/ripple/rpc/handlers/TxHistory.cpp @@ -25,8 +25,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/src/ripple/rpc/handlers/UnlList.cpp b/src/ripple/rpc/handlers/UnlList.cpp index b3beca283..0dc4dfc37 100644 --- a/src/ripple/rpc/handlers/UnlList.cpp +++ b/src/ripple/rpc/handlers/UnlList.cpp @@ -19,8 +19,8 @@ #include #include -#include #include +#include #include #include diff --git a/src/ripple/rpc/handlers/Unsubscribe.cpp b/src/ripple/rpc/handlers/Unsubscribe.cpp index 4df234cd2..b02b9c0bf 100644 --- a/src/ripple/rpc/handlers/Unsubscribe.cpp +++ b/src/ripple/rpc/handlers/Unsubscribe.cpp @@ -19,8 +19,8 @@ #include #include -#include #include +#include #include #include #include diff --git a/src/ripple/rpc/handlers/ValidationCreate.cpp b/src/ripple/rpc/handlers/ValidationCreate.cpp index ae1ee33d4..f07cbe9cd 100644 --- a/src/ripple/rpc/handlers/ValidationCreate.cpp +++ b/src/ripple/rpc/handlers/ValidationCreate.cpp @@ -18,8 +18,8 @@ //============================================================================== #include -#include #include +#include #include #include #include diff --git a/src/ripple/rpc/handlers/ValidatorListSites.cpp b/src/ripple/rpc/handlers/ValidatorListSites.cpp index 81972c5a2..4800a5e86 100644 --- a/src/ripple/rpc/handlers/ValidatorListSites.cpp +++ b/src/ripple/rpc/handlers/ValidatorListSites.cpp @@ -19,8 +19,8 @@ #include #include -#include #include +#include #include namespace ripple { diff --git a/src/ripple/rpc/handlers/Validators.cpp b/src/ripple/rpc/handlers/Validators.cpp index bce9a311d..39306612b 100644 --- a/src/ripple/rpc/handlers/Validators.cpp +++ b/src/ripple/rpc/handlers/Validators.cpp @@ -19,8 +19,8 @@ #include #include -#include #include +#include #include namespace ripple { diff --git a/src/ripple/rpc/handlers/WalletPropose.cpp b/src/ripple/rpc/handlers/WalletPropose.cpp index 624c5c83c..25aaa3bbb 100644 --- a/src/ripple/rpc/handlers/WalletPropose.cpp +++ b/src/ripple/rpc/handlers/WalletPropose.cpp @@ -18,10 +18,10 @@ //============================================================================== #include -#include #include #include #include +#include #include #include #include diff --git a/src/ripple/rpc/impl/DeliveredAmount.cpp b/src/ripple/rpc/impl/DeliveredAmount.cpp index 418a5aa20..eda7bd63e 100644 --- a/src/ripple/rpc/impl/DeliveredAmount.cpp +++ b/src/ripple/rpc/impl/DeliveredAmount.cpp @@ -23,9 +23,9 @@ #include #include #include -#include #include #include +#include #include #include #include diff --git a/src/ripple/rpc/impl/RPCHandler.cpp b/src/ripple/rpc/impl/RPCHandler.cpp index c7984f830..9c5aa6d46 100644 --- a/src/ripple/rpc/impl/RPCHandler.cpp +++ b/src/ripple/rpc/impl/RPCHandler.cpp @@ -31,8 +31,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/src/ripple/rpc/impl/RPCHelpers.cpp b/src/ripple/rpc/impl/RPCHelpers.cpp index 3234983fd..f1afec592 100644 --- a/src/ripple/rpc/impl/RPCHelpers.cpp +++ b/src/ripple/rpc/impl/RPCHelpers.cpp @@ -25,9 +25,9 @@ #include #include #include -#include #include #include +#include #include #include #include diff --git a/src/ripple/rpc/impl/ServerHandler.cpp b/src/ripple/rpc/impl/ServerHandler.cpp index 36ed3d75f..5aa32b8ce 100644 --- a/src/ripple/rpc/impl/ServerHandler.cpp +++ b/src/ripple/rpc/impl/ServerHandler.cpp @@ -31,9 +31,9 @@ #include #include #include -#include #include #include +#include #include #include #include diff --git a/src/ripple/rpc/impl/TransactionSign.cpp b/src/ripple/rpc/impl/TransactionSign.cpp index a80ae4b15..3f4407c86 100644 --- a/src/ripple/rpc/impl/TransactionSign.cpp +++ b/src/ripple/rpc/impl/TransactionSign.cpp @@ -29,9 +29,9 @@ #include #include #include -#include #include #include +#include #include #include #include