Relocate RPCErr to ripple/protocol

Adds STCurrency.h to libxrpl for Clio Fixes PR XRPLF#4885 botched by force push
legleux · Mar 6, 2024 · b39f06f · b39f06f
1 parent 22b7518
commit b39f06f
Show file tree

Hide file tree

Showing 60 changed files with 141 additions and 117 deletions.
diff --git 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
@@ -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
@@ -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
@@ -54,13 +54,13 @@
 #include <ripple/crypto/csprng.h>
 #include <ripple/json/MultivarJson.h>
 #include <ripple/json/to_string.h>
-#include <ripple/net/RPCErr.h>
 #include <ripple/nodestore/DatabaseShard.h>
 #include <ripple/overlay/Cluster.h>
 #include <ripple/overlay/Overlay.h>
 #include <ripple/overlay/predicates.h>
 #include <ripple/protocol/BuildInfo.h>
 #include <ripple/protocol/Feature.h>
+#include <ripple/protocol/RPCErr.h>
 #include <ripple/protocol/STParsedJSON.h>
 #include <ripple/protocol/jss.h>
 #include <ripple/resource/Fees.h>

diff --git a/src/ripple/app/paths/PathRequest.cpp b/src/ripple/app/paths/PathRequest.cpp
@@ -28,8 +28,8 @@
 #include <ripple/basics/Log.h>
 #include <ripple/beast/core/LexicalCast.h>
 #include <ripple/core/Config.h>
-#include <ripple/net/RPCErr.h>
 #include <ripple/protocol/ErrorCodes.h>
+#include <ripple/protocol/RPCErr.h>
 #include <ripple/protocol/UintTypes.h>
 
 #include <ripple/rpc/impl/Tuning.h>

diff --git a/src/ripple/app/paths/PathRequests.cpp b/src/ripple/app/paths/PathRequests.cpp
@@ -22,8 +22,8 @@
 #include <ripple/app/paths/PathRequests.h>
 #include <ripple/basics/Log.h>
 #include <ripple/core/JobQueue.h>
-#include <ripple/net/RPCErr.h>
 #include <ripple/protocol/ErrorCodes.h>
+#include <ripple/protocol/RPCErr.h>
 #include <ripple/protocol/jss.h>
 #include <ripple/resource/Fees.h>
 #include <algorithm>

diff --git a/src/ripple/net/impl/RPCCall.cpp b/src/ripple/net/impl/RPCCall.cpp
@@ -30,9 +30,9 @@
 #include <ripple/json/to_string.h>
 #include <ripple/net/HTTPClient.h>
 #include <ripple/net/RPCCall.h>
-#include <ripple/net/RPCErr.h>
 #include <ripple/protocol/ErrorCodes.h>
 #include <ripple/protocol/Feature.h>
+#include <ripple/protocol/RPCErr.h>
 #include <ripple/protocol/SystemParameters.h>
 #include <ripple/protocol/UintTypes.h>
 #include <ripple/protocol/jss.h>

diff --git a/src/ripple/net/RPCErr.h → src/ripple/protocol/RPCErr.h b/src/ripple/net/RPCErr.h → src/ripple/protocol/RPCErr.h
diff --git 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 → src/ripple/protocol/impl/RPCErr.cpp b/src/ripple/net/impl/RPCErr.cpp → src/ripple/protocol/impl/RPCErr.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/net/RPCErr.h>
 #include <ripple/protocol/ErrorCodes.h>
+#include <ripple/protocol/RPCErr.h>
 
 namespace ripple {