From b39f06fb3c21bc0815460f41961415a1beb1b65b Mon Sep 17 00:00:00 2001 From: Michael Legleux Date: Tue, 5 Mar 2024 19:11:27 -0800 Subject: [PATCH 1/9] Relocate RPCErr to ripple/protocol Adds STCurrency.h to libxrpl for Clio Fixes PR #4885 botched by force push --- .github/workflows/windows.yml | 6 +- Builds/CMake/RippledCore.cmake | 134 ++++++++++-------- conanfile.py | 6 +- src/ripple/app/misc/NetworkOPs.cpp | 2 +- src/ripple/app/paths/PathRequest.cpp | 2 +- src/ripple/app/paths/PathRequests.cpp | 2 +- src/ripple/net/impl/RPCCall.cpp | 2 +- src/ripple/{net => protocol}/RPCErr.h | 0 src/ripple/protocol/impl/BuildInfo.cpp | 2 +- src/ripple/{net => protocol}/impl/RPCErr.cpp | 2 +- src/ripple/rpc/handlers/AMMInfo.cpp | 2 +- src/ripple/rpc/handlers/AccountChannels.cpp | 2 +- .../rpc/handlers/AccountCurrenciesHandler.cpp | 2 +- src/ripple/rpc/handlers/AccountLines.cpp | 2 +- src/ripple/rpc/handlers/AccountObjects.cpp | 2 +- src/ripple/rpc/handlers/AccountOffers.cpp | 2 +- src/ripple/rpc/handlers/AccountTx.cpp | 2 +- src/ripple/rpc/handlers/BookOffers.cpp | 2 +- src/ripple/rpc/handlers/Connect.cpp | 2 +- src/ripple/rpc/handlers/ConsensusInfo.cpp | 2 +- src/ripple/rpc/handlers/CrawlShards.cpp | 2 +- src/ripple/rpc/handlers/DepositAuthorized.cpp | 2 +- src/ripple/rpc/handlers/DownloadShard.cpp | 2 +- src/ripple/rpc/handlers/Feature1.cpp | 2 +- src/ripple/rpc/handlers/FetchInfo.cpp | 2 +- src/ripple/rpc/handlers/GatewayBalances.cpp | 2 +- src/ripple/rpc/handlers/GetCounts.cpp | 2 +- src/ripple/rpc/handlers/LedgerAccept.cpp | 2 +- src/ripple/rpc/handlers/LedgerCurrent.cpp | 2 +- src/ripple/rpc/handlers/LedgerEntry.cpp | 2 +- src/ripple/rpc/handlers/LedgerRequest.cpp | 2 +- src/ripple/rpc/handlers/LogLevel.cpp | 2 +- src/ripple/rpc/handlers/Manifest.cpp | 2 +- src/ripple/rpc/handlers/NFTOffers.cpp | 2 +- src/ripple/rpc/handlers/NoRippleCheck.cpp | 2 +- src/ripple/rpc/handlers/NodeToShard.cpp | 2 +- src/ripple/rpc/handlers/OwnerInfo.cpp | 2 +- src/ripple/rpc/handlers/PathFind.cpp | 2 +- src/ripple/rpc/handlers/PayChanClaim.cpp | 2 +- src/ripple/rpc/handlers/Peers.cpp | 2 +- src/ripple/rpc/handlers/Random.cpp | 2 +- src/ripple/rpc/handlers/Reservations.cpp | 2 +- src/ripple/rpc/handlers/RipplePathFind.cpp | 2 +- src/ripple/rpc/handlers/ServerInfo.cpp | 2 +- src/ripple/rpc/handlers/ServerState.cpp | 2 +- src/ripple/rpc/handlers/Submit.cpp | 2 +- src/ripple/rpc/handlers/Subscribe.cpp | 2 +- src/ripple/rpc/handlers/Tx.cpp | 2 +- src/ripple/rpc/handlers/TxHistory.cpp | 2 +- src/ripple/rpc/handlers/UnlList.cpp | 2 +- src/ripple/rpc/handlers/Unsubscribe.cpp | 2 +- src/ripple/rpc/handlers/ValidationCreate.cpp | 2 +- .../rpc/handlers/ValidatorListSites.cpp | 2 +- src/ripple/rpc/handlers/Validators.cpp | 2 +- src/ripple/rpc/handlers/WalletPropose.cpp | 2 +- src/ripple/rpc/impl/DeliveredAmount.cpp | 2 +- src/ripple/rpc/impl/RPCHandler.cpp | 2 +- src/ripple/rpc/impl/RPCHelpers.cpp | 2 +- src/ripple/rpc/impl/ServerHandler.cpp | 2 +- src/ripple/rpc/impl/TransactionSign.cpp | 2 +- 60 files changed, 141 insertions(+), 117 deletions(-) rename src/ripple/{net => protocol}/RPCErr.h (100%) rename src/ripple/{net => protocol}/impl/RPCErr.cpp (97%) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index e0663b3d18d..7286d2f1f34 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -91,7 +91,11 @@ jobs: # Hard code for now. Move to the matrix if varied options are needed cmake-args: '-Dassert=ON -Dreporting=OFF -Dunity=ON' cmake-target: install - - name: test + - name: test (permitted to silently fail) shell: bash + # Github runners are resource limited, which causes unit tests to fail + # (e.g. OOM). To allow forward progress until self-hosted runners are + # up and running reliably, allow the job to succeed even if tests fail. + continue-on-error: true run: | ${build_dir}/${{ matrix.configuration }}/rippled --unittest --unittest-jobs $(nproc) diff --git a/Builds/CMake/RippledCore.cmake b/Builds/CMake/RippledCore.cmake index efe44f820df..77fbfe5969a 100644 --- a/Builds/CMake/RippledCore.cmake +++ b/Builds/CMake/RippledCore.cmake @@ -89,6 +89,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 @@ -159,54 +160,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 @@ -231,11 +232,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 @@ -251,93 +247,116 @@ 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/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/Charge.cpp + src/ripple/resource/impl/Consumer.cpp + src/ripple/resource/impl/Entry.h + src/ripple/resource/impl/Fees.cpp + 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/ResourceManager.cpp + 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/Door.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/BaseWSPeer.h + src/ripple/server/impl/Door.h + src/ripple/server/impl/JSONRPCUtil.cpp + 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/Port.cpp + 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 @@ -362,15 +381,16 @@ install ( src/ripple/beast/hash/xxhasher.h DESTINATION include/ripple/beast/hash) install ( - FILES src/ripple/beast/hash/impl/xxhash.h + FILES + src/ripple/beast/hash/impl/xxhash.h 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 @@ -390,9 +410,9 @@ install ( 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 ( @@ -403,9 +423,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/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 @@ -421,9 +442,9 @@ if (tests) 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/extras/unit_test) install ( @@ -643,7 +664,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/conanfile.py b/conanfile.py index d9e2a0ae7c4..c789cacf568 100644 --- a/conanfile.py +++ b/conanfile.py @@ -147,9 +147,9 @@ def package(self): def package_info(self): libxrpl = self.cpp_info.components['libxrpl'] libxrpl.libs = [ - 'xrpl_core', - 'ed25519', - 'secp256k1', + 'libxrpl_core.a', + 'libed25519.a', + 'libsecp256k1.a', ] # TODO: Fix the protobufs to include each other relative to # `include/`, not `include/ripple/proto/`. diff --git a/src/ripple/app/misc/NetworkOPs.cpp b/src/ripple/app/misc/NetworkOPs.cpp index 73912089f80..3bd67423571 100644 --- a/src/ripple/app/misc/NetworkOPs.cpp +++ b/src/ripple/app/misc/NetworkOPs.cpp @@ -54,13 +54,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 f2aa363f934..948c6698ad1 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 ac051e5f0c5..700cf137209 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 4e3e6c09fc4..8537f76b703 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/protocol/impl/BuildInfo.cpp b/src/ripple/protocol/impl/BuildInfo.cpp index c1907a2e1a6..5a09af10bde 100644 --- a/src/ripple/protocol/impl/BuildInfo.cpp +++ b/src/ripple/protocol/impl/BuildInfo.cpp @@ -33,7 +33,7 @@ namespace BuildInfo { // and follow the format described at http://semver.org/ //------------------------------------------------------------------------------ // clang-format off -char const* const versionString = "2.2.0-b1" +char const* const versionString = "2.2.0-b2" // clang-format on #if defined(DEBUG) || defined(SANITIZER) 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 8af2a248c2f..ec0474fe8b0 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 c6711fa7b82..b240c8c2ae6 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 8f39bef164d..ebd89b04418 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 64956a7d0ad..45dc8b545ca 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 f30a5d4b0a7..3bfcd225b14 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/AccountObjects.cpp b/src/ripple/rpc/handlers/AccountObjects.cpp index bbf5b6e126a..2531cd03115 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 1afd2732550..867f888e241 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 40395aae32f..7fe7472721f 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 e85b6029ba6..e21d7047f69 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/Connect.cpp b/src/ripple/rpc/handlers/Connect.cpp index ed366f64b2b..46fac457cb8 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 f6847e37afd..ee7eb10e684 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 87292e57b93..41b74860c3a 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 a5c9c9a21fe..bb6e3b07a9a 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 d646379d75f..eacf499df04 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 131a1e5d073..94a205e62f7 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 13ead3d3886..79d82b646a0 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 fc6a7b49fd8..89be6290f77 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 cf3e7290202..131cf7d3614 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 3a01a3950e1..14177791164 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 fa2620642ff..3539c800946 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 de106841ae6..dfbc32e606a 100644 --- a/src/ripple/rpc/handlers/LedgerEntry.cpp +++ b/src/ripple/rpc/handlers/LedgerEntry.cpp @@ -23,9 +23,9 @@ #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 88d26176ddc..83e7a2184f1 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 e847007254c..20931898d20 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 daf6cc22661..22abfde8a24 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 69a090e27ec..bca862d27e3 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 1942372f3e3..91d69df96bd 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 fd48797cb2f..552900d1548 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 2bd9f258da8..546a2e70980 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 6c3a27302ac..9c8794b5997 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 ca3e8c63c6d..33561463f21 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 d617da737ea..4f377da7277 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 35120c48452..5362969660a 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 0d4ad65ebb7..ffbfd0f98bf 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 5e23a47bd52..19bce998494 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/ServerInfo.cpp b/src/ripple/rpc/handlers/ServerInfo.cpp index a96df1f3f13..83c73e20558 100644 --- a/src/ripple/rpc/handlers/ServerInfo.cpp +++ b/src/ripple/rpc/handlers/ServerInfo.cpp @@ -22,8 +22,8 @@ #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 d974e7391f7..756a3953968 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 b5577ecb576..a151778fbb8 100644 --- a/src/ripple/rpc/handlers/Submit.cpp +++ b/src/ripple/rpc/handlers/Submit.cpp @@ -21,8 +21,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 e48cfe5049a..24465a2c3a5 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 0237fef22ac..d4c9c95a341 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 0f3e353fcbc..8759d4af1b9 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 b3beca28307..0dc4dfc3776 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 8a606a26dca..512790f2a10 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 ae1ee33d4c6..f07cbe9cdfa 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 81972c5a2d4..4800a5e8661 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 bce9a311d13..39306612bdf 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 624c5c83c2b..25aaa3bbb8e 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 03a36b9a15f..59316d91cf5 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 c7984f8309c..9c5aa6d465b 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 449586d7b99..58503b0bf4e 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 424f2f8d001..cd18306fff6 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 a80ae4b150e..3f4407c86e7 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 From 626dc610c38480b51f2f4bcadb5e4e03f013cf37 Mon Sep 17 00:00:00 2001 From: Michael Legleux Date: Wed, 6 Mar 2024 14:09:52 -0800 Subject: [PATCH 2/9] Conan libraries without "lib" prefix and "a" suffix --- conanfile.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conanfile.py b/conanfile.py index c789cacf568..d9e2a0ae7c4 100644 --- a/conanfile.py +++ b/conanfile.py @@ -147,9 +147,9 @@ def package(self): def package_info(self): libxrpl = self.cpp_info.components['libxrpl'] libxrpl.libs = [ - 'libxrpl_core.a', - 'libed25519.a', - 'libsecp256k1.a', + 'xrpl_core', + 'ed25519', + 'secp256k1', ] # TODO: Fix the protobufs to include each other relative to # `include/`, not `include/ripple/proto/`. From ca8f0a074de0f3ec3f397d99f9cfd272a90c5279 Mon Sep 17 00:00:00 2001 From: Michael Legleux Date: Wed, 6 Mar 2024 16:36:46 -0800 Subject: [PATCH 3/9] rm .cpp files --- Builds/CMake/RippledCore.cmake | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Builds/CMake/RippledCore.cmake b/Builds/CMake/RippledCore.cmake index 77fbfe5969a..2967d5f749d 100644 --- a/Builds/CMake/RippledCore.cmake +++ b/Builds/CMake/RippledCore.cmake @@ -320,15 +320,11 @@ install ( DESTINATION include/ripple/resource) install ( FILES - src/ripple/resource/impl/Charge.cpp - src/ripple/resource/impl/Consumer.cpp src/ripple/resource/impl/Entry.h - src/ripple/resource/impl/Fees.cpp 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/ResourceManager.cpp src/ripple/resource/impl/Tuning.h DESTINATION include/ripple/resource/impl) install ( @@ -347,12 +343,10 @@ install ( src/ripple/server/impl/BasePeer.h src/ripple/server/impl/BaseWSPeer.h src/ripple/server/impl/Door.h - src/ripple/server/impl/JSONRPCUtil.cpp 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/Port.cpp src/ripple/server/impl/ServerImpl.h src/ripple/server/impl/SSLHTTPPeer.h src/ripple/server/impl/SSLWSPeer.h @@ -404,7 +398,6 @@ 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 From ee774a897371807bfcb5df442d32cbc2a6601b87 Mon Sep 17 00:00:00 2001 From: Michael Legleux Date: Thu, 7 Mar 2024 10:52:08 -0800 Subject: [PATCH 4/9] Don't allow windows to fail --- .github/workflows/windows.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 7286d2f1f34..e0663b3d18d 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -91,11 +91,7 @@ jobs: # Hard code for now. Move to the matrix if varied options are needed cmake-args: '-Dassert=ON -Dreporting=OFF -Dunity=ON' cmake-target: install - - name: test (permitted to silently fail) + - name: test shell: bash - # Github runners are resource limited, which causes unit tests to fail - # (e.g. OOM). To allow forward progress until self-hosted runners are - # up and running reliably, allow the job to succeed even if tests fail. - continue-on-error: true run: | ${build_dir}/${{ matrix.configuration }}/rippled --unittest --unittest-jobs $(nproc) From fc179cc594fb6159c2942796f471c806ad9e1665 Mon Sep 17 00:00:00 2001 From: Michael Legleux Date: Thu, 7 Mar 2024 14:58:57 -0800 Subject: [PATCH 5/9] Revert version bump --- src/ripple/protocol/impl/BuildInfo.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ripple/protocol/impl/BuildInfo.cpp b/src/ripple/protocol/impl/BuildInfo.cpp index 5a09af10bde..c1907a2e1a6 100644 --- a/src/ripple/protocol/impl/BuildInfo.cpp +++ b/src/ripple/protocol/impl/BuildInfo.cpp @@ -33,7 +33,7 @@ namespace BuildInfo { // and follow the format described at http://semver.org/ //------------------------------------------------------------------------------ // clang-format off -char const* const versionString = "2.2.0-b2" +char const* const versionString = "2.2.0-b1" // clang-format on #if defined(DEBUG) || defined(SANITIZER) From 6dc5f457ed56065a98a1aa4f6256d93d9631a348 Mon Sep 17 00:00:00 2001 From: Michael Legleux Date: Tue, 12 Mar 2024 10:55:29 -0700 Subject: [PATCH 6/9] Remove redundant installs --- Builds/CMake/RippledCore.cmake | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/Builds/CMake/RippledCore.cmake b/Builds/CMake/RippledCore.cmake index 2967d5f749d..2e2fc830068 100644 --- a/Builds/CMake/RippledCore.cmake +++ b/Builds/CMake/RippledCore.cmake @@ -417,7 +417,6 @@ install ( src/ripple/beast/utility/Journal.h src/ripple/beast/utility/PropertyStream.h src/ripple/beast/utility/WrappedSink.h - src/ripple/beast/utility/WrappedSink.h src/ripple/beast/utility/Zero.h src/ripple/beast/utility/rngfill.h DESTINATION include/ripple/beast/utility) @@ -425,21 +424,6 @@ install ( # (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_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/extras/unit_test) install ( FILES src/ripple/beast/unit_test/detail/const_container.hpp From b8f55c84e0ecea6629dd38b6ecf9336e009db497 Mon Sep 17 00:00:00 2001 From: Michael Legleux Date: Wed, 13 Mar 2024 00:09:07 -0700 Subject: [PATCH 7/9] rm const_container.hpp and comment --- Builds/CMake/RippledCore.cmake | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Builds/CMake/RippledCore.cmake b/Builds/CMake/RippledCore.cmake index 2e2fc830068..888dfa93e8f 100644 --- a/Builds/CMake/RippledCore.cmake +++ b/Builds/CMake/RippledCore.cmake @@ -420,15 +420,6 @@ install ( src/ripple/beast/utility/Zero.h src/ripple/beast/utility/rngfill.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/detail/const_container.hpp - DESTINATION include/ripple/beast/unit_test/detail) -endif () #tests #[===================================================================[ rippled executable #]===================================================================] From d98581023d8540d3e1dbff4e45c203f97efa24ed Mon Sep 17 00:00:00 2001 From: Michael Legleux Date: Wed, 13 Mar 2024 15:29:29 -0700 Subject: [PATCH 8/9] rm const_container.hpp --- Builds/CMake/RippledCore.cmake | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Builds/CMake/RippledCore.cmake b/Builds/CMake/RippledCore.cmake index 75550d89ed8..2a76da0f755 100644 --- a/Builds/CMake/RippledCore.cmake +++ b/Builds/CMake/RippledCore.cmake @@ -404,10 +404,6 @@ install ( src/ripple/beast/unit_test/suite.hpp src/ripple/beast/unit_test/thread.hpp DESTINATION include/ripple/beast/unit_test) -install ( - FILES - src/ripple/beast/unit_test/detail/const_container.hpp - DESTINATION include/ripple/beast/unit_test/detail) install ( FILES src/ripple/beast/utility/Journal.h From 85d1c3a8c18ed9b10d4569faaa0c27357054c72f Mon Sep 17 00:00:00 2001 From: Michael Legleux Date: Wed, 13 Mar 2024 15:56:34 -0700 Subject: [PATCH 9/9] un rm const_container.hpp --- Builds/CMake/RippledCore.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Builds/CMake/RippledCore.cmake b/Builds/CMake/RippledCore.cmake index 2a76da0f755..75550d89ed8 100644 --- a/Builds/CMake/RippledCore.cmake +++ b/Builds/CMake/RippledCore.cmake @@ -404,6 +404,10 @@ install ( src/ripple/beast/unit_test/suite.hpp src/ripple/beast/unit_test/thread.hpp DESTINATION include/ripple/beast/unit_test) +install ( + FILES + src/ripple/beast/unit_test/detail/const_container.hpp + DESTINATION include/ripple/beast/unit_test/detail) install ( FILES src/ripple/beast/utility/Journal.h