diff --git a/.clang-format b/.clang-format index ba409869bd3..0b1b4efea07 100644 --- a/.clang-format +++ b/.clang-format @@ -45,9 +45,11 @@ DisableFormat: false ExperimentalAutoDetectBinPacking: false ForEachMacros: [ Q_FOREACH, BOOST_FOREACH ] IncludeCategories: - - Regex: '^<(BeastConfig)' + - Regex: '^<(test)/' Priority: 0 - - Regex: '^<(ripple)/' + - Regex: '^<(xrpld)/' + Priority: 1 + - Regex: '^<(xrpl)/' Priority: 2 - Regex: '^<(boost)/' Priority: 3 diff --git a/.codecov.yml b/.codecov.yml index 3e6f09d58ae..6df3786197f 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -33,5 +33,5 @@ slack_app: false ignore: - "src/test/" - - "src/ripple/beast/test/" - - "src/ripple/beast/unit_test/" + - "include/xrpl/beast/test/" + - "include/xrpl/beast/unit_test/" diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index de2d90d36ec..514f90fc5f5 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -6,3 +6,7 @@ e2384885f5f630c8f0ffe4bf21a169b433a16858 241b9ddde9e11beb7480600fd5ed90e1ef109b21 760f16f56835663d9286bd29294d074de26a7ba6 0eebe6a5f4246fced516d52b83ec4e7f47373edd +2189cc950c0cebb89e4e2fa3b2d8817205bf7cef +b9d007813378ad0ff45660dc07285b823c7e9855 +fe9a5365b8a52d4acc42eb27369247e6f238a4f9 +9a93577314e6a8d4b4a8368cc9d2b15a5d8303e8 diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index 79bbe9af075..6714369155f 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -20,6 +20,8 @@ runs: ${{ inputs.generator && format('-G "{0}"', inputs.generator) || '' }} \ -DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake \ -DCMAKE_BUILD_TYPE=${{ inputs.configuration }} \ + -Dtests=TRUE \ + -Dxrpld=TRUE \ ${{ inputs.cmake-args }} \ .. - name: build diff --git a/.github/actions/dependencies/action.yml b/.github/actions/dependencies/action.yml index d9687ff121e..50e2999018a 100644 --- a/.github/actions/dependencies/action.yml +++ b/.github/actions/dependencies/action.yml @@ -50,6 +50,8 @@ runs: conan install \ --output-folder . \ --build missing \ + --options tests=True \ + --options xrpld=True \ --settings build_type=${{ inputs.configuration }} \ .. - name: upload dependencies to remote diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml index 8c915ec00ff..e86b7b257a5 100644 --- a/.github/workflows/clang-format.yml +++ b/.github/workflows/clang-format.yml @@ -19,10 +19,8 @@ jobs: wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add sudo apt-get update sudo apt-get install clang-format-${CLANG_VERSION} - - name: Format src/ripple - run: find src/ripple -type f \( -name '*.cpp' -o -name '*.h' -o -name '*.ipp' \) -print0 | xargs -0 clang-format-${CLANG_VERSION} -i - - name: Format src/test - run: find src/test -type f \( -name '*.cpp' -o -name '*.h' -o -name '*.ipp' \) -print0 | xargs -0 clang-format-${CLANG_VERSION} -i + - name: Format sources + run: find include src -type f \( -name '*.cpp' -o -name '*.h' -o -name '*.ipp' \) -exec clang-format-${CLANG_VERSION} -i {} + - name: Check for differences id: assert run: | diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index da61963b3f2..6b8261c5d69 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -222,7 +222,7 @@ jobs: - name: upload coverage report uses: wandalen/wretry.action@v1.4.10 with: - action: codecov/codecov-action@v4.3.0 + action: codecov/codecov-action@v4.5.0 with: | files: coverage.xml fail_ci_if_error: true @@ -232,3 +232,53 @@ jobs: token: ${{ secrets.CODECOV_TOKEN }} attempt_limit: 5 attempt_delay: 210000 # in milliseconds + + conan: + needs: dependencies + runs-on: [self-hosted, heavy] + container: rippleci/rippled-build-ubuntu:aaf5e3e + env: + build_dir: .build + configuration: Release + steps: + - name: download cache + uses: actions/download-artifact@v3 + with: + name: linux-gcc-${{ env.configuration }} + - name: extract cache + run: | + mkdir -p ~/.conan + tar -xzf conan.tar -C ~/.conan + - name: check environment + run: | + env | sort + echo ${PATH} | tr ':' '\n' + conan --version + cmake --version + - name: checkout + uses: actions/checkout@v4 + - name: dependencies + uses: ./.github/actions/dependencies + env: + CONAN_URL: http://18.143.149.228:8081/artifactory/api/conan/conan-non-prod + with: + configuration: ${{ env.configuration }} + - name: export + run: | + version=$(conan inspect --raw version .) + reference="xrpl/${version}@local/test" + conan remove -f ${reference} || true + conan export . local/test + echo "reference=${reference}" >> "${GITHUB_ENV}" + - name: build + run: | + cd examples/example + mkdir ${build_dir} + cd ${build_dir} + conan install .. --output-folder . \ + --require-override ${reference} --build missing + cmake .. \ + -DCMAKE_TOOLCHAIN_FILE:FILEPATH=./build/${configuration}/generators/conan_toolchain.cmake \ + -DCMAKE_BUILD_TYPE=${configuration} + cmake --build . + ./example | grep '^[[:digit:]]\+\.[[:digit:]]\+\.[[:digit:]]\+' diff --git a/BUILD.md b/BUILD.md index 0b9ef40e61b..b4201ef0437 100644 --- a/BUILD.md +++ b/BUILD.md @@ -98,6 +98,12 @@ Update the compiler settings: conan profile update settings.compiler.cppstd=20 default ``` +Configure Conan (1.x only) to use recipe revisions: + + ``` + conan config set general.revisions_enabled=1 + ``` + **Linux** developers will commonly have a default Conan [profile][] that compiles with GCC and links with libstdc++. If you are linking with libstdc++ (see profile setting `compiler.libcxx`), @@ -187,6 +193,17 @@ It patches their CMake to correctly import its dependencies. conan export --version 4.0.3 external/soci ``` +Export our [Conan recipe for NuDB](./external/nudb). +It fixes some source files to add missing `#include`s. + + + ``` + # Conan 1.x + conan export external/nudb nudb/2.0.8@ + # Conan 2.x + conan export --version 2.0.8 external/nudb + ``` + ### Build and Test 1. Create a build directory and move into it. @@ -242,7 +259,7 @@ It patches their CMake to correctly import its dependencies. Single-config generators: ``` - cmake -DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release .. + cmake -DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release -Dxrpld=ON -Dtests=ON .. ``` Pass the CMake variable [`CMAKE_BUILD_TYPE`][build_type] @@ -252,7 +269,7 @@ It patches their CMake to correctly import its dependencies. Multi-config generators: ``` - cmake -DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake .. + cmake -DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake -Dxrpld=ON -Dtests=ON .. ``` **Note:** You can pass build options for `rippled` in this step. @@ -343,7 +360,7 @@ Example use with some cmake variables set: ``` cd .build conan install .. --output-folder . --build missing --settings build_type=Debug -cmake -DCMAKE_BUILD_TYPE=Debug -Dcoverage=ON -Dcoverage_test_parallelism=2 -Dcoverage_format=html-details -Dcoverage_extra_args="--json coverage.json" -DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake .. +cmake -DCMAKE_BUILD_TYPE=Debug -Dcoverage=ON -Dxrpld=ON -Dtests=ON -Dcoverage_test_parallelism=2 -Dcoverage_format=html-details -Dcoverage_extra_args="--json coverage.json" -DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake .. cmake --build . --target coverage ``` diff --git a/Builds/CMake/RippledCore.cmake b/Builds/CMake/RippledCore.cmake deleted file mode 100644 index 6b7b2aae683..00000000000 --- a/Builds/CMake/RippledCore.cmake +++ /dev/null @@ -1,1212 +0,0 @@ -#[===================================================================[ - xrpl_core - core functionality, useable by some client software perhaps -#]===================================================================] - -include(target_protobuf_sources) - -file (GLOB_RECURSE rb_headers - src/ripple/beast/*.h) - -# Protocol buffers cannot participate in a unity build, -# because all the generated sources -# define a bunch of `static const` variables with the same names, -# so we just build them as a separate library. -add_library(xrpl.libpb) -target_protobuf_sources(xrpl.libpb ripple/proto - LANGUAGE cpp - IMPORT_DIRS src/ripple/proto - PROTOS src/ripple/proto/ripple.proto -) - -file(GLOB_RECURSE protos "src/ripple/proto/org/*.proto") -target_protobuf_sources(xrpl.libpb ripple/proto - LANGUAGE cpp - IMPORT_DIRS src/ripple/proto - PROTOS "${protos}" -) -target_protobuf_sources(xrpl.libpb ripple/proto - LANGUAGE grpc - IMPORT_DIRS src/ripple/proto - PROTOS "${protos}" - PLUGIN protoc-gen-grpc=$ - GENERATE_EXTENSIONS .grpc.pb.h .grpc.pb.cc -) - -target_compile_options(xrpl.libpb - PUBLIC - $<$:-wd4996> - $<$: - --system-header-prefix="google/protobuf" - -Wno-deprecated-dynamic-exception-spec - > - PRIVATE - $<$:-wd4065> - $<$>:-Wno-deprecated-declarations> -) - -target_link_libraries(xrpl.libpb - PUBLIC - protobuf::libprotobuf - gRPC::grpc++ -) - -add_library (xrpl_core - ${rb_headers}) ## headers added here for benefit of IDEs -if (unity) - set_target_properties(xrpl_core PROPERTIES UNITY_BUILD ON) -endif () - -add_library(libxrpl INTERFACE) -target_link_libraries(libxrpl INTERFACE xrpl_core) -add_library(xrpl::libxrpl ALIAS libxrpl) - -#[===============================[ - beast/legacy FILES: - TODO: review these sources for removal or replacement -#]===============================] -# BEGIN LIBXRPL SOURCES -target_sources (xrpl_core PRIVATE - src/ripple/beast/clock/basic_seconds_clock.cpp - src/ripple/beast/core/CurrentThreadName.cpp - src/ripple/beast/core/SemanticVersion.cpp - src/ripple/beast/insight/impl/Collector.cpp - src/ripple/beast/insight/impl/Groups.cpp - src/ripple/beast/insight/impl/Hook.cpp - src/ripple/beast/insight/impl/Metric.cpp - src/ripple/beast/insight/impl/NullCollector.cpp - src/ripple/beast/insight/impl/StatsDCollector.cpp - src/ripple/beast/net/impl/IPAddressConversion.cpp - src/ripple/beast/net/impl/IPAddressV4.cpp - src/ripple/beast/net/impl/IPAddressV6.cpp - src/ripple/beast/net/impl/IPEndpoint.cpp - src/ripple/beast/utility/src/beast_Journal.cpp - src/ripple/beast/utility/src/beast_PropertyStream.cpp) - -#[===============================[ - core sources -#]===============================] -target_sources (xrpl_core PRIVATE - #[===============================[ - main sources: - subdir: basics - #]===============================] - src/ripple/basics/impl/Archive.cpp - src/ripple/basics/impl/base64.cpp - src/ripple/basics/impl/BasicConfig.cpp - src/ripple/basics/impl/contract.cpp - src/ripple/basics/impl/CountedObject.cpp - src/ripple/basics/impl/FileUtilities.cpp - src/ripple/basics/impl/IOUAmount.cpp - src/ripple/basics/impl/Log.cpp - src/ripple/basics/impl/make_SSLContext.cpp - src/ripple/basics/impl/mulDiv.cpp - src/ripple/basics/impl/Number.cpp - src/ripple/basics/impl/partitioned_unordered_map.cpp - src/ripple/basics/impl/ResolverAsio.cpp - src/ripple/basics/impl/StringUtilities.cpp - src/ripple/basics/impl/UptimeClock.cpp - #[===============================[ - main sources: - subdir: json - #]===============================] - src/ripple/json/impl/JsonPropertyStream.cpp - src/ripple/json/impl/Object.cpp - src/ripple/json/impl/Output.cpp - src/ripple/json/impl/Writer.cpp - src/ripple/json/impl/json_reader.cpp - src/ripple/json/impl/json_value.cpp - src/ripple/json/impl/json_valueiterator.cpp - src/ripple/json/impl/json_writer.cpp - src/ripple/json/impl/to_string.cpp - #[===============================[ - main sources: - subdir: protocol - #]===============================] - src/ripple/protocol/impl/AccountID.cpp - src/ripple/protocol/impl/AMMCore.cpp - src/ripple/protocol/impl/Book.cpp - src/ripple/protocol/impl/BuildInfo.cpp - src/ripple/protocol/impl/ErrorCodes.cpp - src/ripple/protocol/impl/Feature.cpp - src/ripple/protocol/impl/Indexes.cpp - src/ripple/protocol/impl/InnerObjectFormats.cpp - src/ripple/protocol/impl/Issue.cpp - src/ripple/protocol/impl/STIssue.cpp - src/ripple/protocol/impl/Keylet.cpp - src/ripple/protocol/impl/LedgerFormats.cpp - src/ripple/protocol/impl/LedgerHeader.cpp - 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 - src/ripple/protocol/impl/SOTemplate.cpp - src/ripple/protocol/impl/STAccount.cpp - src/ripple/protocol/impl/STAmount.cpp - src/ripple/protocol/impl/STArray.cpp - src/ripple/protocol/impl/STBase.cpp - src/ripple/protocol/impl/STBlob.cpp - src/ripple/protocol/impl/STCurrency.cpp - src/ripple/protocol/impl/STInteger.cpp - src/ripple/protocol/impl/STLedgerEntry.cpp - src/ripple/protocol/impl/STObject.cpp - src/ripple/protocol/impl/STParsedJSON.cpp - src/ripple/protocol/impl/STPathSet.cpp - src/ripple/protocol/impl/STXChainBridge.cpp - src/ripple/protocol/impl/STTx.cpp - src/ripple/protocol/impl/XChainAttestations.cpp - src/ripple/protocol/impl/STValidation.cpp - src/ripple/protocol/impl/STVar.cpp - src/ripple/protocol/impl/STVector256.cpp - src/ripple/protocol/impl/SecretKey.cpp - src/ripple/protocol/impl/Seed.cpp - src/ripple/protocol/impl/Serializer.cpp - src/ripple/protocol/impl/Sign.cpp - src/ripple/protocol/impl/TER.cpp - src/ripple/protocol/impl/TxFormats.cpp - src/ripple/protocol/impl/TxMeta.cpp - src/ripple/protocol/impl/UintTypes.cpp - src/ripple/protocol/impl/digest.cpp - src/ripple/protocol/impl/tokens.cpp - src/ripple/protocol/impl/NFTSyntheticSerializer.cpp - src/ripple/protocol/impl/NFTokenID.cpp - src/ripple/protocol/impl/NFTokenOfferID.cpp - #[===============================[ - main sources: - subdir: resource - #]===============================] - src/ripple/resource/impl/Charge.cpp - src/ripple/resource/impl/Consumer.cpp - src/ripple/resource/impl/Fees.cpp - src/ripple/resource/impl/ResourceManager.cpp - #[===============================[ - main sources: - subdir: server - #]===============================] - src/ripple/server/impl/JSONRPCUtil.cpp - src/ripple/server/impl/Port.cpp - #[===============================[ - main sources: - subdir: crypto - #]===============================] - src/ripple/crypto/impl/RFC1751.cpp - src/ripple/crypto/impl/csprng.cpp - src/ripple/crypto/impl/secure_erase.cpp) -# END LIBXRPL SOURCES - -add_library (Ripple::xrpl_core ALIAS xrpl_core) -target_include_directories (xrpl_core - PUBLIC - $ - $) - -target_compile_definitions(xrpl_core - PUBLIC - BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT - BOOST_CONTAINER_FWD_BAD_DEQUE - HAS_UNCAUGHT_EXCEPTIONS=1) -target_compile_options (xrpl_core - PUBLIC - $<$:-Wno-maybe-uninitialized>) -target_link_libraries (xrpl_core - PUBLIC - date::date - ed25519::ed25519 - LibArchive::LibArchive - OpenSSL::Crypto - Ripple::boost - Ripple::opts - Ripple::syslibs - secp256k1::secp256k1 - xrpl.libpb - xxHash::xxhash) -#[=================================[ - main/core headers installation -#]=================================] -# BEGIN LIBXRPL HEADERS -install ( - FILES - src/ripple/basics/Archive.h - src/ripple/basics/BasicConfig.h - src/ripple/basics/Blob.h - src/ripple/basics/Buffer.h - src/ripple/basics/ByteUtilities.h - src/ripple/basics/CompressionAlgorithms.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/IOUAmount.h - src/ripple/basics/KeyCache.h - src/ripple/basics/LocalValue.h - src/ripple/basics/Log.h - src/ripple/basics/MathUtilities.h - src/ripple/basics/Number.h - src/ripple/basics/PerfLog.h - src/ripple/basics/README.md - src/ripple/basics/RangeSet.h - src/ripple/basics/Resolver.h - src/ripple/basics/ResolverAsio.h - src/ripple/basics/SHAMapHash.h - src/ripple/basics/Slice.h - src/ripple/basics/StringUtilities.h - src/ripple/basics/TaggedCache.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 - src/ripple/crypto/RFC1751.h - src/ripple/crypto/csprng.h - src/ripple/crypto/secure_erase.h - DESTINATION include/ripple/crypto) -install ( - FILES - src/ripple/json/JsonPropertyStream.h - src/ripple/json/Object.h - src/ripple/json/Output.h - src/ripple/json/Writer.h - src/ripple/json/json_forwards.h - src/ripple/json/json_reader.h - src/ripple/json/json_value.h - src/ripple/json/json_writer.h - src/ripple/json/to_string.h - DESTINATION include/ripple/json) -install ( - FILES - src/ripple/json/impl/json_assert.h - DESTINATION include/ripple/json/impl) -install ( - FILES - src/ripple/protocol/AccountID.h - src/ripple/protocol/AMMCore.h - src/ripple/protocol/AmountConversions.h - src/ripple/protocol/ApiVersion.h - src/ripple/protocol/Book.h - src/ripple/protocol/BuildInfo.h - src/ripple/protocol/ErrorCodes.h - src/ripple/protocol/Feature.h - src/ripple/protocol/Fees.h - src/ripple/protocol/HashPrefix.h - src/ripple/protocol/Indexes.h - src/ripple/protocol/InnerObjectFormats.h - src/ripple/protocol/Issue.h - src/ripple/protocol/json_get_or_throw.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/MultiApiJson.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/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/STValidation.h - src/ripple/protocol/STVector256.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/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/secp256k1.h - src/ripple/protocol/impl/token_errors.h - DESTINATION include/ripple/protocol/impl) -install ( - 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 - DESTINATION include/ripple/server) -install ( - FILES - 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/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 -#]===================================] -install ( - FILES - src/ripple/beast/clock/abstract_clock.h - src/ripple/beast/clock/basic_seconds_clock.h - src/ripple/beast/clock/manual_clock.h - DESTINATION include/ripple/beast/clock) -install ( - FILES - src/ripple/beast/core/CurrentThreadName.h - src/ripple/beast/core/LexicalCast.h - src/ripple/beast/core/List.h - src/ripple/beast/core/SemanticVersion.h - DESTINATION include/ripple/beast/core) -install ( - FILES - src/ripple/beast/hash/hash_append.h - src/ripple/beast/hash/uhash.h - src/ripple/beast/hash/xxhasher.h - DESTINATION include/ripple/beast/hash) -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 - DESTINATION include/ripple/beast/net) -install ( - FILES - src/ripple/beast/rfc2616.h - src/ripple/beast/type_name.h - src/ripple/beast/unit_test.h - src/ripple/beast/xor_shift_engine.h - DESTINATION include/ripple/beast) -install ( - FILES - src/ripple/beast/unit_test/amount.h - src/ripple/beast/unit_test/dstream.h - src/ripple/beast/unit_test/global_suites.h - src/ripple/beast/unit_test/match.h - src/ripple/beast/unit_test/recorder.h - src/ripple/beast/unit_test/reporter.h - src/ripple/beast/unit_test/results.h - src/ripple/beast/unit_test/runner.h - src/ripple/beast/unit_test/suite_info.h - src/ripple/beast/unit_test/suite_list.h - src/ripple/beast/unit_test/suite.h - src/ripple/beast/unit_test/thread.h - DESTINATION include/ripple/beast/unit_test) -install ( - FILES - src/ripple/beast/unit_test/detail/const_container.h - DESTINATION include/ripple/beast/unit_test/detail) -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 - DESTINATION include/ripple/beast/utility) -# END LIBXRPL HEADERS -#[===================================================================[ - rippled executable -#]===================================================================] - -#[=========================================================[ - this one header is added as source just to keep older - versions of cmake happy. cmake 3.10+ allows - add_executable with no sources -#]=========================================================] -add_executable (rippled src/ripple/app/main/Application.h) -if (unity) - set_target_properties(rippled PROPERTIES UNITY_BUILD ON) -endif () -if (tests) - target_compile_definitions(rippled PUBLIC ENABLE_TESTS) -endif() -# BEGIN XRPLD SOURCES -target_sources (rippled PRIVATE - #[===============================[ - main sources: - subdir: app - #]===============================] - src/ripple/app/consensus/RCLConsensus.cpp - src/ripple/app/consensus/RCLCxPeerPos.cpp - src/ripple/app/consensus/RCLValidations.cpp - src/ripple/app/ledger/AcceptedLedger.cpp - src/ripple/app/ledger/AcceptedLedgerTx.cpp - src/ripple/app/ledger/AccountStateSF.cpp - src/ripple/app/ledger/BookListeners.cpp - src/ripple/app/ledger/ConsensusTransSetSF.cpp - src/ripple/app/ledger/Ledger.cpp - src/ripple/app/ledger/LedgerHistory.cpp - src/ripple/app/ledger/OrderBookDB.cpp - src/ripple/app/ledger/TransactionStateSF.cpp - src/ripple/app/ledger/impl/BuildLedger.cpp - src/ripple/app/ledger/impl/InboundLedger.cpp - src/ripple/app/ledger/impl/InboundLedgers.cpp - src/ripple/app/ledger/impl/InboundTransactions.cpp - src/ripple/app/ledger/impl/LedgerCleaner.cpp - src/ripple/app/ledger/impl/LedgerDeltaAcquire.cpp - src/ripple/app/ledger/impl/LedgerMaster.cpp - src/ripple/app/ledger/impl/LedgerReplay.cpp - src/ripple/app/ledger/impl/LedgerReplayer.cpp - src/ripple/app/ledger/impl/LedgerReplayMsgHandler.cpp - src/ripple/app/ledger/impl/LedgerReplayTask.cpp - src/ripple/app/ledger/impl/LedgerToJson.cpp - src/ripple/app/ledger/impl/LocalTxs.cpp - src/ripple/app/ledger/impl/OpenLedger.cpp - src/ripple/app/ledger/impl/SkipListAcquire.cpp - src/ripple/app/ledger/impl/TimeoutCounter.cpp - src/ripple/app/ledger/impl/TransactionAcquire.cpp - src/ripple/app/ledger/impl/TransactionMaster.cpp - src/ripple/app/main/Application.cpp - src/ripple/app/main/BasicApp.cpp - src/ripple/app/main/CollectorManager.cpp - src/ripple/app/main/GRPCServer.cpp - src/ripple/app/main/LoadManager.cpp - src/ripple/app/main/Main.cpp - src/ripple/app/main/NodeIdentity.cpp - src/ripple/app/main/NodeStoreScheduler.cpp - src/ripple/app/reporting/ReportingETL.cpp - src/ripple/app/reporting/ETLSource.cpp - src/ripple/app/reporting/P2pProxy.cpp - src/ripple/app/misc/impl/AMMHelpers.cpp - src/ripple/app/misc/impl/AMMUtils.cpp - src/ripple/app/misc/CanonicalTXSet.cpp - src/ripple/app/misc/FeeVoteImpl.cpp - src/ripple/app/misc/HashRouter.cpp - src/ripple/app/misc/NegativeUNLVote.cpp - src/ripple/app/misc/NetworkOPs.cpp - src/ripple/app/misc/SHAMapStoreImp.cpp - src/ripple/app/misc/detail/impl/WorkSSL.cpp - src/ripple/app/misc/impl/AccountTxPaging.cpp - src/ripple/app/misc/impl/AmendmentTable.cpp - src/ripple/app/misc/impl/DeliverMax.cpp - src/ripple/app/misc/impl/LoadFeeTrack.cpp - src/ripple/app/misc/impl/Manifest.cpp - src/ripple/app/misc/impl/Transaction.cpp - src/ripple/app/misc/impl/TxQ.cpp - src/ripple/app/misc/impl/ValidatorKeys.cpp - src/ripple/app/misc/impl/ValidatorList.cpp - src/ripple/app/misc/impl/ValidatorSite.cpp - src/ripple/app/paths/AccountCurrencies.cpp - src/ripple/app/paths/Credit.cpp - src/ripple/app/paths/Flow.cpp - src/ripple/app/paths/PathRequest.cpp - src/ripple/app/paths/PathRequests.cpp - src/ripple/app/paths/Pathfinder.cpp - src/ripple/app/paths/RippleCalc.cpp - src/ripple/app/paths/RippleLineCache.cpp - src/ripple/app/paths/TrustLine.cpp - src/ripple/app/paths/impl/AMMLiquidity.cpp - src/ripple/app/paths/impl/AMMOffer.cpp - src/ripple/app/paths/impl/BookStep.cpp - src/ripple/app/paths/impl/DirectStep.cpp - src/ripple/app/paths/impl/PaySteps.cpp - src/ripple/app/paths/impl/XRPEndpointStep.cpp - src/ripple/app/rdb/backend/detail/impl/Node.cpp - src/ripple/app/rdb/backend/detail/impl/Shard.cpp - src/ripple/app/rdb/backend/impl/PostgresDatabase.cpp - src/ripple/app/rdb/backend/impl/SQLiteDatabase.cpp - src/ripple/app/rdb/impl/Download.cpp - src/ripple/app/rdb/impl/PeerFinder.cpp - src/ripple/app/rdb/impl/RelationalDatabase.cpp - src/ripple/app/rdb/impl/ShardArchive.cpp - src/ripple/app/rdb/impl/State.cpp - src/ripple/app/rdb/impl/UnitaryShard.cpp - src/ripple/app/rdb/impl/Vacuum.cpp - src/ripple/app/rdb/impl/Wallet.cpp - src/ripple/app/tx/impl/AMMBid.cpp - src/ripple/app/tx/impl/AMMCreate.cpp - src/ripple/app/tx/impl/AMMDelete.cpp - src/ripple/app/tx/impl/AMMDeposit.cpp - src/ripple/app/tx/impl/AMMVote.cpp - src/ripple/app/tx/impl/AMMWithdraw.cpp - src/ripple/app/tx/impl/ApplyContext.cpp - src/ripple/app/tx/impl/BookTip.cpp - src/ripple/app/tx/impl/CancelCheck.cpp - src/ripple/app/tx/impl/CancelOffer.cpp - src/ripple/app/tx/impl/CashCheck.cpp - src/ripple/app/tx/impl/Change.cpp - src/ripple/app/tx/impl/Clawback.cpp - src/ripple/app/tx/impl/CreateCheck.cpp - src/ripple/app/tx/impl/CreateOffer.cpp - src/ripple/app/tx/impl/CreateTicket.cpp - src/ripple/app/tx/impl/DeleteAccount.cpp - src/ripple/app/tx/impl/DeleteOracle.cpp - src/ripple/app/tx/impl/DepositPreauth.cpp - src/ripple/app/tx/impl/DID.cpp - src/ripple/app/tx/impl/Escrow.cpp - src/ripple/app/tx/impl/InvariantCheck.cpp - src/ripple/app/tx/impl/NFTokenAcceptOffer.cpp - src/ripple/app/tx/impl/NFTokenBurn.cpp - src/ripple/app/tx/impl/NFTokenCancelOffer.cpp - src/ripple/app/tx/impl/NFTokenCreateOffer.cpp - src/ripple/app/tx/impl/NFTokenMint.cpp - src/ripple/app/tx/impl/OfferStream.cpp - src/ripple/app/tx/impl/PayChan.cpp - src/ripple/app/tx/impl/Payment.cpp - src/ripple/app/tx/impl/SetAccount.cpp - src/ripple/app/tx/impl/SetOracle.cpp - src/ripple/app/tx/impl/SetRegularKey.cpp - src/ripple/app/tx/impl/SetSignerList.cpp - src/ripple/app/tx/impl/SetTrust.cpp - src/ripple/app/tx/impl/XChainBridge.cpp - src/ripple/app/tx/impl/SignerEntries.cpp - src/ripple/app/tx/impl/Taker.cpp - src/ripple/app/tx/impl/Transactor.cpp - src/ripple/app/tx/impl/apply.cpp - src/ripple/app/tx/impl/applySteps.cpp - src/ripple/app/tx/impl/details/NFTokenUtils.cpp - #[===============================[ - main sources: - subdir: conditions - #]===============================] - src/ripple/conditions/impl/Condition.cpp - src/ripple/conditions/impl/Fulfillment.cpp - src/ripple/conditions/impl/error.cpp - #[===============================[ - main sources: - subdir: core - #]===============================] - src/ripple/core/impl/Config.cpp - src/ripple/core/impl/DatabaseCon.cpp - src/ripple/core/impl/Job.cpp - src/ripple/core/impl/JobQueue.cpp - src/ripple/core/impl/LoadEvent.cpp - src/ripple/core/impl/LoadMonitor.cpp - src/ripple/core/impl/SociDB.cpp - src/ripple/core/impl/Workers.cpp - src/ripple/core/Pg.cpp - #[===============================[ - main sources: - subdir: consensus - #]===============================] - src/ripple/consensus/Consensus.cpp - #[===============================[ - main sources: - subdir: ledger - #]===============================] - src/ripple/ledger/impl/ApplyStateTable.cpp - src/ripple/ledger/impl/ApplyView.cpp - src/ripple/ledger/impl/ApplyViewBase.cpp - src/ripple/ledger/impl/ApplyViewImpl.cpp - src/ripple/ledger/impl/BookDirs.cpp - src/ripple/ledger/impl/CachedView.cpp - src/ripple/ledger/impl/Directory.cpp - src/ripple/ledger/impl/OpenView.cpp - src/ripple/ledger/impl/PaymentSandbox.cpp - src/ripple/ledger/impl/RawStateTable.cpp - src/ripple/ledger/impl/ReadView.cpp - src/ripple/ledger/impl/View.cpp - #[===============================[ - main sources: - subdir: net - #]===============================] - src/ripple/net/impl/DatabaseDownloader.cpp - src/ripple/net/impl/HTTPClient.cpp - src/ripple/net/impl/HTTPDownloader.cpp - src/ripple/net/impl/HTTPStream.cpp - src/ripple/net/impl/InfoSub.cpp - src/ripple/net/impl/RPCCall.cpp - src/ripple/net/impl/RPCSub.cpp - src/ripple/net/impl/RegisterSSLCerts.cpp - #[===============================[ - main sources: - subdir: nodestore - #]===============================] - src/ripple/nodestore/backend/CassandraFactory.cpp - src/ripple/nodestore/backend/MemoryFactory.cpp - src/ripple/nodestore/backend/NuDBFactory.cpp - src/ripple/nodestore/backend/NullFactory.cpp - src/ripple/nodestore/backend/RocksDBFactory.cpp - src/ripple/nodestore/impl/BatchWriter.cpp - src/ripple/nodestore/impl/Database.cpp - src/ripple/nodestore/impl/DatabaseNodeImp.cpp - src/ripple/nodestore/impl/DatabaseRotatingImp.cpp - src/ripple/nodestore/impl/DatabaseShardImp.cpp - src/ripple/nodestore/impl/DeterministicShard.cpp - src/ripple/nodestore/impl/DecodedBlob.cpp - src/ripple/nodestore/impl/DummyScheduler.cpp - src/ripple/nodestore/impl/ManagerImp.cpp - src/ripple/nodestore/impl/NodeObject.cpp - src/ripple/nodestore/impl/Shard.cpp - src/ripple/nodestore/impl/ShardInfo.cpp - src/ripple/nodestore/impl/TaskQueue.cpp - #[===============================[ - main sources: - subdir: overlay - #]===============================] - src/ripple/overlay/impl/Cluster.cpp - src/ripple/overlay/impl/ConnectAttempt.cpp - src/ripple/overlay/impl/Handshake.cpp - src/ripple/overlay/impl/Message.cpp - src/ripple/overlay/impl/OverlayImpl.cpp - src/ripple/overlay/impl/PeerImp.cpp - src/ripple/overlay/impl/PeerReservationTable.cpp - src/ripple/overlay/impl/PeerSet.cpp - src/ripple/overlay/impl/ProtocolVersion.cpp - src/ripple/overlay/impl/TrafficCount.cpp - src/ripple/overlay/impl/TxMetrics.cpp - #[===============================[ - main sources: - subdir: peerfinder - #]===============================] - src/ripple/peerfinder/impl/Bootcache.cpp - src/ripple/peerfinder/impl/Endpoint.cpp - src/ripple/peerfinder/impl/PeerfinderConfig.cpp - src/ripple/peerfinder/impl/PeerfinderManager.cpp - src/ripple/peerfinder/impl/SlotImp.cpp - src/ripple/peerfinder/impl/SourceStrings.cpp - #[===============================[ - main sources: - subdir: rpc - #]===============================] - src/ripple/rpc/handlers/AccountChannels.cpp - src/ripple/rpc/handlers/AccountCurrenciesHandler.cpp - src/ripple/rpc/handlers/AccountInfo.cpp - src/ripple/rpc/handlers/AccountLines.cpp - src/ripple/rpc/handlers/AccountObjects.cpp - src/ripple/rpc/handlers/AccountOffers.cpp - src/ripple/rpc/handlers/AccountTx.cpp - src/ripple/rpc/handlers/AMMInfo.cpp - src/ripple/rpc/handlers/BlackList.cpp - src/ripple/rpc/handlers/BookOffers.cpp - src/ripple/rpc/handlers/CanDelete.cpp - src/ripple/rpc/handlers/Connect.cpp - src/ripple/rpc/handlers/ConsensusInfo.cpp - src/ripple/rpc/handlers/CrawlShards.cpp - src/ripple/rpc/handlers/DepositAuthorized.cpp - src/ripple/rpc/handlers/DownloadShard.cpp - src/ripple/rpc/handlers/Feature1.cpp - src/ripple/rpc/handlers/Fee1.cpp - src/ripple/rpc/handlers/FetchInfo.cpp - src/ripple/rpc/handlers/GatewayBalances.cpp - src/ripple/rpc/handlers/GetCounts.cpp - src/ripple/rpc/handlers/GetAggregatePrice.cpp - src/ripple/rpc/handlers/LedgerAccept.cpp - src/ripple/rpc/handlers/LedgerCleanerHandler.cpp - src/ripple/rpc/handlers/LedgerClosed.cpp - src/ripple/rpc/handlers/LedgerCurrent.cpp - src/ripple/rpc/handlers/LedgerData.cpp - src/ripple/rpc/handlers/LedgerDiff.cpp - src/ripple/rpc/handlers/LedgerEntry.cpp - src/ripple/rpc/handlers/LedgerHandler.cpp - src/ripple/rpc/handlers/LedgerHeader.cpp - src/ripple/rpc/handlers/LedgerRequest.cpp - src/ripple/rpc/handlers/LogLevel.cpp - src/ripple/rpc/handlers/LogRotate.cpp - src/ripple/rpc/handlers/Manifest.cpp - src/ripple/rpc/handlers/NFTOffers.cpp - src/ripple/rpc/handlers/NodeToShard.cpp - src/ripple/rpc/handlers/NoRippleCheck.cpp - src/ripple/rpc/handlers/OwnerInfo.cpp - src/ripple/rpc/handlers/PathFind.cpp - src/ripple/rpc/handlers/PayChanClaim.cpp - src/ripple/rpc/handlers/Peers.cpp - src/ripple/rpc/handlers/Ping.cpp - src/ripple/rpc/handlers/Print.cpp - src/ripple/rpc/handlers/Random.cpp - src/ripple/rpc/handlers/Reservations.cpp - src/ripple/rpc/handlers/RipplePathFind.cpp - src/ripple/rpc/handlers/ServerInfo.cpp - src/ripple/rpc/handlers/ServerState.cpp - src/ripple/rpc/handlers/SignFor.cpp - src/ripple/rpc/handlers/SignHandler.cpp - src/ripple/rpc/handlers/Stop.cpp - src/ripple/rpc/handlers/Submit.cpp - src/ripple/rpc/handlers/SubmitMultiSigned.cpp - src/ripple/rpc/handlers/Subscribe.cpp - src/ripple/rpc/handlers/TransactionEntry.cpp - src/ripple/rpc/handlers/Tx.cpp - src/ripple/rpc/handlers/TxHistory.cpp - src/ripple/rpc/handlers/TxReduceRelay.cpp - src/ripple/rpc/handlers/UnlList.cpp - src/ripple/rpc/handlers/Unsubscribe.cpp - src/ripple/rpc/handlers/ValidationCreate.cpp - src/ripple/rpc/handlers/ValidatorInfo.cpp - src/ripple/rpc/handlers/ValidatorListSites.cpp - src/ripple/rpc/handlers/Validators.cpp - src/ripple/rpc/handlers/WalletPropose.cpp - src/ripple/rpc/impl/DeliveredAmount.cpp - src/ripple/rpc/impl/Handler.cpp - src/ripple/rpc/impl/LegacyPathFind.cpp - src/ripple/rpc/impl/RPCHandler.cpp - src/ripple/rpc/impl/RPCHelpers.cpp - src/ripple/rpc/impl/Role.cpp - src/ripple/rpc/impl/ServerHandler.cpp - src/ripple/rpc/impl/ShardArchiveHandler.cpp - src/ripple/rpc/impl/ShardVerificationScheduler.cpp - src/ripple/rpc/impl/Status.cpp - src/ripple/rpc/impl/TransactionSign.cpp - #[===============================[ - main sources: - subdir: perflog - #]===============================] - src/ripple/perflog/impl/PerfLogImp.cpp - #[===============================[ - main sources: - subdir: shamap - #]===============================] - src/ripple/shamap/impl/NodeFamily.cpp - src/ripple/shamap/impl/SHAMap.cpp - src/ripple/shamap/impl/SHAMapDelta.cpp - src/ripple/shamap/impl/SHAMapInnerNode.cpp - src/ripple/shamap/impl/SHAMapLeafNode.cpp - src/ripple/shamap/impl/SHAMapNodeID.cpp - src/ripple/shamap/impl/SHAMapSync.cpp - src/ripple/shamap/impl/SHAMapTreeNode.cpp - src/ripple/shamap/impl/ShardFamily.cpp) -# END XRPLD SOURCES - - #[===============================[ - test sources: - subdir: app - #]===============================] -if (tests) - target_sources (rippled PRIVATE - src/test/app/AccountDelete_test.cpp - src/test/app/AccountTxPaging_test.cpp - src/test/app/AmendmentTable_test.cpp - src/test/app/AMM_test.cpp - src/test/app/AMMCalc_test.cpp - src/test/app/AMMExtended_test.cpp - src/test/app/Check_test.cpp - src/test/app/Clawback_test.cpp - src/test/app/CrossingLimits_test.cpp - src/test/app/DeliverMin_test.cpp - src/test/app/DepositAuth_test.cpp - src/test/app/Discrepancy_test.cpp - src/test/app/DID_test.cpp - src/test/app/DNS_test.cpp - src/test/app/Escrow_test.cpp - src/test/app/FeeVote_test.cpp - src/test/app/Flow_test.cpp - src/test/app/Freeze_test.cpp - src/test/app/HashRouter_test.cpp - src/test/app/LedgerHistory_test.cpp - src/test/app/LedgerLoad_test.cpp - src/test/app/LedgerMaster_test.cpp - src/test/app/LedgerReplay_test.cpp - src/test/app/LoadFeeTrack_test.cpp - src/test/app/Manifest_test.cpp - src/test/app/MultiSign_test.cpp - src/test/app/NetworkID_test.cpp - src/test/app/NFToken_test.cpp - src/test/app/NFTokenBurn_test.cpp - src/test/app/NFTokenDir_test.cpp - src/test/app/OfferStream_test.cpp - src/test/app/Offer_test.cpp - src/test/app/Oracle_test.cpp - src/test/app/OversizeMeta_test.cpp - src/test/app/Path_test.cpp - src/test/app/PayChan_test.cpp - src/test/app/PayStrand_test.cpp - src/test/app/PseudoTx_test.cpp - src/test/app/RCLCensorshipDetector_test.cpp - src/test/app/RCLValidations_test.cpp - src/test/app/ReducedOffer_test.cpp - src/test/app/Regression_test.cpp - src/test/app/SHAMapStore_test.cpp - src/test/app/XChain_test.cpp - src/test/app/SetAuth_test.cpp - src/test/app/SetRegularKey_test.cpp - src/test/app/SetTrust_test.cpp - src/test/app/Taker_test.cpp - src/test/app/TheoreticalQuality_test.cpp - src/test/app/Ticket_test.cpp - src/test/app/Transaction_ordering_test.cpp - src/test/app/TrustAndBalance_test.cpp - src/test/app/TxQ_test.cpp - src/test/app/ValidatorKeys_test.cpp - src/test/app/ValidatorList_test.cpp - src/test/app/ValidatorSite_test.cpp - src/test/app/tx/apply_test.cpp - #[===============================[ - test sources: - subdir: basics - #]===============================] - src/test/basics/Buffer_test.cpp - src/test/basics/DetectCrash_test.cpp - src/test/basics/Expected_test.cpp - src/test/basics/FileUtilities_test.cpp - src/test/basics/IOUAmount_test.cpp - src/test/basics/KeyCache_test.cpp - src/test/basics/Number_test.cpp - src/test/basics/PerfLog_test.cpp - src/test/basics/RangeSet_test.cpp - src/test/basics/scope_test.cpp - src/test/basics/Slice_test.cpp - src/test/basics/StringUtilities_test.cpp - src/test/basics/TaggedCache_test.cpp - src/test/basics/XRPAmount_test.cpp - src/test/basics/base58_test.cpp - src/test/basics/base64_test.cpp - src/test/basics/base_uint_test.cpp - src/test/basics/contract_test.cpp - src/test/basics/FeeUnits_test.cpp - src/test/basics/hardened_hash_test.cpp - src/test/basics/join_test.cpp - src/test/basics/mulDiv_test.cpp - src/test/basics/tagged_integer_test.cpp - #[===============================[ - test sources: - subdir: beast - #]===============================] - src/test/beast/IPEndpoint_test.cpp - src/test/beast/LexicalCast_test.cpp - src/test/beast/SemanticVersion_test.cpp - src/test/beast/aged_associative_container_test.cpp - src/test/beast/beast_CurrentThreadName_test.cpp - src/test/beast/beast_Journal_test.cpp - src/test/beast/beast_PropertyStream_test.cpp - src/test/beast/beast_Zero_test.cpp - src/test/beast/beast_abstract_clock_test.cpp - src/test/beast/beast_basic_seconds_clock_test.cpp - src/test/beast/beast_io_latency_probe_test.cpp - src/test/beast/define_print.cpp - #[===============================[ - test sources: - subdir: conditions - #]===============================] - src/test/conditions/PreimageSha256_test.cpp - #[===============================[ - test sources: - subdir: consensus - #]===============================] - src/test/consensus/ByzantineFailureSim_test.cpp - src/test/consensus/Consensus_test.cpp - src/test/consensus/DistributedValidatorsSim_test.cpp - src/test/consensus/LedgerTiming_test.cpp - src/test/consensus/LedgerTrie_test.cpp - src/test/consensus/NegativeUNL_test.cpp - src/test/consensus/ScaleFreeSim_test.cpp - src/test/consensus/Validations_test.cpp - #[===============================[ - test sources: - subdir: core - #]===============================] - src/test/core/ClosureCounter_test.cpp - src/test/core/Config_test.cpp - src/test/core/Coroutine_test.cpp - src/test/core/CryptoPRNG_test.cpp - src/test/core/JobQueue_test.cpp - src/test/core/SociDB_test.cpp - src/test/core/Workers_test.cpp - #[===============================[ - test sources: - subdir: csf - #]===============================] - src/test/csf/BasicNetwork_test.cpp - src/test/csf/Digraph_test.cpp - src/test/csf/Histogram_test.cpp - src/test/csf/Scheduler_test.cpp - src/test/csf/impl/Sim.cpp - src/test/csf/impl/ledgers.cpp - #[===============================[ - test sources: - subdir: json - #]===============================] - src/test/json/Object_test.cpp - src/test/json/Output_test.cpp - src/test/json/Writer_test.cpp - src/test/json/json_value_test.cpp - #[===============================[ - test sources: - subdir: jtx - #]===============================] - src/test/jtx/Env_test.cpp - src/test/jtx/WSClient_test.cpp - src/test/jtx/impl/Account.cpp - src/test/jtx/impl/AMM.cpp - src/test/jtx/impl/AMMTest.cpp - src/test/jtx/impl/Env.cpp - src/test/jtx/impl/JSONRPCClient.cpp - src/test/jtx/impl/Oracle.cpp - src/test/jtx/impl/TestHelpers.cpp - src/test/jtx/impl/WSClient.cpp - src/test/jtx/impl/acctdelete.cpp - src/test/jtx/impl/account_txn_id.cpp - src/test/jtx/impl/amount.cpp - src/test/jtx/impl/attester.cpp - src/test/jtx/impl/balance.cpp - src/test/jtx/impl/check.cpp - src/test/jtx/impl/delivermin.cpp - src/test/jtx/impl/deposit.cpp - src/test/jtx/impl/did.cpp - src/test/jtx/impl/envconfig.cpp - src/test/jtx/impl/fee.cpp - src/test/jtx/impl/flags.cpp - src/test/jtx/impl/invoice_id.cpp - src/test/jtx/impl/jtx_json.cpp - src/test/jtx/impl/last_ledger_sequence.cpp - src/test/jtx/impl/memo.cpp - src/test/jtx/impl/multisign.cpp - src/test/jtx/impl/offer.cpp - src/test/jtx/impl/owners.cpp - src/test/jtx/impl/paths.cpp - src/test/jtx/impl/pay.cpp - src/test/jtx/impl/quality2.cpp - src/test/jtx/impl/rate.cpp - src/test/jtx/impl/regkey.cpp - src/test/jtx/impl/sendmax.cpp - src/test/jtx/impl/seq.cpp - src/test/jtx/impl/xchain_bridge.cpp - src/test/jtx/impl/sig.cpp - src/test/jtx/impl/tag.cpp - src/test/jtx/impl/ticket.cpp - src/test/jtx/impl/token.cpp - src/test/jtx/impl/trust.cpp - src/test/jtx/impl/txflags.cpp - src/test/jtx/impl/utility.cpp - - #[===============================[ - test sources: - subdir: ledger - #]===============================] - src/test/ledger/BookDirs_test.cpp - src/test/ledger/Directory_test.cpp - src/test/ledger/Invariants_test.cpp - src/test/ledger/PaymentSandbox_test.cpp - src/test/ledger/PendingSaves_test.cpp - src/test/ledger/SkipList_test.cpp - src/test/ledger/View_test.cpp - #[===============================[ - test sources: - subdir: net - #]===============================] - src/test/net/DatabaseDownloader_test.cpp - #[===============================[ - test sources: - subdir: nodestore - #]===============================] - src/test/nodestore/Backend_test.cpp - src/test/nodestore/Basics_test.cpp - src/test/nodestore/DatabaseShard_test.cpp - src/test/nodestore/Database_test.cpp - src/test/nodestore/Timing_test.cpp - src/test/nodestore/import_test.cpp - src/test/nodestore/varint_test.cpp - #[===============================[ - test sources: - subdir: overlay - #]===============================] - src/test/overlay/ProtocolVersion_test.cpp - src/test/overlay/cluster_test.cpp - src/test/overlay/short_read_test.cpp - src/test/overlay/compression_test.cpp - src/test/overlay/reduce_relay_test.cpp - src/test/overlay/handshake_test.cpp - src/test/overlay/tx_reduce_relay_test.cpp - #[===============================[ - test sources: - subdir: peerfinder - #]===============================] - src/test/peerfinder/Livecache_test.cpp - src/test/peerfinder/PeerFinder_test.cpp - #[===============================[ - test sources: - subdir: protocol - #]===============================] - src/test/protocol/ApiVersion_test.cpp - src/test/protocol/BuildInfo_test.cpp - src/test/protocol/InnerObjectFormats_test.cpp - src/test/protocol/Issue_test.cpp - src/test/protocol/Hooks_test.cpp - src/test/protocol/Memo_test.cpp - src/test/protocol/MultiApiJson_test.cpp - src/test/protocol/PublicKey_test.cpp - src/test/protocol/Quality_test.cpp - src/test/protocol/STAccount_test.cpp - src/test/protocol/STAmount_test.cpp - src/test/protocol/STObject_test.cpp - src/test/protocol/STTx_test.cpp - src/test/protocol/STValidation_test.cpp - src/test/protocol/SecretKey_test.cpp - src/test/protocol/Seed_test.cpp - src/test/protocol/SeqProxy_test.cpp - src/test/protocol/TER_test.cpp - src/test/protocol/types_test.cpp - #[===============================[ - test sources: - subdir: resource - #]===============================] - src/test/resource/Logic_test.cpp - #[===============================[ - test sources: - subdir: rpc - #]===============================] - src/test/rpc/AccountCurrencies_test.cpp - src/test/rpc/AccountInfo_test.cpp - src/test/rpc/AccountLinesRPC_test.cpp - src/test/rpc/AccountObjects_test.cpp - src/test/rpc/AccountOffers_test.cpp - src/test/rpc/AccountSet_test.cpp - src/test/rpc/AccountTx_test.cpp - src/test/rpc/AmendmentBlocked_test.cpp - src/test/rpc/AMMInfo_test.cpp - src/test/rpc/Book_test.cpp - src/test/rpc/DepositAuthorized_test.cpp - src/test/rpc/DeliveredAmount_test.cpp - src/test/rpc/Feature_test.cpp - src/test/rpc/GatewayBalances_test.cpp - src/test/rpc/GetAggregatePrice_test.cpp - src/test/rpc/GetCounts_test.cpp - src/test/rpc/JSONRPC_test.cpp - src/test/rpc/KeyGeneration_test.cpp - src/test/rpc/LedgerClosed_test.cpp - src/test/rpc/LedgerData_test.cpp - src/test/rpc/LedgerHeader_test.cpp - src/test/rpc/LedgerRPC_test.cpp - src/test/rpc/LedgerRequestRPC_test.cpp - src/test/rpc/ManifestRPC_test.cpp - src/test/rpc/NodeToShardRPC_test.cpp - src/test/rpc/NoRippleCheck_test.cpp - src/test/rpc/NoRipple_test.cpp - src/test/rpc/OwnerInfo_test.cpp - src/test/rpc/Peers_test.cpp - src/test/rpc/ReportingETL_test.cpp - src/test/rpc/Roles_test.cpp - src/test/rpc/RPCCall_test.cpp - src/test/rpc/RPCOverload_test.cpp - src/test/rpc/RobustTransaction_test.cpp - src/test/rpc/ServerInfo_test.cpp - src/test/rpc/ShardArchiveHandler_test.cpp - src/test/rpc/Status_test.cpp - src/test/rpc/Subscribe_test.cpp - src/test/rpc/Transaction_test.cpp - src/test/rpc/TransactionEntry_test.cpp - src/test/rpc/TransactionHistory_test.cpp - src/test/rpc/ValidatorInfo_test.cpp - src/test/rpc/ValidatorRPC_test.cpp - src/test/rpc/Version_test.cpp - src/test/rpc/Handler_test.cpp - #[===============================[ - test sources: - subdir: server - #]===============================] - src/test/server/ServerStatus_test.cpp - src/test/server/Server_test.cpp - #[===============================[ - test sources: - subdir: shamap - #]===============================] - src/test/shamap/FetchPack_test.cpp - src/test/shamap/SHAMapSync_test.cpp - src/test/shamap/SHAMap_test.cpp - #[===============================[ - test sources: - subdir: unit_test - #]===============================] - src/test/unit_test/multi_runner.cpp) -endif () #tests - -target_link_libraries (rippled - Ripple::boost - Ripple::opts - Ripple::libs - Ripple::xrpl_core - ) -exclude_if_included (rippled) -# define a macro for tests that might need to -# be exluded or run differently in CI environment -if (is_ci) - target_compile_definitions(rippled PRIVATE RIPPLED_RUNNING_IN_CI) -endif () - -if(reporting) -set_target_properties(rippled PROPERTIES OUTPUT_NAME rippled-reporting) -get_target_property(BIN_NAME rippled OUTPUT_NAME) -message(STATUS "Reporting mode build: rippled renamed ${BIN_NAME}") - target_compile_definitions(rippled PRIVATE RIPPLED_REPORTING) -endif() - -# any files that don't play well with unity should be added here -if (tests) - set_source_files_properties( - # these two seem to produce conflicts in beast teardown template methods - src/test/rpc/ValidatorRPC_test.cpp - src/test/rpc/ShardArchiveHandler_test.cpp - PROPERTIES SKIP_UNITY_BUILD_INCLUSION TRUE) -endif () #tests diff --git a/Builds/CMake/RippledMultiConfig.cmake b/Builds/CMake/RippledMultiConfig.cmake deleted file mode 100644 index 6df48a3d964..00000000000 --- a/Builds/CMake/RippledMultiConfig.cmake +++ /dev/null @@ -1,39 +0,0 @@ -#[===================================================================[ - multiconfig misc -#]===================================================================] - -if (is_multiconfig) - # This code finds all source files in the src subdirectory for inclusion - # in the IDE file tree as non-compiled sources. Since this file list will - # have some overlap with files we have already added to our targets to - # be compiled, we explicitly remove any of these target source files from - # this list. - file (GLOB_RECURSE all_sources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - CONFIGURE_DEPENDS - src/*.* Builds/*.md docs/*.md src/*.md Builds/*.cmake) - file(GLOB md_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} CONFIGURE_DEPENDS - *.md) - LIST(APPEND all_sources ${md_files}) - foreach (_target secp256k1::secp256k1 ed25519::ed25519 xrpl_core rippled) - get_target_property (_type ${_target} TYPE) - if(_type STREQUAL "INTERFACE_LIBRARY") - continue() - endif() - get_target_property (_src ${_target} SOURCES) - list (REMOVE_ITEM all_sources ${_src}) - endforeach () - target_sources (rippled PRIVATE ${all_sources}) - set_property ( - SOURCE ${all_sources} - APPEND - PROPERTY HEADER_FILE_ONLY true) - if (MSVC) - set_property( - DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - PROPERTY VS_STARTUP_PROJECT rippled) - endif () - - group_sources(src) - group_sources(docs) - group_sources(Builds) -endif () diff --git a/Builds/CMake/RippledVersion.cmake b/Builds/CMake/RippledVersion.cmake deleted file mode 100644 index 936852af58b..00000000000 --- a/Builds/CMake/RippledVersion.cmake +++ /dev/null @@ -1,15 +0,0 @@ -#[===================================================================[ - read version from source -#]===================================================================] - -file (STRINGS src/ripple/protocol/impl/BuildInfo.cpp BUILD_INFO) -foreach (line_ ${BUILD_INFO}) - if (line_ MATCHES "versionString[ ]*=[ ]*\"(.+)\"") - set (rippled_version ${CMAKE_MATCH_1}) - endif () -endforeach () -if (rippled_version) - message (STATUS "rippled version: ${rippled_version}") -else () - message (FATAL_ERROR "unable to determine rippled version") -endif () diff --git a/Builds/levelization/levelization.sh b/Builds/levelization/levelization.sh index 34487f7464a..f8f21bb9d23 100755 --- a/Builds/levelization/levelization.sh +++ b/Builds/levelization/levelization.sh @@ -18,7 +18,7 @@ mkdir results includes="$( pwd )/results/rawincludes.txt" pushd ../.. echo Raw includes: -grep -r '#include.*/.*\.h' src/ripple/ src/test/ | \ +grep -r '#include.*/.*\.h' include src | \ grep -v boost | tee ${includes} popd pushd results diff --git a/Builds/levelization/results/loops.txt b/Builds/levelization/results/loops.txt index cb137f497cb..ee7e6fd3bc6 100644 --- a/Builds/levelization/results/loops.txt +++ b/Builds/levelization/results/loops.txt @@ -1,51 +1,51 @@ -Loop: ripple.app ripple.core - ripple.app > ripple.core +Loop: test.jtx test.toplevel + test.toplevel > test.jtx -Loop: ripple.app ripple.ledger - ripple.app > ripple.ledger +Loop: test.jtx test.unit_test + test.unit_test == test.jtx -Loop: ripple.app ripple.net - ripple.app > ripple.net +Loop: xrpl.basics xrpl.json + xrpl.json ~= xrpl.basics -Loop: ripple.app ripple.nodestore - ripple.app > ripple.nodestore +Loop: xrpld.app xrpld.core + xrpld.app > xrpld.core -Loop: ripple.app ripple.overlay - ripple.overlay ~= ripple.app +Loop: xrpld.app xrpld.ledger + xrpld.app > xrpld.ledger -Loop: ripple.app ripple.peerfinder - ripple.app > ripple.peerfinder +Loop: xrpld.app xrpld.net + xrpld.app > xrpld.net -Loop: ripple.app ripple.rpc - ripple.rpc > ripple.app +Loop: xrpld.app xrpld.nodestore + xrpld.app > xrpld.nodestore -Loop: ripple.app ripple.shamap - ripple.app > ripple.shamap +Loop: xrpld.app xrpld.overlay + xrpld.overlay ~= xrpld.app -Loop: ripple.basics ripple.core - ripple.core > ripple.basics +Loop: xrpld.app xrpld.peerfinder + xrpld.app > xrpld.peerfinder -Loop: ripple.basics ripple.json - ripple.json ~= ripple.basics +Loop: xrpld.app xrpld.rpc + xrpld.rpc > xrpld.app -Loop: ripple.basics ripple.protocol - ripple.protocol > ripple.basics +Loop: xrpld.app xrpld.shamap + xrpld.app > xrpld.shamap -Loop: ripple.core ripple.net - ripple.net > ripple.core +Loop: xrpld.core xrpld.net + xrpld.net > xrpld.core -Loop: ripple.net ripple.rpc - ripple.rpc > ripple.net +Loop: xrpld.core xrpld.perflog + xrpld.perflog ~= xrpld.core -Loop: ripple.nodestore ripple.overlay - ripple.overlay ~= ripple.nodestore +Loop: xrpld.net xrpld.rpc + xrpld.rpc > xrpld.net -Loop: ripple.overlay ripple.rpc - ripple.rpc ~= ripple.overlay +Loop: xrpld.nodestore xrpld.overlay + xrpld.overlay ~= xrpld.nodestore -Loop: test.jtx test.toplevel - test.toplevel > test.jtx +Loop: xrpld.overlay xrpld.rpc + xrpld.rpc ~= xrpld.overlay -Loop: test.jtx test.unit_test - test.unit_test == test.jtx +Loop: xrpld.perflog xrpld.rpc + xrpld.rpc ~= xrpld.perflog diff --git a/Builds/levelization/results/ordering.txt b/Builds/levelization/results/ordering.txt index ed54065d03e..87f9b03a54e 100644 --- a/Builds/levelization/results/ordering.txt +++ b/Builds/levelization/results/ordering.txt @@ -1,229 +1,203 @@ -ripple.app > ripple.basics -ripple.app > ripple.beast -ripple.app > ripple.conditions -ripple.app > ripple.consensus -ripple.app > ripple.crypto -ripple.app > ripple.json -ripple.app > ripple.protocol -ripple.app > ripple.resource -ripple.app > test.unit_test -ripple.basics > ripple.beast -ripple.conditions > ripple.basics -ripple.conditions > ripple.protocol -ripple.consensus > ripple.basics -ripple.consensus > ripple.beast -ripple.consensus > ripple.json -ripple.consensus > ripple.protocol -ripple.core > ripple.beast -ripple.core > ripple.json -ripple.core > ripple.protocol -ripple.crypto > ripple.basics -ripple.json > ripple.beast -ripple.ledger > ripple.basics -ripple.ledger > ripple.beast -ripple.ledger > ripple.core -ripple.ledger > ripple.json -ripple.ledger > ripple.protocol -ripple.net > ripple.basics -ripple.net > ripple.beast -ripple.net > ripple.json -ripple.net > ripple.protocol -ripple.net > ripple.resource -ripple.nodestore > ripple.basics -ripple.nodestore > ripple.beast -ripple.nodestore > ripple.core -ripple.nodestore > ripple.json -ripple.nodestore > ripple.protocol -ripple.nodestore > ripple.unity -ripple.overlay > ripple.basics -ripple.overlay > ripple.beast -ripple.overlay > ripple.core -ripple.overlay > ripple.json -ripple.overlay > ripple.peerfinder -ripple.overlay > ripple.protocol -ripple.overlay > ripple.resource -ripple.overlay > ripple.server -ripple.peerfinder > ripple.basics -ripple.peerfinder > ripple.beast -ripple.peerfinder > ripple.core -ripple.peerfinder > ripple.protocol -ripple.perflog > ripple.basics -ripple.perflog > ripple.beast -ripple.perflog > ripple.core -ripple.perflog > ripple.json -ripple.perflog > ripple.nodestore -ripple.perflog > ripple.protocol -ripple.perflog > ripple.rpc -ripple.protocol > ripple.beast -ripple.protocol > ripple.crypto -ripple.protocol > ripple.json -ripple.resource > ripple.basics -ripple.resource > ripple.beast -ripple.resource > ripple.json -ripple.resource > ripple.protocol -ripple.rpc > ripple.basics -ripple.rpc > ripple.beast -ripple.rpc > ripple.core -ripple.rpc > ripple.crypto -ripple.rpc > ripple.json -ripple.rpc > ripple.ledger -ripple.rpc > ripple.nodestore -ripple.rpc > ripple.protocol -ripple.rpc > ripple.resource -ripple.rpc > ripple.server -ripple.rpc > ripple.shamap -ripple.server > ripple.basics -ripple.server > ripple.beast -ripple.server > ripple.crypto -ripple.server > ripple.json -ripple.server > ripple.protocol -ripple.shamap > ripple.basics -ripple.shamap > ripple.beast -ripple.shamap > ripple.crypto -ripple.shamap > ripple.nodestore -ripple.shamap > ripple.protocol -test.app > ripple.app -test.app > ripple.basics -test.app > ripple.beast -test.app > ripple.core -test.app > ripple.json -test.app > ripple.ledger -test.app > ripple.overlay -test.app > ripple.protocol -test.app > ripple.resource -test.app > ripple.rpc +libxrpl.basics > xrpl.basics +libxrpl.basics > xrpl.protocol +libxrpl.crypto > xrpl.basics +libxrpl.json > xrpl.basics +libxrpl.json > xrpl.json +libxrpl.protocol > xrpl.basics +libxrpl.protocol > xrpl.json +libxrpl.protocol > xrpl.protocol +libxrpl.resource > xrpl.basics +libxrpl.resource > xrpl.resource +libxrpl.server > xrpl.basics +libxrpl.server > xrpl.json +libxrpl.server > xrpl.protocol +libxrpl.server > xrpl.server test.app > test.jtx test.app > test.rpc test.app > test.toplevel test.app > test.unit_test -test.basics > ripple.basics -test.basics > ripple.beast -test.basics > ripple.json -test.basics > ripple.protocol -test.basics > ripple.rpc +test.app > xrpl.basics +test.app > xrpld.app +test.app > xrpld.core +test.app > xrpld.ledger +test.app > xrpld.overlay +test.app > xrpld.rpc +test.app > xrpl.json +test.app > xrpl.protocol +test.app > xrpl.resource test.basics > test.jtx test.basics > test.unit_test -test.beast > ripple.basics -test.beast > ripple.beast -test.conditions > ripple.basics -test.conditions > ripple.beast -test.conditions > ripple.conditions -test.consensus > ripple.app -test.consensus > ripple.basics -test.consensus > ripple.beast -test.consensus > ripple.consensus -test.consensus > ripple.ledger +test.basics > xrpl.basics +test.basics > xrpld.perflog +test.basics > xrpld.rpc +test.basics > xrpl.json +test.basics > xrpl.protocol +test.beast > xrpl.basics +test.conditions > xrpl.basics +test.conditions > xrpld.conditions test.consensus > test.csf test.consensus > test.toplevel test.consensus > test.unit_test -test.core > ripple.basics -test.core > ripple.beast -test.core > ripple.core -test.core > ripple.crypto -test.core > ripple.json -test.core > ripple.server +test.consensus > xrpl.basics +test.consensus > xrpld.app +test.consensus > xrpld.consensus +test.consensus > xrpld.ledger test.core > test.jtx test.core > test.toplevel test.core > test.unit_test -test.csf > ripple.basics -test.csf > ripple.beast -test.csf > ripple.consensus -test.csf > ripple.json -test.csf > ripple.protocol -test.json > ripple.beast -test.json > ripple.json +test.core > xrpl.basics +test.core > xrpld.core +test.core > xrpld.perflog +test.core > xrpl.json +test.core > xrpl.server +test.csf > xrpl.basics +test.csf > xrpld.consensus +test.csf > xrpl.json +test.csf > xrpl.protocol test.json > test.jtx -test.jtx > ripple.app -test.jtx > ripple.basics -test.jtx > ripple.beast -test.jtx > ripple.consensus -test.jtx > ripple.core -test.jtx > ripple.json -test.jtx > ripple.ledger -test.jtx > ripple.net -test.jtx > ripple.protocol -test.jtx > ripple.resource -test.jtx > ripple.rpc -test.jtx > ripple.server -test.ledger > ripple.app -test.ledger > ripple.basics -test.ledger > ripple.beast -test.ledger > ripple.core -test.ledger > ripple.ledger -test.ledger > ripple.protocol +test.json > xrpl.json +test.jtx > xrpl.basics +test.jtx > xrpld.app +test.jtx > xrpld.consensus +test.jtx > xrpld.core +test.jtx > xrpld.ledger +test.jtx > xrpld.net +test.jtx > xrpld.rpc +test.jtx > xrpl.json +test.jtx > xrpl.protocol +test.jtx > xrpl.resource +test.jtx > xrpl.server test.ledger > test.jtx test.ledger > test.toplevel -test.net > ripple.net +test.ledger > xrpl.basics +test.ledger > xrpld.app +test.ledger > xrpld.core +test.ledger > xrpld.ledger +test.ledger > xrpl.protocol test.net > test.jtx test.net > test.toplevel test.net > test.unit_test -test.nodestore > ripple.app -test.nodestore > ripple.basics -test.nodestore > ripple.beast -test.nodestore > ripple.core -test.nodestore > ripple.nodestore -test.nodestore > ripple.protocol -test.nodestore > ripple.unity +test.net > xrpld.net test.nodestore > test.jtx test.nodestore > test.toplevel test.nodestore > test.unit_test -test.overlay > ripple.app -test.overlay > ripple.basics -test.overlay > ripple.beast -test.overlay > ripple.overlay -test.overlay > ripple.peerfinder -test.overlay > ripple.protocol -test.overlay > ripple.shamap +test.nodestore > xrpl.basics +test.nodestore > xrpld.app +test.nodestore > xrpld.core +test.nodestore > xrpld.nodestore +test.nodestore > xrpld.unity +test.nodestore > xrpl.protocol test.overlay > test.jtx test.overlay > test.unit_test -test.peerfinder > ripple.basics -test.peerfinder > ripple.beast -test.peerfinder > ripple.core -test.peerfinder > ripple.peerfinder -test.peerfinder > ripple.protocol +test.overlay > xrpl.basics +test.overlay > xrpld.app +test.overlay > xrpld.overlay +test.overlay > xrpld.peerfinder +test.overlay > xrpld.shamap +test.overlay > xrpl.protocol test.peerfinder > test.beast test.peerfinder > test.unit_test -test.protocol > ripple.basics -test.protocol > ripple.beast -test.protocol > ripple.crypto -test.protocol > ripple.json -test.protocol > ripple.protocol +test.peerfinder > xrpl.basics +test.peerfinder > xrpld.core +test.peerfinder > xrpld.peerfinder +test.peerfinder > xrpl.protocol test.protocol > test.toplevel -test.resource > ripple.basics -test.resource > ripple.beast -test.resource > ripple.resource +test.protocol > xrpl.basics +test.protocol > xrpl.json +test.protocol > xrpl.protocol test.resource > test.unit_test -test.rpc > ripple.app -test.rpc > ripple.basics -test.rpc > ripple.beast -test.rpc > ripple.core -test.rpc > ripple.json -test.rpc > ripple.net -test.rpc > ripple.nodestore -test.rpc > ripple.overlay -test.rpc > ripple.protocol -test.rpc > ripple.resource -test.rpc > ripple.rpc +test.resource > xrpl.basics +test.resource > xrpl.resource test.rpc > test.jtx test.rpc > test.nodestore test.rpc > test.toplevel -test.server > ripple.app -test.server > ripple.basics -test.server > ripple.beast -test.server > ripple.core -test.server > ripple.json -test.server > ripple.rpc -test.server > ripple.server +test.rpc > xrpl.basics +test.rpc > xrpld.app +test.rpc > xrpld.core +test.rpc > xrpld.net +test.rpc > xrpld.nodestore +test.rpc > xrpld.overlay +test.rpc > xrpld.rpc +test.rpc > xrpl.json +test.rpc > xrpl.protocol +test.rpc > xrpl.resource test.server > test.jtx test.server > test.toplevel test.server > test.unit_test -test.shamap > ripple.basics -test.shamap > ripple.beast -test.shamap > ripple.nodestore -test.shamap > ripple.protocol -test.shamap > ripple.shamap +test.server > xrpl.basics +test.server > xrpld.app +test.server > xrpld.core +test.server > xrpld.rpc +test.server > xrpl.json +test.server > xrpl.server test.shamap > test.unit_test -test.toplevel > ripple.json +test.shamap > xrpl.basics +test.shamap > xrpld.nodestore +test.shamap > xrpld.shamap +test.shamap > xrpl.protocol test.toplevel > test.csf -test.unit_test > ripple.basics -test.unit_test > ripple.beast +test.toplevel > xrpl.json +test.unit_test > xrpl.basics +xrpl.protocol > xrpl.basics +xrpl.protocol > xrpl.json +xrpl.resource > xrpl.basics +xrpl.resource > xrpl.json +xrpl.resource > xrpl.protocol +xrpl.server > xrpl.basics +xrpl.server > xrpl.json +xrpl.server > xrpl.protocol +xrpld.app > test.unit_test +xrpld.app > xrpl.basics +xrpld.app > xrpld.conditions +xrpld.app > xrpld.consensus +xrpld.app > xrpld.perflog +xrpld.app > xrpl.json +xrpld.app > xrpl.protocol +xrpld.app > xrpl.resource +xrpld.conditions > xrpl.basics +xrpld.conditions > xrpl.protocol +xrpld.consensus > xrpl.basics +xrpld.consensus > xrpl.json +xrpld.consensus > xrpl.protocol +xrpld.core > xrpl.basics +xrpld.core > xrpl.json +xrpld.core > xrpl.protocol +xrpld.ledger > xrpl.basics +xrpld.ledger > xrpld.core +xrpld.ledger > xrpl.json +xrpld.ledger > xrpl.protocol +xrpld.net > xrpl.basics +xrpld.net > xrpl.json +xrpld.net > xrpl.protocol +xrpld.net > xrpl.resource +xrpld.nodestore > xrpl.basics +xrpld.nodestore > xrpld.core +xrpld.nodestore > xrpld.unity +xrpld.nodestore > xrpl.json +xrpld.nodestore > xrpl.protocol +xrpld.overlay > xrpl.basics +xrpld.overlay > xrpld.core +xrpld.overlay > xrpld.peerfinder +xrpld.overlay > xrpl.json +xrpld.overlay > xrpl.protocol +xrpld.overlay > xrpl.resource +xrpld.overlay > xrpl.server +xrpld.peerfinder > xrpl.basics +xrpld.peerfinder > xrpld.core +xrpld.peerfinder > xrpl.protocol +xrpld.perflog > xrpl.basics +xrpld.perflog > xrpld.nodestore +xrpld.perflog > xrpl.json +xrpld.perflog > xrpl.protocol +xrpld.rpc > xrpl.basics +xrpld.rpc > xrpld.core +xrpld.rpc > xrpld.ledger +xrpld.rpc > xrpld.nodestore +xrpld.rpc > xrpld.shamap +xrpld.rpc > xrpl.json +xrpld.rpc > xrpl.protocol +xrpld.rpc > xrpl.resource +xrpld.rpc > xrpl.server +xrpld.shamap > xrpl.basics +xrpld.shamap > xrpld.nodestore +xrpld.shamap > xrpl.protocol diff --git a/CMakeLists.txt b/CMakeLists.txt index dcb493e5293..a69583f9cbf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,9 +9,9 @@ endif() # Fix "unrecognized escape" issues when passing CMAKE_MODULE_PATH on Windows. file(TO_CMAKE_PATH "${CMAKE_MODULE_PATH}" CMAKE_MODULE_PATH) -list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/Builds/CMake") +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") -project(rippled) +project(xrpl) set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) @@ -81,7 +81,6 @@ find_package(lz4 REQUIRED) find_package(LibArchive REQUIRED) find_package(SOCI REQUIRED) find_package(SQLite3 REQUIRED) -find_package(Snappy REQUIRED) option(rocksdb "Enable RocksDB" ON) if(rocksdb) @@ -129,9 +128,7 @@ if(coverage) include(RippledCov) endif() -### - +set(PROJECT_EXPORT_SET RippleExports) include(RippledCore) include(RippledInstall) -include(RippledMultiConfig) include(RippledValidatorKeys) diff --git a/bin/physical.sh b/bin/physical.sh new file mode 100755 index 00000000000..c2c5aad68db --- /dev/null +++ b/bin/physical.sh @@ -0,0 +1,218 @@ +#!/bin/bash + +set -o errexit + +marker_base=985c80fbc6131f3a8cedd0da7e8af98dfceb13c7 +marker_commit=${1:-${marker_base}} + +if [ $(git merge-base ${marker_commit} ${marker_base}) != ${marker_base} ]; then + echo "first marker commit not an ancestor: ${marker_commit}" + exit 1 +fi + +if [ $(git merge-base ${marker_commit} HEAD) != $(git rev-parse --verify ${marker_commit}) ]; then + echo "given marker commit not an ancestor: ${marker_commit}" + exit 1 +fi + +if [ -e Builds/CMake ]; then + echo move CMake + git mv Builds/CMake cmake + git add --update . + git commit -m 'Move CMake directory' --author 'Pretty Printer ' +fi + +if [ -e src/ripple ]; then + + echo move protocol buffers + mkdir -p include/xrpl + if [ -e src/ripple/proto ]; then + git mv src/ripple/proto include/xrpl + fi + + extract_list() { + git show ${marker_commit}:Builds/CMake/RippledCore.cmake | \ + awk "/END ${1}/ { p = 0 } p && /src\/ripple/; /BEGIN ${1}/ { p = 1 }" | \ + sed -e 's#src/ripple/##' -e 's#[^a-z]\+$##' + } + + move_files() { + oldroot="$1"; shift + newroot="$1"; shift + detail="$1"; shift + files=("$@") + for file in ${files[@]}; do + if [ ! -e ${oldroot}/${file} ]; then + continue + fi + dir=$(dirname ${file}) + if [ $(basename ${dir}) == 'details' ]; then + dir=$(dirname ${dir}) + fi + if [ $(basename ${dir}) == 'impl' ]; then + dir="$(dirname ${dir})/${detail}" + fi + mkdir -p ${newroot}/${dir} + git mv ${oldroot}/${file} ${newroot}/${dir} + done + } + + echo move libxrpl headers + files=$(extract_list 'LIBXRPL HEADERS') + files+=( + basics/SlabAllocator.h + + beast/asio/io_latency_probe.h + beast/container/aged_container.h + beast/container/aged_container_utility.h + beast/container/aged_map.h + beast/container/aged_multimap.h + beast/container/aged_multiset.h + beast/container/aged_set.h + beast/container/aged_unordered_map.h + beast/container/aged_unordered_multimap.h + beast/container/aged_unordered_multiset.h + beast/container/aged_unordered_set.h + beast/container/detail/aged_associative_container.h + beast/container/detail/aged_container_iterator.h + beast/container/detail/aged_ordered_container.h + beast/container/detail/aged_unordered_container.h + beast/container/detail/empty_base_optimization.h + beast/core/LockFreeStack.h + beast/insight/Collector.h + beast/insight/Counter.h + beast/insight/CounterImpl.h + beast/insight/Event.h + beast/insight/EventImpl.h + beast/insight/Gauge.h + beast/insight/GaugeImpl.h + beast/insight/Group.h + beast/insight/Groups.h + beast/insight/Hook.h + beast/insight/HookImpl.h + beast/insight/Insight.h + beast/insight/Meter.h + beast/insight/MeterImpl.h + beast/insight/NullCollector.h + beast/insight/StatsDCollector.h + beast/test/fail_counter.h + beast/test/fail_stream.h + beast/test/pipe_stream.h + beast/test/sig_wait.h + beast/test/string_iostream.h + beast/test/string_istream.h + beast/test/string_ostream.h + beast/test/test_allocator.h + beast/test/yield_to.h + beast/utility/hash_pair.h + beast/utility/maybe_const.h + beast/utility/temp_dir.h + + # included by only json/impl/json_assert.h + json/json_errors.h + + protocol/PayChan.h + protocol/RippleLedgerHash.h + protocol/messages.h + protocol/st.h + ) + files+=( + basics/README.md + crypto/README.md + json/README.md + protocol/README.md + resource/README.md + ) + move_files src/ripple include/xrpl detail ${files[@]} + + echo move libxrpl sources + files=$(extract_list 'LIBXRPL SOURCES') + move_files src/ripple src/libxrpl "" ${files[@]} + + echo check leftovers + dirs=$(cd include/xrpl; ls -d */) + dirs=$(cd src/ripple; ls -d ${dirs} 2>/dev/null || true) + files="$(cd src/ripple; find ${dirs} -type f)" + if [ -n "${files}" ]; then + echo "leftover files:" + echo ${files} + exit + fi + + echo remove empty directories + empty_dirs="$(cd src/ripple; find ${dirs} -depth -type d)" + for dir in ${empty_dirs[@]}; do + if [ -e ${dir} ]; then + rmdir ${dir} + fi + done + + echo move xrpld sources + files=$( + extract_list 'XRPLD SOURCES' + cd src/ripple + find * -regex '.*\.\(h\|ipp\|md\|pu\|uml\|png\)' + ) + move_files src/ripple src/xrpld detail ${files[@]} + + files="$(cd src/ripple; find . -type f)" + if [ -n "${files}" ]; then + echo "leftover files:" + echo ${files} + exit + fi + +fi + +rm -rf src/ripple + +echo rename .hpp to .h +find include src -name '*.hpp' -exec bash -c 'f="{}"; git mv "${f}" "${f%hpp}h"' \; + +echo move PerfLog.h +if [ -e include/xrpl/basics/PerfLog.h ]; then + git mv include/xrpl/basics/PerfLog.h src/xrpld/perflog +fi + +# Make sure all protobuf includes have the correct prefix. +protobuf_replace='s:^#include\s*["<].*org/xrpl\([^">]\+\)[">]:#include :' +# Make sure first-party includes use angle brackets and .h extension. +ripple_replace='s:include\s*["<]ripple/\(.*\)\.h\(pp\)\?[">]:include :' +beast_replace='s:include\s*:#include :" \ + -e "s:^#include ' +find include src -type f \( -name '*.cpp' -o -name '*.h' -o -name '*.ipp' \) -exec clang-format-10 -i {} + +git add --update . +git commit -m 'Rewrite includes' --author 'Pretty Printer ' +./Builds/levelization/levelization.sh +git add --update . +git commit -m 'Recompute loops' --author 'Pretty Printer ' diff --git a/Builds/CMake/CMakeFuncs.cmake b/cmake/CMakeFuncs.cmake similarity index 100% rename from Builds/CMake/CMakeFuncs.cmake rename to cmake/CMakeFuncs.cmake diff --git a/Builds/CMake/CodeCoverage.cmake b/cmake/CodeCoverage.cmake similarity index 100% rename from Builds/CMake/CodeCoverage.cmake rename to cmake/CodeCoverage.cmake diff --git a/Builds/CMake/RippleConfig.cmake b/cmake/RippleConfig.cmake similarity index 100% rename from Builds/CMake/RippleConfig.cmake rename to cmake/RippleConfig.cmake diff --git a/Builds/CMake/RippledCompiler.cmake b/cmake/RippledCompiler.cmake similarity index 100% rename from Builds/CMake/RippledCompiler.cmake rename to cmake/RippledCompiler.cmake diff --git a/cmake/RippledCore.cmake b/cmake/RippledCore.cmake new file mode 100644 index 00000000000..6a0060f7b32 --- /dev/null +++ b/cmake/RippledCore.cmake @@ -0,0 +1,149 @@ +#[===================================================================[ + Exported targets. +#]===================================================================] + +include(target_protobuf_sources) + +# Protocol buffers cannot participate in a unity build, +# because all the generated sources +# define a bunch of `static const` variables with the same names, +# so we just build them as a separate library. +add_library(xrpl.libpb) +target_protobuf_sources(xrpl.libpb xrpl/proto + LANGUAGE cpp + IMPORT_DIRS include/xrpl/proto + PROTOS include/xrpl/proto/ripple.proto +) + +file(GLOB_RECURSE protos "include/xrpl/proto/org/*.proto") +target_protobuf_sources(xrpl.libpb xrpl/proto + LANGUAGE cpp + IMPORT_DIRS include/xrpl/proto + PROTOS "${protos}" +) +target_protobuf_sources(xrpl.libpb xrpl/proto + LANGUAGE grpc + IMPORT_DIRS include/xrpl/proto + PROTOS "${protos}" + PLUGIN protoc-gen-grpc=$ + GENERATE_EXTENSIONS .grpc.pb.h .grpc.pb.cc +) + +target_compile_options(xrpl.libpb + PUBLIC + $<$:-wd4996> + $<$: + --system-header-prefix="google/protobuf" + -Wno-deprecated-dynamic-exception-spec + > + PRIVATE + $<$:-wd4065> + $<$>:-Wno-deprecated-declarations> +) + +target_link_libraries(xrpl.libpb + PUBLIC + protobuf::libprotobuf + gRPC::grpc++ +) + +add_library(xrpl.libxrpl) +set_target_properties(xrpl.libxrpl PROPERTIES OUTPUT_NAME xrpl) +if(unity) + set_target_properties(xrpl.libxrpl PROPERTIES UNITY_BUILD ON) +endif() + +add_library(xrpl::libxrpl ALIAS xrpl.libxrpl) + +file(GLOB_RECURSE sources CONFIGURE_DEPENDS + "${CMAKE_CURRENT_SOURCE_DIR}/src/libxrpl/*.cpp" +) +target_sources(xrpl.libxrpl PRIVATE ${sources}) + +target_include_directories(xrpl.libxrpl + PUBLIC + $ + $) + +target_compile_definitions(xrpl.libxrpl + PUBLIC + BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT + BOOST_CONTAINER_FWD_BAD_DEQUE + HAS_UNCAUGHT_EXCEPTIONS=1) + +target_compile_options(xrpl.libxrpl + PUBLIC + $<$:-Wno-maybe-uninitialized> +) + +target_link_libraries(xrpl.libxrpl + PUBLIC + LibArchive::LibArchive + OpenSSL::Crypto + Ripple::boost + Ripple::opts + Ripple::syslibs + absl::random_random + date::date + ed25519::ed25519 + secp256k1::secp256k1 + xrpl.libpb + xxHash::xxhash +) + +if(xrpld) + add_executable(rippled) + if(unity) + set_target_properties(rippled PROPERTIES UNITY_BUILD ON) + endif() + if(tests) + target_compile_definitions(rippled PUBLIC ENABLE_TESTS) + endif() + target_include_directories(rippled + PRIVATE + $ + ) + + file(GLOB_RECURSE sources CONFIGURE_DEPENDS + "${CMAKE_CURRENT_SOURCE_DIR}/src/xrpld/*.cpp" + ) + target_sources(rippled PRIVATE ${sources}) + + if(tests) + file(GLOB_RECURSE sources CONFIGURE_DEPENDS + "${CMAKE_CURRENT_SOURCE_DIR}/src/test/*.cpp" + ) + target_sources(rippled PRIVATE ${sources}) + endif() + + target_link_libraries(rippled + Ripple::boost + Ripple::opts + Ripple::libs + xrpl.libxrpl + ) + exclude_if_included(rippled) + # define a macro for tests that might need to + # be exluded or run differently in CI environment + if(is_ci) + target_compile_definitions(rippled PRIVATE RIPPLED_RUNNING_IN_CI) + endif () + + if(reporting) + set(suffix -reporting) + set_target_properties(rippled PROPERTIES OUTPUT_NAME rippled-reporting) + get_target_property(BIN_NAME rippled OUTPUT_NAME) + message(STATUS "Reporting mode build: rippled renamed ${BIN_NAME}") + target_compile_definitions(rippled PRIVATE RIPPLED_REPORTING) + endif() + + # any files that don't play well with unity should be added here + if(tests) + set_source_files_properties( + # these two seem to produce conflicts in beast teardown template methods + src/test/rpc/ValidatorRPC_test.cpp + src/test/rpc/ShardArchiveHandler_test.cpp + src/test/ledger/Invariants_test.cpp + PROPERTIES SKIP_UNITY_BUILD_INCLUSION TRUE) + endif() +endif() diff --git a/Builds/CMake/RippledCov.cmake b/cmake/RippledCov.cmake similarity index 100% rename from Builds/CMake/RippledCov.cmake rename to cmake/RippledCov.cmake diff --git a/Builds/CMake/RippledDocs.cmake b/cmake/RippledDocs.cmake similarity index 98% rename from Builds/CMake/RippledDocs.cmake rename to cmake/RippledDocs.cmake index e7c42942a77..a9b8b283bf0 100644 --- a/Builds/CMake/RippledDocs.cmake +++ b/cmake/RippledDocs.cmake @@ -25,8 +25,7 @@ file(GLOB_RECURSE doxygen_input src/ripple/*.cpp src/ripple/*.md src/test/*.h - src/test/*.md - Builds/*/README.md) + src/test/*.md) list(APPEND doxygen_input README.md RELEASENOTES.md diff --git a/Builds/CMake/RippledInstall.cmake b/cmake/RippledInstall.cmake similarity index 70% rename from Builds/CMake/RippledInstall.cmake rename to cmake/RippledInstall.cmake index b9dd44cfc2c..3199c9a19b8 100644 --- a/Builds/CMake/RippledInstall.cmake +++ b/cmake/RippledInstall.cmake @@ -8,14 +8,26 @@ install ( opts ripple_syslibs ripple_boost - xrpl_core xrpl.libpb + xrpl.libxrpl EXPORT RippleExports LIBRARY DESTINATION lib ARCHIVE DESTINATION lib RUNTIME DESTINATION bin INCLUDES DESTINATION include) +install( + DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/xrpl" + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" +) + +if(NOT WIN32) + install( + CODE "file(CREATE_LINK xrpl \ + \${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/ripple SYMBOLIC)" + ) +endif() + install (EXPORT RippleExports FILE RippleTargets.cmake NAMESPACE Ripple:: @@ -26,14 +38,9 @@ write_basic_package_version_file ( VERSION ${rippled_version} COMPATIBILITY SameMajorVersion) -if (is_root_project) +if (is_root_project AND TARGET rippled) install (TARGETS rippled RUNTIME DESTINATION bin) set_target_properties(rippled PROPERTIES INSTALL_RPATH_USE_LINK_PATH ON) - install ( - FILES - ${CMAKE_CURRENT_SOURCE_DIR}/Builds/CMake/RippleConfig.cmake - ${CMAKE_CURRENT_BINARY_DIR}/RippleConfigVersion.cmake - DESTINATION lib/cmake/ripple) # sample configs should not overwrite existing files # install if-not-exists workaround as suggested by # https://cmake.org/Bug/view.php?id=12646 @@ -48,4 +55,16 @@ if (is_root_project) copy_if_not_exists(\"${CMAKE_CURRENT_SOURCE_DIR}/cfg/rippled-example.cfg\" etc rippled.cfg) copy_if_not_exists(\"${CMAKE_CURRENT_SOURCE_DIR}/cfg/validators-example.txt\" etc validators.txt) ") + if(NOT WIN32) + install( + CODE "file(CREATE_LINK rippled${suffix} \ + \${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/xrpld${suffix} SYMBOLIC)" + ) + endif() endif () + +install ( + FILES + ${CMAKE_CURRENT_SOURCE_DIR}/cmake/RippleConfig.cmake + ${CMAKE_CURRENT_BINARY_DIR}/RippleConfigVersion.cmake + DESTINATION lib/cmake/ripple) diff --git a/Builds/CMake/RippledInterface.cmake b/cmake/RippledInterface.cmake similarity index 100% rename from Builds/CMake/RippledInterface.cmake rename to cmake/RippledInterface.cmake diff --git a/Builds/CMake/RippledSanity.cmake b/cmake/RippledSanity.cmake similarity index 100% rename from Builds/CMake/RippledSanity.cmake rename to cmake/RippledSanity.cmake diff --git a/Builds/CMake/RippledSettings.cmake b/cmake/RippledSettings.cmake similarity index 99% rename from Builds/CMake/RippledSettings.cmake rename to cmake/RippledSettings.cmake index fae09cc5d3f..a431bb61389 100644 --- a/Builds/CMake/RippledSettings.cmake +++ b/cmake/RippledSettings.cmake @@ -8,6 +8,8 @@ ProcessorCount(PROCESSOR_COUNT) option(assert "Enables asserts, even in release builds" OFF) +option(xrpld "Build xrpld" ON) + option(reporting "Build rippled with reporting mode enabled" OFF) option(tests "Build tests" ON) diff --git a/Builds/CMake/RippledValidatorKeys.cmake b/cmake/RippledValidatorKeys.cmake similarity index 100% rename from Builds/CMake/RippledValidatorKeys.cmake rename to cmake/RippledValidatorKeys.cmake diff --git a/cmake/RippledVersion.cmake b/cmake/RippledVersion.cmake new file mode 100644 index 00000000000..fda3cb6ff7b --- /dev/null +++ b/cmake/RippledVersion.cmake @@ -0,0 +1,15 @@ +#[===================================================================[ + read version from source +#]===================================================================] + +file(STRINGS src/libxrpl/protocol/BuildInfo.cpp BUILD_INFO) +foreach(line_ ${BUILD_INFO}) + if(line_ MATCHES "versionString[ ]*=[ ]*\"(.+)\"") + set(rippled_version ${CMAKE_MATCH_1}) + endif() +endforeach() +if(rippled_version) + message(STATUS "rippled version: ${rippled_version}") +else() + message(FATAL_ERROR "unable to determine rippled version") +endif() diff --git a/Builds/CMake/deps/Boost.cmake b/cmake/deps/Boost.cmake similarity index 100% rename from Builds/CMake/deps/Boost.cmake rename to cmake/deps/Boost.cmake diff --git a/Builds/CMake/target_protobuf_sources.cmake b/cmake/target_protobuf_sources.cmake similarity index 100% rename from Builds/CMake/target_protobuf_sources.cmake rename to cmake/target_protobuf_sources.cmake diff --git a/conanfile.py b/conanfile.py index 78eab272a55..425fee8b682 100644 --- a/conanfile.py +++ b/conanfile.py @@ -21,6 +21,7 @@ class Xrpl(ConanFile): 'static': [True, False], 'tests': [True, False], 'unity': [True, False], + 'xrpld': [True, False], } requires = [ @@ -29,10 +30,9 @@ class Xrpl(ConanFile): 'libarchive/3.6.2', 'nudb/2.0.8', 'openssl/1.1.1u', - 'snappy/1.1.10', 'soci/4.0.3', - 'zlib/1.2.13', 'xxhash/0.8.2', + 'zlib/1.2.13', ] tool_requires = [ @@ -48,8 +48,9 @@ class Xrpl(ConanFile): 'rocksdb': True, 'shared': False, 'static': True, - 'tests': True, + 'tests': False, 'unity': False, + 'xrpld': False, 'cassandra-cpp-driver/*:shared': False, 'cassandra-cpp-driver/*:use_atomic': None, @@ -91,7 +92,7 @@ class Xrpl(ConanFile): } def set_version(self): - path = f'{self.recipe_folder}/src/ripple/protocol/impl/BuildInfo.cpp' + path = f'{self.recipe_folder}/src/libxrpl/protocol/BuildInfo.cpp' regex = r'versionString\s?=\s?\"(.*)\"' with open(path, 'r') as file: matches = (re.search(regex, line) for line in file) @@ -117,10 +118,11 @@ def requirements(self): exports_sources = ( 'CMakeLists.txt', - 'Builds/*', 'bin/getRippledInfo', 'cfg/*', + 'cmake/*', 'external/*', + 'include/*', 'src/*', ) @@ -142,6 +144,7 @@ def generate(self): tc.variables['BUILD_SHARED_LIBS'] = self.options.shared tc.variables['static'] = self.options.static tc.variables['unity'] = self.options.unity + tc.variables['xrpld'] = self.options.xrpld tc.generate() def build(self): @@ -158,7 +161,7 @@ def package(self): def package_info(self): libxrpl = self.cpp_info.components['libxrpl'] libxrpl.libs = [ - 'xrpl_core', + 'xrpl', 'xrpl.libpb', 'ed25519', 'secp256k1', @@ -175,7 +178,6 @@ def package_info(self): 'nudb::nudb', 'openssl::crypto', 'protobuf::libprotobuf', - 'snappy::snappy', 'soci::soci', 'sqlite3::sqlite', 'xxhash::xxhash', diff --git a/examples/example/CMakeLists.txt b/examples/example/CMakeLists.txt new file mode 100644 index 00000000000..83aa24880d1 --- /dev/null +++ b/examples/example/CMakeLists.txt @@ -0,0 +1,16 @@ +cmake_minimum_required(VERSION 3.21) + +set(name example) +set(version 0.1.0) + +project( + ${name} + VERSION ${version} + LANGUAGES CXX +) + +find_package(xrpl REQUIRED) + +add_executable(example) +target_sources(example PRIVATE src/example.cpp) +target_link_libraries(example PRIVATE xrpl::libxrpl) diff --git a/examples/example/conanfile.py b/examples/example/conanfile.py new file mode 100644 index 00000000000..be3750bf9e9 --- /dev/null +++ b/examples/example/conanfile.py @@ -0,0 +1,59 @@ +from conan import ConanFile, conan_version +from conan.tools.cmake import CMake, cmake_layout + +class Example(ConanFile): + + def set_name(self): + if self.name is None: + self.name = 'example' + + def set_version(self): + if self.version is None: + self.version = '0.1.0' + + license = 'ISC' + author = 'John Freeman ' + + settings = 'os', 'compiler', 'build_type', 'arch' + options = {'shared': [True, False], 'fPIC': [True, False]} + default_options = { + 'shared': False, + 'fPIC': True, + 'xrpl:xrpld': False, + } + + requires = ['xrpl/2.2.0-rc1@jfreeman/nodestore'] + generators = ['CMakeDeps', 'CMakeToolchain'] + + exports_sources = [ + 'CMakeLists.txt', + 'cmake/*', + 'external/*', + 'include/*', + 'src/*', + ] + + # For out-of-source build. + # https://docs.conan.io/en/latest/reference/build_helpers/cmake.html#configure + no_copy_source = True + + def layout(self): + cmake_layout(self) + + def config_options(self): + if self.settings.os == 'Windows': + del self.options.fPIC + + def build(self): + cmake = CMake(self) + cmake.configure(variables={'BUILD_TESTING': 'NO'}) + cmake.build() + + def package(self): + cmake = CMake(self) + cmake.install() + + def package_info(self): + path = f'{self.package_folder}/share/{self.name}/cpp_info.py' + with open(path, 'r') as file: + exec(file.read(), {}, {'self': self.cpp_info}) diff --git a/examples/example/src/example.cpp b/examples/example/src/example.cpp new file mode 100644 index 00000000000..7ff07f6ea4d --- /dev/null +++ b/examples/example/src/example.cpp @@ -0,0 +1,8 @@ +#include + +#include + +int main(int argc, char const** argv) { + std::printf("%s\n", ripple::BuildInfo::getVersionString().c_str()); + return 0; +} diff --git a/external/nudb/conandata.yml b/external/nudb/conandata.yml new file mode 100644 index 00000000000..721129f88e7 --- /dev/null +++ b/external/nudb/conandata.yml @@ -0,0 +1,10 @@ +sources: + "2.0.8": + url: "https://github.com/CPPAlliance/NuDB/archive/2.0.8.tar.gz" + sha256: "9b71903d8ba111cd893ab064b9a8b6ac4124ed8bd6b4f67250205bc43c7f13a8" +patches: + "2.0.8": + - patch_file: "patches/2.0.8-0001-add-include-stdexcept-for-msvc.patch" + patch_description: "Fix build for MSVC by including stdexcept" + patch_type: "portability" + patch_source: "https://github.com/cppalliance/NuDB/pull/100/files" diff --git a/external/nudb/conanfile.py b/external/nudb/conanfile.py new file mode 100644 index 00000000000..a046e2ba898 --- /dev/null +++ b/external/nudb/conanfile.py @@ -0,0 +1,72 @@ +import os + +from conan import ConanFile +from conan.tools.build import check_min_cppstd +from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get +from conan.tools.layout import basic_layout + +required_conan_version = ">=1.52.0" + + +class NudbConan(ConanFile): + name = "nudb" + description = "A fast key/value insert-only database for SSD drives in C++11" + license = "BSL-1.0" + url = "https://github.com/conan-io/conan-center-index" + homepage = "https://github.com/CPPAlliance/NuDB" + topics = ("header-only", "KVS", "insert-only") + + package_type = "header-library" + settings = "os", "arch", "compiler", "build_type" + no_copy_source = True + + @property + def _min_cppstd(self): + return 11 + + def export_sources(self): + export_conandata_patches(self) + + def layout(self): + basic_layout(self, src_folder="src") + + def requirements(self): + self.requires("boost/1.83.0") + + def package_id(self): + self.info.clear() + + def validate(self): + if self.settings.compiler.cppstd: + check_min_cppstd(self, self._min_cppstd) + + def source(self): + get(self, **self.conan_data["sources"][self.version], strip_root=True) + + def build(self): + apply_conandata_patches(self) + + def package(self): + copy(self, "LICENSE*", + dst=os.path.join(self.package_folder, "licenses"), + src=self.source_folder) + copy(self, "*", + dst=os.path.join(self.package_folder, "include"), + src=os.path.join(self.source_folder, "include")) + + def package_info(self): + self.cpp_info.bindirs = [] + self.cpp_info.libdirs = [] + + self.cpp_info.set_property("cmake_target_name", "NuDB") + self.cpp_info.set_property("cmake_target_aliases", ["NuDB::nudb"]) + self.cpp_info.set_property("cmake_find_mode", "both") + + self.cpp_info.components["core"].set_property("cmake_target_name", "nudb") + self.cpp_info.components["core"].names["cmake_find_package"] = "nudb" + self.cpp_info.components["core"].names["cmake_find_package_multi"] = "nudb" + self.cpp_info.components["core"].requires = ["boost::thread", "boost::system"] + + # TODO: to remove in conan v2 once cmake_find_package_* generators removed + self.cpp_info.names["cmake_find_package"] = "NuDB" + self.cpp_info.names["cmake_find_package_multi"] = "NuDB" diff --git a/external/nudb/patches/2.0.8-0001-add-include-stdexcept-for-msvc.patch b/external/nudb/patches/2.0.8-0001-add-include-stdexcept-for-msvc.patch new file mode 100644 index 00000000000..2d5264f3ce4 --- /dev/null +++ b/external/nudb/patches/2.0.8-0001-add-include-stdexcept-for-msvc.patch @@ -0,0 +1,24 @@ +diff --git a/include/nudb/detail/stream.hpp b/include/nudb/detail/stream.hpp +index 6c07bf1..e0ce8ed 100644 +--- a/include/nudb/detail/stream.hpp ++++ b/include/nudb/detail/stream.hpp +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + + namespace nudb { + namespace detail { +diff --git a/include/nudb/impl/context.ipp b/include/nudb/impl/context.ipp +index beb7058..ffde0b3 100644 +--- a/include/nudb/impl/context.ipp ++++ b/include/nudb/impl/context.ipp +@@ -9,6 +9,7 @@ + #define NUDB_IMPL_CONTEXT_IPP + + #include ++#include + + namespace nudb { + diff --git a/external/secp256k1/src/secp256k1.c b/external/secp256k1/src/secp256k1.c index bdbd97cc408..a95992c5dd2 100644 --- a/external/secp256k1/src/secp256k1.c +++ b/external/secp256k1/src/secp256k1.c @@ -526,7 +526,7 @@ static int secp256k1_ecdsa_sign_inner(const secp256k1_context* ctx, secp256k1_sc break; } is_nonce_valid = secp256k1_scalar_set_b32_seckey(&non, nonce32); - /* The nonce is still secret here, but it being invalid is is less likely than 1:2^255. */ + /* The nonce is still secret here, but it being invalid is less likely than 1:2^255. */ secp256k1_declassify(ctx, &is_nonce_valid, sizeof(is_nonce_valid)); if (is_nonce_valid) { ret = secp256k1_ecdsa_sig_sign(&ctx->ecmult_gen_ctx, r, s, &sec, &msg, &non, recid); diff --git a/src/ripple/basics/Archive.h b/include/xrpl/basics/Archive.h similarity index 100% rename from src/ripple/basics/Archive.h rename to include/xrpl/basics/Archive.h diff --git a/src/ripple/basics/BasicConfig.h b/include/xrpl/basics/BasicConfig.h similarity index 99% rename from src/ripple/basics/BasicConfig.h rename to include/xrpl/basics/BasicConfig.h index db293979f13..8f522cdd2f2 100644 --- a/src/ripple/basics/BasicConfig.h +++ b/include/xrpl/basics/BasicConfig.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_BASICS_BASICCONFIG_H_INCLUDED #define RIPPLE_BASICS_BASICCONFIG_H_INCLUDED -#include +#include #include #include #include diff --git a/src/ripple/basics/Blob.h b/include/xrpl/basics/Blob.h similarity index 100% rename from src/ripple/basics/Blob.h rename to include/xrpl/basics/Blob.h diff --git a/src/ripple/basics/Buffer.h b/include/xrpl/basics/Buffer.h similarity index 99% rename from src/ripple/basics/Buffer.h rename to include/xrpl/basics/Buffer.h index 706b8b627f1..25ae8ca315c 100644 --- a/src/ripple/basics/Buffer.h +++ b/include/xrpl/basics/Buffer.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_BASICS_BUFFER_H_INCLUDED #define RIPPLE_BASICS_BUFFER_H_INCLUDED -#include +#include #include #include #include diff --git a/src/ripple/basics/ByteUtilities.h b/include/xrpl/basics/ByteUtilities.h similarity index 100% rename from src/ripple/basics/ByteUtilities.h rename to include/xrpl/basics/ByteUtilities.h diff --git a/src/ripple/basics/CompressionAlgorithms.h b/include/xrpl/basics/CompressionAlgorithms.h similarity index 99% rename from src/ripple/basics/CompressionAlgorithms.h rename to include/xrpl/basics/CompressionAlgorithms.h index eef2608916d..4defd5a4904 100644 --- a/src/ripple/basics/CompressionAlgorithms.h +++ b/include/xrpl/basics/CompressionAlgorithms.h @@ -20,7 +20,7 @@ #ifndef RIPPLED_COMPRESSIONALGORITHMS_H_INCLUDED #define RIPPLED_COMPRESSIONALGORITHMS_H_INCLUDED -#include +#include #include #include #include diff --git a/src/ripple/basics/CountedObject.h b/include/xrpl/basics/CountedObject.h similarity index 99% rename from src/ripple/basics/CountedObject.h rename to include/xrpl/basics/CountedObject.h index 690841fe1ef..9ea76aa3bd0 100644 --- a/src/ripple/basics/CountedObject.h +++ b/include/xrpl/basics/CountedObject.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_BASICS_COUNTEDOBJECT_H_INCLUDED #define RIPPLE_BASICS_COUNTEDOBJECT_H_INCLUDED -#include +#include #include #include #include diff --git a/src/ripple/basics/DecayingSample.h b/include/xrpl/basics/DecayingSample.h similarity index 100% rename from src/ripple/basics/DecayingSample.h rename to include/xrpl/basics/DecayingSample.h diff --git a/src/ripple/basics/Expected.h b/include/xrpl/basics/Expected.h similarity index 99% rename from src/ripple/basics/Expected.h rename to include/xrpl/basics/Expected.h index bb699579b17..745fa50a69f 100644 --- a/src/ripple/basics/Expected.h +++ b/include/xrpl/basics/Expected.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_BASICS_EXPECTED_H_INCLUDED #define RIPPLE_BASICS_EXPECTED_H_INCLUDED -#include +#include #include diff --git a/src/ripple/basics/FeeUnits.h b/include/xrpl/basics/FeeUnits.h similarity index 99% rename from src/ripple/basics/FeeUnits.h rename to include/xrpl/basics/FeeUnits.h index 35e0ff24d05..9d5e6e216a4 100644 --- a/src/ripple/basics/FeeUnits.h +++ b/include/xrpl/basics/FeeUnits.h @@ -19,7 +19,7 @@ #ifndef BASICS_FEES_H_INCLUDED #define BASICS_FEES_H_INCLUDED -#include +#include #include #include #include diff --git a/src/ripple/basics/FileUtilities.h b/include/xrpl/basics/FileUtilities.h similarity index 100% rename from src/ripple/basics/FileUtilities.h rename to include/xrpl/basics/FileUtilities.h diff --git a/src/ripple/basics/IOUAmount.h b/include/xrpl/basics/IOUAmount.h similarity index 97% rename from src/ripple/basics/IOUAmount.h rename to include/xrpl/basics/IOUAmount.h index 2380a7d15e1..221434aa85a 100644 --- a/src/ripple/basics/IOUAmount.h +++ b/include/xrpl/basics/IOUAmount.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_BASICS_IOUAMOUNT_H_INCLUDED #define RIPPLE_BASICS_IOUAMOUNT_H_INCLUDED -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/ripple/basics/KeyCache.h b/include/xrpl/basics/KeyCache.h similarity index 94% rename from src/ripple/basics/KeyCache.h rename to include/xrpl/basics/KeyCache.h index d8fa4910ab9..1439a8b3344 100644 --- a/src/ripple/basics/KeyCache.h +++ b/include/xrpl/basics/KeyCache.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_BASICS_KEYCACHE_H #define RIPPLE_BASICS_KEYCACHE_H -#include -#include +#include +#include namespace ripple { diff --git a/src/ripple/basics/LocalValue.h b/include/xrpl/basics/LocalValue.h similarity index 100% rename from src/ripple/basics/LocalValue.h rename to include/xrpl/basics/LocalValue.h diff --git a/src/ripple/basics/Log.h b/include/xrpl/basics/Log.h similarity index 98% rename from src/ripple/basics/Log.h rename to include/xrpl/basics/Log.h index 929225c0433..0117f2f9aab 100644 --- a/src/ripple/basics/Log.h +++ b/include/xrpl/basics/Log.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_BASICS_LOG_H_INCLUDED #define RIPPLE_BASICS_LOG_H_INCLUDED -#include -#include +#include +#include #include #include #include diff --git a/src/ripple/basics/MathUtilities.h b/include/xrpl/basics/MathUtilities.h similarity index 100% rename from src/ripple/basics/MathUtilities.h rename to include/xrpl/basics/MathUtilities.h diff --git a/src/ripple/basics/Number.h b/include/xrpl/basics/Number.h similarity index 99% rename from src/ripple/basics/Number.h rename to include/xrpl/basics/Number.h index cdc25b3b27d..30ce3f73173 100644 --- a/src/ripple/basics/Number.h +++ b/include/xrpl/basics/Number.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_BASICS_NUMBER_H_INCLUDED #define RIPPLE_BASICS_NUMBER_H_INCLUDED -#include +#include #include #include #include diff --git a/src/ripple/basics/README.md b/include/xrpl/basics/README.md similarity index 100% rename from src/ripple/basics/README.md rename to include/xrpl/basics/README.md diff --git a/src/ripple/basics/RangeSet.h b/include/xrpl/basics/RangeSet.h similarity index 99% rename from src/ripple/basics/RangeSet.h rename to include/xrpl/basics/RangeSet.h index 3a9e470ddfb..0ffed2db1e2 100644 --- a/src/ripple/basics/RangeSet.h +++ b/include/xrpl/basics/RangeSet.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_BASICS_RANGESET_H_INCLUDED #define RIPPLE_BASICS_RANGESET_H_INCLUDED -#include +#include #include #include diff --git a/src/ripple/basics/Resolver.h b/include/xrpl/basics/Resolver.h similarity index 98% rename from src/ripple/basics/Resolver.h rename to include/xrpl/basics/Resolver.h index abf04005707..6cba352e0a0 100644 --- a/src/ripple/basics/Resolver.h +++ b/include/xrpl/basics/Resolver.h @@ -23,7 +23,7 @@ #include #include -#include +#include namespace ripple { diff --git a/src/ripple/basics/ResolverAsio.h b/include/xrpl/basics/ResolverAsio.h similarity index 94% rename from src/ripple/basics/ResolverAsio.h rename to include/xrpl/basics/ResolverAsio.h index 191cdc097ad..51fcbdfb0d8 100644 --- a/src/ripple/basics/ResolverAsio.h +++ b/include/xrpl/basics/ResolverAsio.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_BASICS_RESOLVERASIO_H_INCLUDED #define RIPPLE_BASICS_RESOLVERASIO_H_INCLUDED -#include -#include +#include +#include #include namespace ripple { diff --git a/src/ripple/basics/SHAMapHash.h b/include/xrpl/basics/SHAMapHash.h similarity index 98% rename from src/ripple/basics/SHAMapHash.h rename to include/xrpl/basics/SHAMapHash.h index 796510ba182..7e93ead78d3 100644 --- a/src/ripple/basics/SHAMapHash.h +++ b/include/xrpl/basics/SHAMapHash.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_BASICS_SHAMAP_HASH_H_INCLUDED #define RIPPLE_BASICS_SHAMAP_HASH_H_INCLUDED -#include +#include #include diff --git a/src/ripple/basics/SlabAllocator.h b/include/xrpl/basics/SlabAllocator.h similarity index 99% rename from src/ripple/basics/SlabAllocator.h rename to include/xrpl/basics/SlabAllocator.h index ece96d0b873..5c4cba343cf 100644 --- a/src/ripple/basics/SlabAllocator.h +++ b/include/xrpl/basics/SlabAllocator.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_BASICS_SLABALLOCATOR_H_INCLUDED #define RIPPLE_BASICS_SLABALLOCATOR_H_INCLUDED -#include +#include #include #include diff --git a/src/ripple/basics/Slice.h b/include/xrpl/basics/Slice.h similarity index 98% rename from src/ripple/basics/Slice.h rename to include/xrpl/basics/Slice.h index 0ba6a94b62b..00126f8882d 100644 --- a/src/ripple/basics/Slice.h +++ b/include/xrpl/basics/Slice.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_BASICS_SLICE_H_INCLUDED #define RIPPLE_BASICS_SLICE_H_INCLUDED -#include -#include +#include +#include #include #include #include diff --git a/src/ripple/basics/StringUtilities.h b/include/xrpl/basics/StringUtilities.h similarity index 98% rename from src/ripple/basics/StringUtilities.h rename to include/xrpl/basics/StringUtilities.h index 69314ce096e..23d60e2db49 100644 --- a/src/ripple/basics/StringUtilities.h +++ b/include/xrpl/basics/StringUtilities.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_BASICS_STRINGUTILITIES_H_INCLUDED #define RIPPLE_BASICS_STRINGUTILITIES_H_INCLUDED -#include -#include +#include +#include #include #include diff --git a/src/ripple/basics/TaggedCache.h b/include/xrpl/basics/TaggedCache.h similarity index 99% rename from src/ripple/basics/TaggedCache.h rename to include/xrpl/basics/TaggedCache.h index 6765ff16bee..1fcdc3707b6 100644 --- a/src/ripple/basics/TaggedCache.h +++ b/include/xrpl/basics/TaggedCache.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_BASICS_TAGGEDCACHE_H_INCLUDED #define RIPPLE_BASICS_TAGGEDCACHE_H_INCLUDED -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/basics/ThreadSafetyAnalysis.h b/include/xrpl/basics/ThreadSafetyAnalysis.h similarity index 100% rename from src/ripple/basics/ThreadSafetyAnalysis.h rename to include/xrpl/basics/ThreadSafetyAnalysis.h diff --git a/src/ripple/basics/ToString.h b/include/xrpl/basics/ToString.h similarity index 100% rename from src/ripple/basics/ToString.h rename to include/xrpl/basics/ToString.h diff --git a/src/ripple/basics/UnorderedContainers.h b/include/xrpl/basics/UnorderedContainers.h similarity index 94% rename from src/ripple/basics/UnorderedContainers.h rename to include/xrpl/basics/UnorderedContainers.h index e929ebec898..b689a1b6ac8 100644 --- a/src/ripple/basics/UnorderedContainers.h +++ b/include/xrpl/basics/UnorderedContainers.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_BASICS_UNORDEREDCONTAINERS_H_INCLUDED #define RIPPLE_BASICS_UNORDEREDCONTAINERS_H_INCLUDED -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/basics/UptimeClock.h b/include/xrpl/basics/UptimeClock.h similarity index 100% rename from src/ripple/basics/UptimeClock.h rename to include/xrpl/basics/UptimeClock.h diff --git a/src/ripple/basics/XRPAmount.h b/include/xrpl/basics/XRPAmount.h similarity index 97% rename from src/ripple/basics/XRPAmount.h rename to include/xrpl/basics/XRPAmount.h index 08f82b1752e..1d3b32f169b 100644 --- a/src/ripple/basics/XRPAmount.h +++ b/include/xrpl/basics/XRPAmount.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_BASICS_XRPAMOUNT_H_INCLUDED #define RIPPLE_BASICS_XRPAMOUNT_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/basics/algorithm.h b/include/xrpl/basics/algorithm.h similarity index 100% rename from src/ripple/basics/algorithm.h rename to include/xrpl/basics/algorithm.h diff --git a/src/ripple/basics/base64.h b/include/xrpl/basics/base64.h similarity index 100% rename from src/ripple/basics/base64.h rename to include/xrpl/basics/base64.h diff --git a/src/ripple/basics/base_uint.h b/include/xrpl/basics/base_uint.h similarity index 98% rename from src/ripple/basics/base_uint.h rename to include/xrpl/basics/base_uint.h index 8b15b082647..2b44d3072ee 100644 --- a/src/ripple/basics/base_uint.h +++ b/include/xrpl/basics/base_uint.h @@ -25,12 +25,12 @@ #ifndef RIPPLE_BASICS_BASE_UINT_H_INCLUDED #define RIPPLE_BASICS_BASE_UINT_H_INCLUDED -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/basics/chrono.h b/include/xrpl/basics/chrono.h similarity index 96% rename from src/ripple/basics/chrono.h rename to include/xrpl/basics/chrono.h index ea82f928b7e..d739b6bf44b 100644 --- a/src/ripple/basics/chrono.h +++ b/include/xrpl/basics/chrono.h @@ -22,9 +22,9 @@ #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/ripple/basics/comparators.h b/include/xrpl/basics/comparators.h similarity index 100% rename from src/ripple/basics/comparators.h rename to include/xrpl/basics/comparators.h diff --git a/src/ripple/basics/contract.h b/include/xrpl/basics/contract.h similarity index 98% rename from src/ripple/basics/contract.h rename to include/xrpl/basics/contract.h index 80aeee7a387..bdfc8aac362 100644 --- a/src/ripple/basics/contract.h +++ b/include/xrpl/basics/contract.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_BASICS_CONTRACT_H_INCLUDED #define RIPPLE_BASICS_CONTRACT_H_INCLUDED -#include +#include #include #include #include diff --git a/src/ripple/basics/hardened_hash.h b/include/xrpl/basics/hardened_hash.h similarity index 97% rename from src/ripple/basics/hardened_hash.h rename to include/xrpl/basics/hardened_hash.h index bc20409286e..0b77b0a07a8 100644 --- a/src/ripple/basics/hardened_hash.h +++ b/include/xrpl/basics/hardened_hash.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_BASICS_HARDENED_HASH_H_INCLUDED #define RIPPLE_BASICS_HARDENED_HASH_H_INCLUDED -#include -#include +#include +#include #include #include diff --git a/src/ripple/basics/join.h b/include/xrpl/basics/join.h similarity index 100% rename from src/ripple/basics/join.h rename to include/xrpl/basics/join.h diff --git a/src/ripple/basics/make_SSLContext.h b/include/xrpl/basics/make_SSLContext.h similarity index 100% rename from src/ripple/basics/make_SSLContext.h rename to include/xrpl/basics/make_SSLContext.h diff --git a/src/ripple/basics/mulDiv.h b/include/xrpl/basics/mulDiv.h similarity index 100% rename from src/ripple/basics/mulDiv.h rename to include/xrpl/basics/mulDiv.h diff --git a/src/ripple/basics/partitioned_unordered_map.h b/include/xrpl/basics/partitioned_unordered_map.h similarity index 100% rename from src/ripple/basics/partitioned_unordered_map.h rename to include/xrpl/basics/partitioned_unordered_map.h diff --git a/src/ripple/basics/random.h b/include/xrpl/basics/random.h similarity index 99% rename from src/ripple/basics/random.h rename to include/xrpl/basics/random.h index 3af8be54109..87b303bf6d5 100644 --- a/src/ripple/basics/random.h +++ b/include/xrpl/basics/random.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_BASICS_RANDOM_H_INCLUDED #define RIPPLE_BASICS_RANDOM_H_INCLUDED -#include +#include #include #include #include diff --git a/src/ripple/basics/safe_cast.h b/include/xrpl/basics/safe_cast.h similarity index 100% rename from src/ripple/basics/safe_cast.h rename to include/xrpl/basics/safe_cast.h diff --git a/src/ripple/basics/scope.h b/include/xrpl/basics/scope.h similarity index 100% rename from src/ripple/basics/scope.h rename to include/xrpl/basics/scope.h diff --git a/src/ripple/basics/spinlock.h b/include/xrpl/basics/spinlock.h similarity index 100% rename from src/ripple/basics/spinlock.h rename to include/xrpl/basics/spinlock.h diff --git a/src/ripple/basics/strHex.h b/include/xrpl/basics/strHex.h similarity index 100% rename from src/ripple/basics/strHex.h rename to include/xrpl/basics/strHex.h diff --git a/src/ripple/basics/tagged_integer.h b/include/xrpl/basics/tagged_integer.h similarity index 99% rename from src/ripple/basics/tagged_integer.h rename to include/xrpl/basics/tagged_integer.h index fe11f882726..3ab8c534098 100644 --- a/src/ripple/basics/tagged_integer.h +++ b/include/xrpl/basics/tagged_integer.h @@ -20,7 +20,7 @@ #ifndef BEAST_UTILITY_TAGGED_INTEGER_H_INCLUDED #define BEAST_UTILITY_TAGGED_INTEGER_H_INCLUDED -#include +#include #include #include #include diff --git a/src/ripple/beast/asio/io_latency_probe.h b/include/xrpl/beast/asio/io_latency_probe.h similarity index 100% rename from src/ripple/beast/asio/io_latency_probe.h rename to include/xrpl/beast/asio/io_latency_probe.h diff --git a/src/ripple/beast/clock/abstract_clock.h b/include/xrpl/beast/clock/abstract_clock.h similarity index 100% rename from src/ripple/beast/clock/abstract_clock.h rename to include/xrpl/beast/clock/abstract_clock.h diff --git a/src/ripple/beast/clock/basic_seconds_clock.h b/include/xrpl/beast/clock/basic_seconds_clock.h similarity index 100% rename from src/ripple/beast/clock/basic_seconds_clock.h rename to include/xrpl/beast/clock/basic_seconds_clock.h diff --git a/src/ripple/beast/clock/manual_clock.h b/include/xrpl/beast/clock/manual_clock.h similarity index 98% rename from src/ripple/beast/clock/manual_clock.h rename to include/xrpl/beast/clock/manual_clock.h index 808b0071006..97be8e79b90 100644 --- a/src/ripple/beast/clock/manual_clock.h +++ b/include/xrpl/beast/clock/manual_clock.h @@ -20,7 +20,7 @@ #ifndef BEAST_CHRONO_MANUAL_CLOCK_H_INCLUDED #define BEAST_CHRONO_MANUAL_CLOCK_H_INCLUDED -#include +#include #include namespace beast { diff --git a/src/ripple/beast/container/aged_container.h b/include/xrpl/beast/container/aged_container.h similarity index 100% rename from src/ripple/beast/container/aged_container.h rename to include/xrpl/beast/container/aged_container.h diff --git a/src/ripple/beast/container/aged_container_utility.h b/include/xrpl/beast/container/aged_container_utility.h similarity index 97% rename from src/ripple/beast/container/aged_container_utility.h rename to include/xrpl/beast/container/aged_container_utility.h index dc57c229fb5..b64cefbf5ad 100644 --- a/src/ripple/beast/container/aged_container_utility.h +++ b/include/xrpl/beast/container/aged_container_utility.h @@ -20,7 +20,7 @@ #ifndef BEAST_CONTAINER_AGED_CONTAINER_UTILITY_H_INCLUDED #define BEAST_CONTAINER_AGED_CONTAINER_UTILITY_H_INCLUDED -#include +#include #include diff --git a/src/ripple/beast/container/aged_map.h b/include/xrpl/beast/container/aged_map.h similarity index 95% rename from src/ripple/beast/container/aged_map.h rename to include/xrpl/beast/container/aged_map.h index f675846fa64..5b56cde9625 100644 --- a/src/ripple/beast/container/aged_map.h +++ b/include/xrpl/beast/container/aged_map.h @@ -20,7 +20,7 @@ #ifndef BEAST_CONTAINER_AGED_MAP_H_INCLUDED #define BEAST_CONTAINER_AGED_MAP_H_INCLUDED -#include +#include #include #include diff --git a/src/ripple/beast/container/aged_multimap.h b/include/xrpl/beast/container/aged_multimap.h similarity index 95% rename from src/ripple/beast/container/aged_multimap.h rename to include/xrpl/beast/container/aged_multimap.h index b4668851c3d..aa6c01f5b32 100644 --- a/src/ripple/beast/container/aged_multimap.h +++ b/include/xrpl/beast/container/aged_multimap.h @@ -20,7 +20,7 @@ #ifndef BEAST_CONTAINER_AGED_MULTIMAP_H_INCLUDED #define BEAST_CONTAINER_AGED_MULTIMAP_H_INCLUDED -#include +#include #include #include diff --git a/src/ripple/beast/container/aged_multiset.h b/include/xrpl/beast/container/aged_multiset.h similarity index 95% rename from src/ripple/beast/container/aged_multiset.h rename to include/xrpl/beast/container/aged_multiset.h index 6d62bcbeb36..d43cc8d5a70 100644 --- a/src/ripple/beast/container/aged_multiset.h +++ b/include/xrpl/beast/container/aged_multiset.h @@ -20,7 +20,7 @@ #ifndef BEAST_CONTAINER_AGED_MULTISET_H_INCLUDED #define BEAST_CONTAINER_AGED_MULTISET_H_INCLUDED -#include +#include #include #include diff --git a/src/ripple/beast/container/aged_set.h b/include/xrpl/beast/container/aged_set.h similarity index 95% rename from src/ripple/beast/container/aged_set.h rename to include/xrpl/beast/container/aged_set.h index 0a9d82f6cb2..aa31a47af4a 100644 --- a/src/ripple/beast/container/aged_set.h +++ b/include/xrpl/beast/container/aged_set.h @@ -20,7 +20,7 @@ #ifndef BEAST_CONTAINER_AGED_SET_H_INCLUDED #define BEAST_CONTAINER_AGED_SET_H_INCLUDED -#include +#include #include #include diff --git a/src/ripple/beast/container/aged_unordered_map.h b/include/xrpl/beast/container/aged_unordered_map.h similarity index 95% rename from src/ripple/beast/container/aged_unordered_map.h rename to include/xrpl/beast/container/aged_unordered_map.h index 1b6a147ef03..b466c87b3ff 100644 --- a/src/ripple/beast/container/aged_unordered_map.h +++ b/include/xrpl/beast/container/aged_unordered_map.h @@ -20,7 +20,7 @@ #ifndef BEAST_CONTAINER_AGED_UNORDERED_MAP_H_INCLUDED #define BEAST_CONTAINER_AGED_UNORDERED_MAP_H_INCLUDED -#include +#include #include #include diff --git a/src/ripple/beast/container/aged_unordered_multimap.h b/include/xrpl/beast/container/aged_unordered_multimap.h similarity index 96% rename from src/ripple/beast/container/aged_unordered_multimap.h rename to include/xrpl/beast/container/aged_unordered_multimap.h index 1298cd51d0e..e64c8415c61 100644 --- a/src/ripple/beast/container/aged_unordered_multimap.h +++ b/include/xrpl/beast/container/aged_unordered_multimap.h @@ -20,7 +20,7 @@ #ifndef BEAST_CONTAINER_AGED_UNORDERED_MULTIMAP_H_INCLUDED #define BEAST_CONTAINER_AGED_UNORDERED_MULTIMAP_H_INCLUDED -#include +#include #include #include diff --git a/src/ripple/beast/container/aged_unordered_multiset.h b/include/xrpl/beast/container/aged_unordered_multiset.h similarity index 95% rename from src/ripple/beast/container/aged_unordered_multiset.h rename to include/xrpl/beast/container/aged_unordered_multiset.h index 5e9f682aa6b..499dc7d6780 100644 --- a/src/ripple/beast/container/aged_unordered_multiset.h +++ b/include/xrpl/beast/container/aged_unordered_multiset.h @@ -20,7 +20,7 @@ #ifndef BEAST_CONTAINER_AGED_UNORDERED_MULTISET_H_INCLUDED #define BEAST_CONTAINER_AGED_UNORDERED_MULTISET_H_INCLUDED -#include +#include #include #include diff --git a/src/ripple/beast/container/aged_unordered_set.h b/include/xrpl/beast/container/aged_unordered_set.h similarity index 95% rename from src/ripple/beast/container/aged_unordered_set.h rename to include/xrpl/beast/container/aged_unordered_set.h index adb411c344c..45fc6cd0ed8 100644 --- a/src/ripple/beast/container/aged_unordered_set.h +++ b/include/xrpl/beast/container/aged_unordered_set.h @@ -20,7 +20,7 @@ #ifndef BEAST_CONTAINER_AGED_UNORDERED_SET_H_INCLUDED #define BEAST_CONTAINER_AGED_UNORDERED_SET_H_INCLUDED -#include +#include #include #include diff --git a/src/ripple/beast/container/detail/aged_associative_container.h b/include/xrpl/beast/container/detail/aged_associative_container.h similarity index 100% rename from src/ripple/beast/container/detail/aged_associative_container.h rename to include/xrpl/beast/container/detail/aged_associative_container.h diff --git a/src/ripple/beast/container/detail/aged_container_iterator.h b/include/xrpl/beast/container/detail/aged_container_iterator.h similarity index 100% rename from src/ripple/beast/container/detail/aged_container_iterator.h rename to include/xrpl/beast/container/detail/aged_container_iterator.h diff --git a/src/ripple/beast/container/detail/aged_ordered_container.h b/include/xrpl/beast/container/detail/aged_ordered_container.h similarity index 99% rename from src/ripple/beast/container/detail/aged_ordered_container.h rename to include/xrpl/beast/container/detail/aged_ordered_container.h index 10dca962b13..90a8ea147ae 100644 --- a/src/ripple/beast/container/detail/aged_ordered_container.h +++ b/include/xrpl/beast/container/detail/aged_ordered_container.h @@ -20,11 +20,11 @@ #ifndef BEAST_CONTAINER_DETAIL_AGED_ORDERED_CONTAINER_H_INCLUDED #define BEAST_CONTAINER_DETAIL_AGED_ORDERED_CONTAINER_H_INCLUDED -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/beast/container/detail/aged_unordered_container.h b/include/xrpl/beast/container/detail/aged_unordered_container.h similarity index 99% rename from src/ripple/beast/container/detail/aged_unordered_container.h rename to include/xrpl/beast/container/detail/aged_unordered_container.h index fcdccd2a637..45efb3f5561 100644 --- a/src/ripple/beast/container/detail/aged_unordered_container.h +++ b/include/xrpl/beast/container/detail/aged_unordered_container.h @@ -20,11 +20,11 @@ #ifndef BEAST_CONTAINER_DETAIL_AGED_UNORDERED_CONTAINER_H_INCLUDED #define BEAST_CONTAINER_DETAIL_AGED_UNORDERED_CONTAINER_H_INCLUDED -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/beast/container/detail/empty_base_optimization.h b/include/xrpl/beast/container/detail/empty_base_optimization.h similarity index 100% rename from src/ripple/beast/container/detail/empty_base_optimization.h rename to include/xrpl/beast/container/detail/empty_base_optimization.h diff --git a/src/ripple/beast/core/CurrentThreadName.h b/include/xrpl/beast/core/CurrentThreadName.h similarity index 100% rename from src/ripple/beast/core/CurrentThreadName.h rename to include/xrpl/beast/core/CurrentThreadName.h diff --git a/src/ripple/beast/core/LexicalCast.h b/include/xrpl/beast/core/LexicalCast.h similarity index 100% rename from src/ripple/beast/core/LexicalCast.h rename to include/xrpl/beast/core/LexicalCast.h diff --git a/src/ripple/beast/core/List.h b/include/xrpl/beast/core/List.h similarity index 100% rename from src/ripple/beast/core/List.h rename to include/xrpl/beast/core/List.h diff --git a/src/ripple/beast/core/LockFreeStack.h b/include/xrpl/beast/core/LockFreeStack.h similarity index 100% rename from src/ripple/beast/core/LockFreeStack.h rename to include/xrpl/beast/core/LockFreeStack.h diff --git a/src/ripple/beast/core/SemanticVersion.h b/include/xrpl/beast/core/SemanticVersion.h similarity index 100% rename from src/ripple/beast/core/SemanticVersion.h rename to include/xrpl/beast/core/SemanticVersion.h diff --git a/src/ripple/beast/hash/hash_append.h b/include/xrpl/beast/hash/hash_append.h similarity index 100% rename from src/ripple/beast/hash/hash_append.h rename to include/xrpl/beast/hash/hash_append.h diff --git a/src/ripple/beast/hash/uhash.h b/include/xrpl/beast/hash/uhash.h similarity index 95% rename from src/ripple/beast/hash/uhash.h rename to include/xrpl/beast/hash/uhash.h index 921ea3c9840..ab3eaad0392 100644 --- a/src/ripple/beast/hash/uhash.h +++ b/include/xrpl/beast/hash/uhash.h @@ -21,8 +21,8 @@ #ifndef BEAST_HASH_UHASH_H_INCLUDED #define BEAST_HASH_UHASH_H_INCLUDED -#include -#include +#include +#include namespace beast { diff --git a/src/ripple/beast/hash/xxhasher.h b/include/xrpl/beast/hash/xxhasher.h similarity index 100% rename from src/ripple/beast/hash/xxhasher.h rename to include/xrpl/beast/hash/xxhasher.h diff --git a/src/ripple/beast/insight/Collector.h b/include/xrpl/beast/insight/Collector.h similarity index 95% rename from src/ripple/beast/insight/Collector.h rename to include/xrpl/beast/insight/Collector.h index a71b1092c85..eab2bd7d70c 100644 --- a/src/ripple/beast/insight/Collector.h +++ b/include/xrpl/beast/insight/Collector.h @@ -20,11 +20,11 @@ #ifndef BEAST_INSIGHT_COLLECTOR_H_INCLUDED #define BEAST_INSIGHT_COLLECTOR_H_INCLUDED -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include diff --git a/src/ripple/beast/insight/Counter.h b/include/xrpl/beast/insight/Counter.h similarity index 98% rename from src/ripple/beast/insight/Counter.h rename to include/xrpl/beast/insight/Counter.h index 069505e4ce5..3f3a251de89 100644 --- a/src/ripple/beast/insight/Counter.h +++ b/include/xrpl/beast/insight/Counter.h @@ -20,7 +20,7 @@ #ifndef BEAST_INSIGHT_COUNTER_H_INCLUDED #define BEAST_INSIGHT_COUNTER_H_INCLUDED -#include +#include #include diff --git a/src/ripple/beast/insight/CounterImpl.h b/include/xrpl/beast/insight/CounterImpl.h similarity index 100% rename from src/ripple/beast/insight/CounterImpl.h rename to include/xrpl/beast/insight/CounterImpl.h diff --git a/src/ripple/beast/insight/Event.h b/include/xrpl/beast/insight/Event.h similarity index 98% rename from src/ripple/beast/insight/Event.h rename to include/xrpl/beast/insight/Event.h index 5319a9a6677..407dd233e95 100644 --- a/src/ripple/beast/insight/Event.h +++ b/include/xrpl/beast/insight/Event.h @@ -20,7 +20,7 @@ #ifndef BEAST_INSIGHT_EVENT_H_INCLUDED #define BEAST_INSIGHT_EVENT_H_INCLUDED -#include +#include #include #include diff --git a/src/ripple/beast/insight/EventImpl.h b/include/xrpl/beast/insight/EventImpl.h similarity index 100% rename from src/ripple/beast/insight/EventImpl.h rename to include/xrpl/beast/insight/EventImpl.h diff --git a/src/ripple/beast/insight/Gauge.h b/include/xrpl/beast/insight/Gauge.h similarity index 98% rename from src/ripple/beast/insight/Gauge.h rename to include/xrpl/beast/insight/Gauge.h index 76f84080766..b1e8bedfac2 100644 --- a/src/ripple/beast/insight/Gauge.h +++ b/include/xrpl/beast/insight/Gauge.h @@ -20,7 +20,7 @@ #ifndef BEAST_INSIGHT_GAUGE_H_INCLUDED #define BEAST_INSIGHT_GAUGE_H_INCLUDED -#include +#include #include diff --git a/src/ripple/beast/insight/GaugeImpl.h b/include/xrpl/beast/insight/GaugeImpl.h similarity index 100% rename from src/ripple/beast/insight/GaugeImpl.h rename to include/xrpl/beast/insight/GaugeImpl.h diff --git a/src/ripple/beast/insight/Group.h b/include/xrpl/beast/insight/Group.h similarity index 97% rename from src/ripple/beast/insight/Group.h rename to include/xrpl/beast/insight/Group.h index a37656b81a5..f11b1397c8b 100644 --- a/src/ripple/beast/insight/Group.h +++ b/include/xrpl/beast/insight/Group.h @@ -20,7 +20,7 @@ #ifndef BEAST_INSIGHT_GROUP_H_INCLUDED #define BEAST_INSIGHT_GROUP_H_INCLUDED -#include +#include #include #include diff --git a/src/ripple/beast/insight/Groups.h b/include/xrpl/beast/insight/Groups.h similarity index 95% rename from src/ripple/beast/insight/Groups.h rename to include/xrpl/beast/insight/Groups.h index 817ad87bd1a..456deb79073 100644 --- a/src/ripple/beast/insight/Groups.h +++ b/include/xrpl/beast/insight/Groups.h @@ -20,8 +20,8 @@ #ifndef BEAST_INSIGHT_GROUPS_H_INCLUDED #define BEAST_INSIGHT_GROUPS_H_INCLUDED -#include -#include +#include +#include #include #include diff --git a/src/ripple/beast/insight/Hook.h b/include/xrpl/beast/insight/Hook.h similarity index 97% rename from src/ripple/beast/insight/Hook.h rename to include/xrpl/beast/insight/Hook.h index 04647f4b632..affa42bb828 100644 --- a/src/ripple/beast/insight/Hook.h +++ b/include/xrpl/beast/insight/Hook.h @@ -20,7 +20,7 @@ #ifndef BEAST_INSIGHT_HOOK_H_INCLUDED #define BEAST_INSIGHT_HOOK_H_INCLUDED -#include +#include #include diff --git a/src/ripple/beast/insight/HookImpl.h b/include/xrpl/beast/insight/HookImpl.h similarity index 100% rename from src/ripple/beast/insight/HookImpl.h rename to include/xrpl/beast/insight/HookImpl.h diff --git a/src/ripple/beast/insight/Insight.h b/include/xrpl/beast/insight/Insight.h similarity index 66% rename from src/ripple/beast/insight/Insight.h rename to include/xrpl/beast/insight/Insight.h index f34f7317483..1c2c1375a28 100644 --- a/src/ripple/beast/insight/Insight.h +++ b/include/xrpl/beast/insight/Insight.h @@ -20,18 +20,18 @@ #ifndef BEAST_INSIGHT_H_INCLUDED #define BEAST_INSIGHT_H_INCLUDED -#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 #endif diff --git a/src/ripple/beast/insight/Meter.h b/include/xrpl/beast/insight/Meter.h similarity index 98% rename from src/ripple/beast/insight/Meter.h rename to include/xrpl/beast/insight/Meter.h index 376dcae0521..febd5cb3dc4 100644 --- a/src/ripple/beast/insight/Meter.h +++ b/include/xrpl/beast/insight/Meter.h @@ -22,7 +22,7 @@ #include -#include +#include namespace beast { namespace insight { diff --git a/src/ripple/beast/insight/MeterImpl.h b/include/xrpl/beast/insight/MeterImpl.h similarity index 100% rename from src/ripple/beast/insight/MeterImpl.h rename to include/xrpl/beast/insight/MeterImpl.h diff --git a/src/ripple/beast/insight/NullCollector.h b/include/xrpl/beast/insight/NullCollector.h similarity index 97% rename from src/ripple/beast/insight/NullCollector.h rename to include/xrpl/beast/insight/NullCollector.h index db98153836e..4379c3ceb98 100644 --- a/src/ripple/beast/insight/NullCollector.h +++ b/include/xrpl/beast/insight/NullCollector.h @@ -20,7 +20,7 @@ #ifndef BEAST_INSIGHT_NULLCOLLECTOR_H_INCLUDED #define BEAST_INSIGHT_NULLCOLLECTOR_H_INCLUDED -#include +#include namespace beast { namespace insight { diff --git a/src/ripple/beast/insight/StatsDCollector.h b/include/xrpl/beast/insight/StatsDCollector.h similarity index 93% rename from src/ripple/beast/insight/StatsDCollector.h rename to include/xrpl/beast/insight/StatsDCollector.h index d95aee04d0b..78195048d7f 100644 --- a/src/ripple/beast/insight/StatsDCollector.h +++ b/include/xrpl/beast/insight/StatsDCollector.h @@ -20,10 +20,10 @@ #ifndef BEAST_INSIGHT_STATSDCOLLECTOR_H_INCLUDED #define BEAST_INSIGHT_STATSDCOLLECTOR_H_INCLUDED -#include +#include -#include -#include +#include +#include namespace beast { namespace insight { diff --git a/src/ripple/beast/net/IPAddress.h b/include/xrpl/beast/net/IPAddress.h similarity index 94% rename from src/ripple/beast/net/IPAddress.h rename to include/xrpl/beast/net/IPAddress.h index d8820ec40b5..f3a1a7348f2 100644 --- a/src/ripple/beast/net/IPAddress.h +++ b/include/xrpl/beast/net/IPAddress.h @@ -20,10 +20,10 @@ #ifndef BEAST_NET_IPADDRESS_H_INCLUDED #define BEAST_NET_IPADDRESS_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/beast/net/IPAddressConversion.h b/include/xrpl/beast/net/IPAddressConversion.h similarity index 98% rename from src/ripple/beast/net/IPAddressConversion.h rename to include/xrpl/beast/net/IPAddressConversion.h index e37dd5b6c61..982a8e50f26 100644 --- a/src/ripple/beast/net/IPAddressConversion.h +++ b/include/xrpl/beast/net/IPAddressConversion.h @@ -20,7 +20,7 @@ #ifndef BEAST_NET_IPADDRESSCONVERSION_H_INCLUDED #define BEAST_NET_IPADDRESSCONVERSION_H_INCLUDED -#include +#include #include diff --git a/src/ripple/beast/net/IPAddressV4.h b/include/xrpl/beast/net/IPAddressV4.h similarity index 97% rename from src/ripple/beast/net/IPAddressV4.h rename to include/xrpl/beast/net/IPAddressV4.h index 2c6f6a8cced..7711a970dec 100644 --- a/src/ripple/beast/net/IPAddressV4.h +++ b/include/xrpl/beast/net/IPAddressV4.h @@ -20,7 +20,7 @@ #ifndef BEAST_NET_IPADDRESSV4_H_INCLUDED #define BEAST_NET_IPADDRESSV4_H_INCLUDED -#include +#include #include #include #include diff --git a/src/ripple/beast/net/IPAddressV6.h b/include/xrpl/beast/net/IPAddressV6.h similarity index 100% rename from src/ripple/beast/net/IPAddressV6.h rename to include/xrpl/beast/net/IPAddressV6.h diff --git a/src/ripple/beast/net/IPEndpoint.h b/include/xrpl/beast/net/IPEndpoint.h similarity index 97% rename from src/ripple/beast/net/IPEndpoint.h rename to include/xrpl/beast/net/IPEndpoint.h index 19ce36dcc3b..e66e7f4caae 100644 --- a/src/ripple/beast/net/IPEndpoint.h +++ b/include/xrpl/beast/net/IPEndpoint.h @@ -20,9 +20,9 @@ #ifndef BEAST_NET_IPENDPOINT_H_INCLUDED #define BEAST_NET_IPENDPOINT_H_INCLUDED -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/ripple/beast/rfc2616.h b/include/xrpl/beast/rfc2616.h similarity index 100% rename from src/ripple/beast/rfc2616.h rename to include/xrpl/beast/rfc2616.h diff --git a/src/ripple/beast/test/fail_counter.h b/include/xrpl/beast/test/fail_counter.h similarity index 98% rename from src/ripple/beast/test/fail_counter.h rename to include/xrpl/beast/test/fail_counter.h index 8a11602e22d..d0cae77ddad 100644 --- a/src/ripple/beast/test/fail_counter.h +++ b/include/xrpl/beast/test/fail_counter.h @@ -8,8 +8,8 @@ #ifndef BEAST_TEST_FAIL_COUNTER_HPP #define BEAST_TEST_FAIL_COUNTER_HPP +#include #include -#include namespace beast { namespace test { diff --git a/src/ripple/beast/test/fail_stream.h b/include/xrpl/beast/test/fail_stream.h similarity index 94% rename from src/ripple/beast/test/fail_stream.h rename to include/xrpl/beast/test/fail_stream.h index a1465f006ca..161e73ef091 100644 --- a/src/ripple/beast/test/fail_stream.h +++ b/include/xrpl/beast/test/fail_stream.h @@ -8,13 +8,13 @@ #ifndef BEAST_TEST_FAIL_STREAM_HPP #define BEAST_TEST_FAIL_STREAM_HPP +#include +#include +#include +#include +#include +#include #include -#include -#include -#include -#include -#include -#include namespace beast { namespace test { diff --git a/src/ripple/beast/test/pipe_stream.h b/include/xrpl/beast/test/pipe_stream.h similarity index 97% rename from src/ripple/beast/test/pipe_stream.h rename to include/xrpl/beast/test/pipe_stream.h index 1aaaadfa4ff..762419a539a 100644 --- a/src/ripple/beast/test/pipe_stream.h +++ b/include/xrpl/beast/test/pipe_stream.h @@ -8,17 +8,17 @@ #ifndef BEAST_TEST_PIPE_STREAM_HPP #define BEAST_TEST_PIPE_STREAM_HPP +#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/beast/test/sig_wait.h b/include/xrpl/beast/test/sig_wait.h similarity index 100% rename from src/ripple/beast/test/sig_wait.h rename to include/xrpl/beast/test/sig_wait.h diff --git a/src/ripple/beast/test/string_iostream.h b/include/xrpl/beast/test/string_iostream.h similarity index 95% rename from src/ripple/beast/test/string_iostream.h rename to include/xrpl/beast/test/string_iostream.h index 56f741be068..bed6299a2bc 100644 --- a/src/ripple/beast/test/string_iostream.h +++ b/include/xrpl/beast/test/string_iostream.h @@ -8,14 +8,14 @@ #ifndef BEAST_TEST_STRING_IOSTREAM_HPP #define BEAST_TEST_STRING_IOSTREAM_HPP +#include +#include +#include +#include +#include #include #include #include -#include -#include -#include -#include -#include #include namespace beast { diff --git a/src/ripple/beast/test/string_istream.h b/include/xrpl/beast/test/string_istream.h similarity index 95% rename from src/ripple/beast/test/string_istream.h rename to include/xrpl/beast/test/string_istream.h index 81f35469905..83cb3cfef5d 100644 --- a/src/ripple/beast/test/string_istream.h +++ b/include/xrpl/beast/test/string_istream.h @@ -8,13 +8,13 @@ #ifndef BEAST_TEST_STRING_ISTREAM_HPP #define BEAST_TEST_STRING_ISTREAM_HPP +#include +#include +#include +#include #include #include #include -#include -#include -#include -#include #include namespace beast { diff --git a/src/ripple/beast/test/string_ostream.h b/include/xrpl/beast/test/string_ostream.h similarity index 94% rename from src/ripple/beast/test/string_ostream.h rename to include/xrpl/beast/test/string_ostream.h index 4cca9e7fce0..9edf69be88f 100644 --- a/src/ripple/beast/test/string_ostream.h +++ b/include/xrpl/beast/test/string_ostream.h @@ -8,14 +8,14 @@ #ifndef BEAST_TEST_STRING_OSTREAM_HPP #define BEAST_TEST_STRING_OSTREAM_HPP +#include +#include +#include +#include +#include #include #include #include -#include -#include -#include -#include -#include #include namespace beast { diff --git a/src/ripple/beast/test/test_allocator.h b/include/xrpl/beast/test/test_allocator.h similarity index 100% rename from src/ripple/beast/test/test_allocator.h rename to include/xrpl/beast/test/test_allocator.h diff --git a/src/ripple/beast/test/yield_to.h b/include/xrpl/beast/test/yield_to.h similarity index 100% rename from src/ripple/beast/test/yield_to.h rename to include/xrpl/beast/test/yield_to.h diff --git a/src/ripple/beast/type_name.h b/include/xrpl/beast/type_name.h similarity index 100% rename from src/ripple/beast/type_name.h rename to include/xrpl/beast/type_name.h diff --git a/src/ripple/beast/unit_test.h b/include/xrpl/beast/unit_test.h similarity index 75% rename from src/ripple/beast/unit_test.h rename to include/xrpl/beast/unit_test.h index 70747ea341b..eff82583ea7 100644 --- a/src/ripple/beast/unit_test.h +++ b/include/xrpl/beast/unit_test.h @@ -20,16 +20,16 @@ #ifndef BEAST_UNIT_TEST_H_INCLUDED #define BEAST_UNIT_TEST_H_INCLUDED -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifndef BEAST_EXPECT #define BEAST_EXPECT_S1(x) #x diff --git a/src/ripple/beast/unit_test/amount.h b/include/xrpl/beast/unit_test/amount.h similarity index 100% rename from src/ripple/beast/unit_test/amount.h rename to include/xrpl/beast/unit_test/amount.h diff --git a/src/ripple/beast/unit_test/detail/const_container.h b/include/xrpl/beast/unit_test/detail/const_container.h similarity index 100% rename from src/ripple/beast/unit_test/detail/const_container.h rename to include/xrpl/beast/unit_test/detail/const_container.h diff --git a/src/ripple/beast/unit_test/dstream.h b/include/xrpl/beast/unit_test/dstream.h similarity index 100% rename from src/ripple/beast/unit_test/dstream.h rename to include/xrpl/beast/unit_test/dstream.h diff --git a/src/ripple/beast/unit_test/global_suites.h b/include/xrpl/beast/unit_test/global_suites.h similarity index 95% rename from src/ripple/beast/unit_test/global_suites.h rename to include/xrpl/beast/unit_test/global_suites.h index 3fcdcc052bf..64bbbc7a268 100644 --- a/src/ripple/beast/unit_test/global_suites.h +++ b/include/xrpl/beast/unit_test/global_suites.h @@ -8,7 +8,7 @@ #ifndef BEAST_UNIT_TEST_GLOBAL_SUITES_HPP #define BEAST_UNIT_TEST_GLOBAL_SUITES_HPP -#include +#include namespace beast { namespace unit_test { diff --git a/src/ripple/beast/unit_test/match.h b/include/xrpl/beast/unit_test/match.h similarity index 98% rename from src/ripple/beast/unit_test/match.h rename to include/xrpl/beast/unit_test/match.h index 306bc569982..e8e12bd5568 100644 --- a/src/ripple/beast/unit_test/match.h +++ b/include/xrpl/beast/unit_test/match.h @@ -8,7 +8,7 @@ #ifndef BEAST_UNIT_TEST_MATCH_HPP #define BEAST_UNIT_TEST_MATCH_HPP -#include +#include #include namespace beast { diff --git a/src/ripple/beast/unit_test/recorder.h b/include/xrpl/beast/unit_test/recorder.h similarity index 94% rename from src/ripple/beast/unit_test/recorder.h rename to include/xrpl/beast/unit_test/recorder.h index 439e194c335..fbe6ab6c10d 100644 --- a/src/ripple/beast/unit_test/recorder.h +++ b/include/xrpl/beast/unit_test/recorder.h @@ -8,8 +8,8 @@ #ifndef BEAST_UNIT_TEST_RECORDER_HPP #define BEAST_UNIT_TEST_RECORDER_HPP -#include -#include +#include +#include namespace beast { namespace unit_test { diff --git a/src/ripple/beast/unit_test/reporter.h b/include/xrpl/beast/unit_test/reporter.h similarity index 98% rename from src/ripple/beast/unit_test/reporter.h rename to include/xrpl/beast/unit_test/reporter.h index 76b65a8b1e5..956def1c30d 100644 --- a/src/ripple/beast/unit_test/reporter.h +++ b/include/xrpl/beast/unit_test/reporter.h @@ -8,8 +8,8 @@ #ifndef BEAST_UNIT_TEST_REPORTER_HPP #define BEAST_UNIT_TEST_REPORTER_HPP -#include -#include +#include +#include #include #include #include diff --git a/src/ripple/beast/unit_test/results.h b/include/xrpl/beast/unit_test/results.h similarity index 98% rename from src/ripple/beast/unit_test/results.h rename to include/xrpl/beast/unit_test/results.h index dd43fb17a72..96fedc9b75f 100644 --- a/src/ripple/beast/unit_test/results.h +++ b/include/xrpl/beast/unit_test/results.h @@ -8,7 +8,7 @@ #ifndef BEAST_UNIT_TEST_RESULTS_HPP #define BEAST_UNIT_TEST_RESULTS_HPP -#include +#include #include #include diff --git a/src/ripple/beast/unit_test/runner.h b/include/xrpl/beast/unit_test/runner.h similarity index 99% rename from src/ripple/beast/unit_test/runner.h rename to include/xrpl/beast/unit_test/runner.h index bdee7aee5a8..6330f2c8c81 100644 --- a/src/ripple/beast/unit_test/runner.h +++ b/include/xrpl/beast/unit_test/runner.h @@ -8,7 +8,7 @@ #ifndef BEAST_UNIT_TEST_RUNNER_H_INCLUDED #define BEAST_UNIT_TEST_RUNNER_H_INCLUDED -#include +#include #include #include #include diff --git a/src/ripple/beast/unit_test/suite.h b/include/xrpl/beast/unit_test/suite.h similarity index 99% rename from src/ripple/beast/unit_test/suite.h rename to include/xrpl/beast/unit_test/suite.h index 23c4c4fad1f..d49730d4d5f 100644 --- a/src/ripple/beast/unit_test/suite.h +++ b/include/xrpl/beast/unit_test/suite.h @@ -8,7 +8,7 @@ #ifndef BEAST_UNIT_TEST_SUITE_HPP #define BEAST_UNIT_TEST_SUITE_HPP -#include +#include #include #include #include @@ -646,7 +646,7 @@ suite::run(runner& r) #define BEAST_DEFINE_TESTSUITE_MANUAL_PRIO(Class, Module, Library, Priority) #else -#include +#include #define BEAST_DEFINE_TESTSUITE(Class, Module, Library) \ BEAST_DEFINE_TESTSUITE_INSERT(Class, Module, Library, false, 0) #define BEAST_DEFINE_TESTSUITE_MANUAL(Class, Module, Library) \ diff --git a/src/ripple/beast/unit_test/suite_info.h b/include/xrpl/beast/unit_test/suite_info.h similarity index 100% rename from src/ripple/beast/unit_test/suite_info.h rename to include/xrpl/beast/unit_test/suite_info.h diff --git a/src/ripple/beast/unit_test/suite_list.h b/include/xrpl/beast/unit_test/suite_list.h similarity index 94% rename from src/ripple/beast/unit_test/suite_list.h rename to include/xrpl/beast/unit_test/suite_list.h index a1aed563c71..5856b4c7dba 100644 --- a/src/ripple/beast/unit_test/suite_list.h +++ b/include/xrpl/beast/unit_test/suite_list.h @@ -8,8 +8,8 @@ #ifndef BEAST_UNIT_TEST_SUITE_LIST_HPP #define BEAST_UNIT_TEST_SUITE_LIST_HPP -#include -#include +#include +#include #include #include #include diff --git a/src/ripple/beast/unit_test/thread.h b/include/xrpl/beast/unit_test/thread.h similarity index 98% rename from src/ripple/beast/unit_test/thread.h rename to include/xrpl/beast/unit_test/thread.h index 8b2d024a840..e94108f7879 100644 --- a/src/ripple/beast/unit_test/thread.h +++ b/include/xrpl/beast/unit_test/thread.h @@ -8,7 +8,7 @@ #ifndef BEAST_UNIT_TEST_THREAD_HPP #define BEAST_UNIT_TEST_THREAD_HPP -#include +#include #include #include #include diff --git a/src/ripple/beast/utility/Journal.h b/include/xrpl/beast/utility/Journal.h similarity index 100% rename from src/ripple/beast/utility/Journal.h rename to include/xrpl/beast/utility/Journal.h diff --git a/src/ripple/beast/utility/PropertyStream.h b/include/xrpl/beast/utility/PropertyStream.h similarity index 99% rename from src/ripple/beast/utility/PropertyStream.h rename to include/xrpl/beast/utility/PropertyStream.h index dbcc8a2d793..5eaf70453e8 100644 --- a/src/ripple/beast/utility/PropertyStream.h +++ b/include/xrpl/beast/utility/PropertyStream.h @@ -20,7 +20,7 @@ #ifndef BEAST_UTILITY_PROPERTYSTREAM_H_INCLUDED #define BEAST_UTILITY_PROPERTYSTREAM_H_INCLUDED -#include +#include #include #include diff --git a/src/ripple/beast/utility/WrappedSink.h b/include/xrpl/beast/utility/WrappedSink.h similarity index 98% rename from src/ripple/beast/utility/WrappedSink.h rename to include/xrpl/beast/utility/WrappedSink.h index ba714248a06..f22455a52c4 100644 --- a/src/ripple/beast/utility/WrappedSink.h +++ b/include/xrpl/beast/utility/WrappedSink.h @@ -20,7 +20,7 @@ #ifndef BEAST_UTILITY_WRAPPEDSINK_H_INCLUDED #define BEAST_UTILITY_WRAPPEDSINK_H_INCLUDED -#include +#include namespace beast { diff --git a/src/ripple/beast/utility/Zero.h b/include/xrpl/beast/utility/Zero.h similarity index 100% rename from src/ripple/beast/utility/Zero.h rename to include/xrpl/beast/utility/Zero.h diff --git a/src/ripple/beast/utility/hash_pair.h b/include/xrpl/beast/utility/hash_pair.h similarity index 100% rename from src/ripple/beast/utility/hash_pair.h rename to include/xrpl/beast/utility/hash_pair.h diff --git a/src/ripple/beast/utility/maybe_const.h b/include/xrpl/beast/utility/maybe_const.h similarity index 100% rename from src/ripple/beast/utility/maybe_const.h rename to include/xrpl/beast/utility/maybe_const.h diff --git a/src/ripple/beast/utility/rngfill.h b/include/xrpl/beast/utility/rngfill.h similarity index 100% rename from src/ripple/beast/utility/rngfill.h rename to include/xrpl/beast/utility/rngfill.h diff --git a/src/ripple/beast/utility/temp_dir.h b/include/xrpl/beast/utility/temp_dir.h similarity index 100% rename from src/ripple/beast/utility/temp_dir.h rename to include/xrpl/beast/utility/temp_dir.h diff --git a/src/ripple/beast/xor_shift_engine.h b/include/xrpl/beast/xor_shift_engine.h similarity index 100% rename from src/ripple/beast/xor_shift_engine.h rename to include/xrpl/beast/xor_shift_engine.h diff --git a/src/ripple/crypto/README.md b/include/xrpl/crypto/README.md similarity index 100% rename from src/ripple/crypto/README.md rename to include/xrpl/crypto/README.md diff --git a/src/ripple/crypto/RFC1751.h b/include/xrpl/crypto/RFC1751.h similarity index 100% rename from src/ripple/crypto/RFC1751.h rename to include/xrpl/crypto/RFC1751.h diff --git a/src/ripple/crypto/csprng.h b/include/xrpl/crypto/csprng.h similarity index 100% rename from src/ripple/crypto/csprng.h rename to include/xrpl/crypto/csprng.h diff --git a/src/ripple/crypto/secure_erase.h b/include/xrpl/crypto/secure_erase.h similarity index 100% rename from src/ripple/crypto/secure_erase.h rename to include/xrpl/crypto/secure_erase.h diff --git a/src/ripple/json/JsonPropertyStream.h b/include/xrpl/json/JsonPropertyStream.h similarity index 96% rename from src/ripple/json/JsonPropertyStream.h rename to include/xrpl/json/JsonPropertyStream.h index 0f25e59eb59..fdc21971978 100644 --- a/src/ripple/json/JsonPropertyStream.h +++ b/include/xrpl/json/JsonPropertyStream.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_JSON_JSONPROPERTYSTREAM_H_INCLUDED #define RIPPLE_JSON_JSONPROPERTYSTREAM_H_INCLUDED -#include -#include +#include +#include namespace ripple { diff --git a/src/ripple/json/Object.h b/include/xrpl/json/Object.h similarity index 99% rename from src/ripple/json/Object.h rename to include/xrpl/json/Object.h index 04501033335..ec60e562028 100644 --- a/src/ripple/json/Object.h +++ b/include/xrpl/json/Object.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_JSON_OBJECT_H_INCLUDED #define RIPPLE_JSON_OBJECT_H_INCLUDED -#include +#include #include namespace Json { diff --git a/src/ripple/json/Output.h b/include/xrpl/json/Output.h similarity index 100% rename from src/ripple/json/Output.h rename to include/xrpl/json/Output.h diff --git a/src/ripple/json/README.md b/include/xrpl/json/README.md similarity index 100% rename from src/ripple/json/README.md rename to include/xrpl/json/README.md diff --git a/src/ripple/json/Writer.h b/include/xrpl/json/Writer.h similarity index 98% rename from src/ripple/json/Writer.h rename to include/xrpl/json/Writer.h index 5801caf8514..882e944093e 100644 --- a/src/ripple/json/Writer.h +++ b/include/xrpl/json/Writer.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_JSON_WRITER_H_INCLUDED #define RIPPLE_JSON_WRITER_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include #include namespace Json { diff --git a/src/ripple/json/impl/json_assert.h b/include/xrpl/json/detail/json_assert.h similarity index 97% rename from src/ripple/json/impl/json_assert.h rename to include/xrpl/json/detail/json_assert.h index b7297e016c6..c401ccf7200 100644 --- a/src/ripple/json/impl/json_assert.h +++ b/include/xrpl/json/detail/json_assert.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_JSON_JSON_ASSERT_H_INCLUDED #define RIPPLE_JSON_JSON_ASSERT_H_INCLUDED -#include +#include #define JSON_ASSERT_UNREACHABLE assert(false) #define JSON_ASSERT(condition) \ diff --git a/src/ripple/json/json_errors.h b/include/xrpl/json/json_errors.h similarity index 100% rename from src/ripple/json/json_errors.h rename to include/xrpl/json/json_errors.h diff --git a/src/ripple/json/json_forwards.h b/include/xrpl/json/json_forwards.h similarity index 100% rename from src/ripple/json/json_forwards.h rename to include/xrpl/json/json_forwards.h diff --git a/src/ripple/json/json_reader.h b/include/xrpl/json/json_reader.h similarity index 98% rename from src/ripple/json/json_reader.h rename to include/xrpl/json/json_reader.h index caa657eb765..6fb07c318d8 100644 --- a/src/ripple/json/json_reader.h +++ b/include/xrpl/json/json_reader.h @@ -22,8 +22,8 @@ #define CPPTL_JSON_READER_H_INCLUDED -#include -#include +#include +#include #include #include diff --git a/src/ripple/json/json_value.h b/include/xrpl/json/json_value.h similarity index 99% rename from src/ripple/json/json_value.h rename to include/xrpl/json/json_value.h index c8312e51448..c2f9184d79a 100644 --- a/src/ripple/json/json_value.h +++ b/include/xrpl/json/json_value.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_JSON_JSON_VALUE_H_INCLUDED #define RIPPLE_JSON_JSON_VALUE_H_INCLUDED -#include +#include #include #include #include diff --git a/src/ripple/json/json_writer.h b/include/xrpl/json/json_writer.h similarity index 99% rename from src/ripple/json/json_writer.h rename to include/xrpl/json/json_writer.h index d1ddcd4decf..86a5ecd984a 100644 --- a/src/ripple/json/json_writer.h +++ b/include/xrpl/json/json_writer.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_JSON_JSON_WRITER_H_INCLUDED #define RIPPLE_JSON_JSON_WRITER_H_INCLUDED -#include -#include +#include +#include #include #include diff --git a/src/ripple/json/to_string.h b/include/xrpl/json/to_string.h similarity index 100% rename from src/ripple/json/to_string.h rename to include/xrpl/json/to_string.h diff --git a/src/ripple/proto/README.md b/include/xrpl/proto/README.md similarity index 100% rename from src/ripple/proto/README.md rename to include/xrpl/proto/README.md diff --git a/src/ripple/proto/org/xrpl/rpc/v1/README.md b/include/xrpl/proto/org/xrpl/rpc/v1/README.md similarity index 100% rename from src/ripple/proto/org/xrpl/rpc/v1/README.md rename to include/xrpl/proto/org/xrpl/rpc/v1/README.md diff --git a/src/ripple/proto/org/xrpl/rpc/v1/get_ledger.proto b/include/xrpl/proto/org/xrpl/rpc/v1/get_ledger.proto similarity index 100% rename from src/ripple/proto/org/xrpl/rpc/v1/get_ledger.proto rename to include/xrpl/proto/org/xrpl/rpc/v1/get_ledger.proto diff --git a/src/ripple/proto/org/xrpl/rpc/v1/get_ledger_data.proto b/include/xrpl/proto/org/xrpl/rpc/v1/get_ledger_data.proto similarity index 100% rename from src/ripple/proto/org/xrpl/rpc/v1/get_ledger_data.proto rename to include/xrpl/proto/org/xrpl/rpc/v1/get_ledger_data.proto diff --git a/src/ripple/proto/org/xrpl/rpc/v1/get_ledger_diff.proto b/include/xrpl/proto/org/xrpl/rpc/v1/get_ledger_diff.proto similarity index 100% rename from src/ripple/proto/org/xrpl/rpc/v1/get_ledger_diff.proto rename to include/xrpl/proto/org/xrpl/rpc/v1/get_ledger_diff.proto diff --git a/src/ripple/proto/org/xrpl/rpc/v1/get_ledger_entry.proto b/include/xrpl/proto/org/xrpl/rpc/v1/get_ledger_entry.proto similarity index 100% rename from src/ripple/proto/org/xrpl/rpc/v1/get_ledger_entry.proto rename to include/xrpl/proto/org/xrpl/rpc/v1/get_ledger_entry.proto diff --git a/src/ripple/proto/org/xrpl/rpc/v1/ledger.proto b/include/xrpl/proto/org/xrpl/rpc/v1/ledger.proto similarity index 100% rename from src/ripple/proto/org/xrpl/rpc/v1/ledger.proto rename to include/xrpl/proto/org/xrpl/rpc/v1/ledger.proto diff --git a/src/ripple/proto/org/xrpl/rpc/v1/xrp_ledger.proto b/include/xrpl/proto/org/xrpl/rpc/v1/xrp_ledger.proto similarity index 100% rename from src/ripple/proto/org/xrpl/rpc/v1/xrp_ledger.proto rename to include/xrpl/proto/org/xrpl/rpc/v1/xrp_ledger.proto diff --git a/src/ripple/proto/ripple.proto b/include/xrpl/proto/ripple.proto similarity index 100% rename from src/ripple/proto/ripple.proto rename to include/xrpl/proto/ripple.proto diff --git a/src/ripple/protocol/AMMCore.h b/include/xrpl/protocol/AMMCore.h similarity index 95% rename from src/ripple/protocol/AMMCore.h rename to include/xrpl/protocol/AMMCore.h index 816bf86214b..32988af5fc7 100644 --- a/src/ripple/protocol/AMMCore.h +++ b/include/xrpl/protocol/AMMCore.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_PROTOCOL_AMMCORE_H_INCLUDED #define RIPPLE_PROTOCOL_AMMCORE_H_INCLUDED -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/protocol/AccountID.h b/include/xrpl/protocol/AccountID.h similarity index 95% rename from src/ripple/protocol/AccountID.h rename to include/xrpl/protocol/AccountID.h index 27e1f452293..ebe7f014d9c 100644 --- a/src/ripple/protocol/AccountID.h +++ b/include/xrpl/protocol/AccountID.h @@ -20,13 +20,13 @@ #ifndef RIPPLE_PROTOCOL_ACCOUNTID_H_INCLUDED #define RIPPLE_PROTOCOL_ACCOUNTID_H_INCLUDED -#include +#include // VFALCO Uncomment when the header issues are resolved //#include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/protocol/AmountConversions.h b/include/xrpl/protocol/AmountConversions.h similarity index 98% rename from src/ripple/protocol/AmountConversions.h rename to include/xrpl/protocol/AmountConversions.h index dc0defe6972..0348e3c975d 100644 --- a/src/ripple/protocol/AmountConversions.h +++ b/include/xrpl/protocol/AmountConversions.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_PROTOCOL_AMOUNTCONVERSION_H_INCLUDED #define RIPPLE_PROTOCOL_AMOUNTCONVERSION_H_INCLUDED -#include -#include -#include +#include +#include +#include #include diff --git a/src/ripple/protocol/ApiVersion.h b/include/xrpl/protocol/ApiVersion.h similarity index 100% rename from src/ripple/protocol/ApiVersion.h rename to include/xrpl/protocol/ApiVersion.h diff --git a/src/ripple/protocol/Book.h b/include/xrpl/protocol/Book.h similarity index 98% rename from src/ripple/protocol/Book.h rename to include/xrpl/protocol/Book.h index 609989062c0..164a5ccfa99 100644 --- a/src/ripple/protocol/Book.h +++ b/include/xrpl/protocol/Book.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_PROTOCOL_BOOK_H_INCLUDED #define RIPPLE_PROTOCOL_BOOK_H_INCLUDED -#include -#include +#include +#include #include namespace ripple { diff --git a/src/ripple/protocol/BuildInfo.h b/include/xrpl/protocol/BuildInfo.h similarity index 100% rename from src/ripple/protocol/BuildInfo.h rename to include/xrpl/protocol/BuildInfo.h diff --git a/src/ripple/protocol/ErrorCodes.h b/include/xrpl/protocol/ErrorCodes.h similarity index 99% rename from src/ripple/protocol/ErrorCodes.h rename to include/xrpl/protocol/ErrorCodes.h index ad849f2b4ef..6d5590ec605 100644 --- a/src/ripple/protocol/ErrorCodes.h +++ b/include/xrpl/protocol/ErrorCodes.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_PROTOCOL_ERRORCODES_H_INCLUDED #define RIPPLE_PROTOCOL_ERRORCODES_H_INCLUDED -#include -#include +#include +#include namespace ripple { diff --git a/src/ripple/protocol/Feature.h b/include/xrpl/protocol/Feature.h similarity index 98% rename from src/ripple/protocol/Feature.h rename to include/xrpl/protocol/Feature.h index e0864540cc5..7eec46e89eb 100644 --- a/src/ripple/protocol/Feature.h +++ b/include/xrpl/protocol/Feature.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_PROTOCOL_FEATURE_H_INCLUDED #define RIPPLE_PROTOCOL_FEATURE_H_INCLUDED -#include +#include #include #include #include @@ -80,7 +80,7 @@ namespace detail { // Feature.cpp. Because it's only used to reserve storage, and determine how // large to make the FeatureBitset, it MAY be larger. It MUST NOT be less than // the actual number of amendments. A LogicError on startup will verify this. -static constexpr std::size_t numFeatures = 76; +static constexpr std::size_t numFeatures = 78; /** Amendments that this server supports and the default voting behavior. Whether they are enabled depends on the Rules defined in the validated @@ -369,6 +369,8 @@ extern uint256 const fixAMMv1_1; extern uint256 const featureNFTokenMintOffer; extern uint256 const fixReducedOffersV2; extern uint256 const fixEnforceNFTokenTrustline; +extern uint256 const fixInnerObjTemplate2; +extern uint256 const featureInvariantsV1_1; } // namespace ripple diff --git a/src/ripple/protocol/Fees.h b/include/xrpl/protocol/Fees.h similarity index 98% rename from src/ripple/protocol/Fees.h rename to include/xrpl/protocol/Fees.h index d155b869d1d..7b4671a91d9 100644 --- a/src/ripple/protocol/Fees.h +++ b/include/xrpl/protocol/Fees.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_PROTOCOL_FEES_H_INCLUDED #define RIPPLE_PROTOCOL_FEES_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/protocol/HashPrefix.h b/include/xrpl/protocol/HashPrefix.h similarity index 98% rename from src/ripple/protocol/HashPrefix.h rename to include/xrpl/protocol/HashPrefix.h index 409f9de9b51..0979756b6e1 100644 --- a/src/ripple/protocol/HashPrefix.h +++ b/include/xrpl/protocol/HashPrefix.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_PROTOCOL_HASHPREFIX_H_INCLUDED #define RIPPLE_PROTOCOL_HASHPREFIX_H_INCLUDED -#include +#include #include namespace ripple { diff --git a/src/ripple/protocol/Indexes.h b/include/xrpl/protocol/Indexes.h similarity index 87% rename from src/ripple/protocol/Indexes.h rename to include/xrpl/protocol/Indexes.h index d83599f892f..f179bbacfab 100644 --- a/src/ripple/protocol/Indexes.h +++ b/include/xrpl/protocol/Indexes.h @@ -20,15 +20,16 @@ #ifndef RIPPLE_PROTOCOL_INDEXES_H_INCLUDED #define RIPPLE_PROTOCOL_INDEXES_H_INCLUDED -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include namespace ripple { @@ -306,6 +307,26 @@ getTicketIndex(AccountID const& account, std::uint32_t uSequence); uint256 getTicketIndex(AccountID const& account, SeqProxy ticketSeq); +template +struct keyletDesc +{ + std::function function; + Json::StaticString expectedLEName; + bool includeInTests; +}; + +// This list should include all of the keylet functions that take a single +// AccountID parameter. +std::array, 6> const directAccountKeylets{ + {{&keylet::account, jss::AccountRoot, false}, + {&keylet::ownerDir, jss::DirectoryNode, true}, + {&keylet::signers, jss::SignerList, true}, + // It's normally impossible to create an item at nftpage_min, but + // test it anyway, since the invariant checks for it. + {&keylet::nftpage_min, jss::NFTokenPage, true}, + {&keylet::nftpage_max, jss::NFTokenPage, true}, + {&keylet::did, jss::DID, true}}}; + } // namespace ripple #endif diff --git a/src/ripple/protocol/InnerObjectFormats.h b/include/xrpl/protocol/InnerObjectFormats.h similarity index 97% rename from src/ripple/protocol/InnerObjectFormats.h rename to include/xrpl/protocol/InnerObjectFormats.h index 33a155d03cb..06ca5af385c 100644 --- a/src/ripple/protocol/InnerObjectFormats.h +++ b/include/xrpl/protocol/InnerObjectFormats.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_PROTOCOL_INNER_OBJECT_FORMATS_H_INCLUDED #define RIPPLE_PROTOCOL_INNER_OBJECT_FORMATS_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/protocol/Issue.h b/include/xrpl/protocol/Issue.h similarity index 97% rename from src/ripple/protocol/Issue.h rename to include/xrpl/protocol/Issue.h index 1956b942e2b..a18502f2138 100644 --- a/src/ripple/protocol/Issue.h +++ b/include/xrpl/protocol/Issue.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_PROTOCOL_ISSUE_H_INCLUDED #define RIPPLE_PROTOCOL_ISSUE_H_INCLUDED -#include -#include +#include +#include #include #include diff --git a/src/ripple/protocol/KeyType.h b/include/xrpl/protocol/KeyType.h similarity index 100% rename from src/ripple/protocol/KeyType.h rename to include/xrpl/protocol/KeyType.h diff --git a/src/ripple/protocol/Keylet.h b/include/xrpl/protocol/Keylet.h similarity index 95% rename from src/ripple/protocol/Keylet.h rename to include/xrpl/protocol/Keylet.h index 1c08ce855c6..d3bda103314 100644 --- a/src/ripple/protocol/Keylet.h +++ b/include/xrpl/protocol/Keylet.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_PROTOCOL_KEYLET_H_INCLUDED #define RIPPLE_PROTOCOL_KEYLET_H_INCLUDED -#include -#include +#include +#include namespace ripple { diff --git a/src/ripple/protocol/KnownFormats.h b/include/xrpl/protocol/KnownFormats.h similarity index 98% rename from src/ripple/protocol/KnownFormats.h rename to include/xrpl/protocol/KnownFormats.h index b59742259ad..5f5a04be1b3 100644 --- a/src/ripple/protocol/KnownFormats.h +++ b/include/xrpl/protocol/KnownFormats.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_PROTOCOL_KNOWNFORMATS_H_INCLUDED #define RIPPLE_PROTOCOL_KNOWNFORMATS_H_INCLUDED -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/ripple/protocol/LedgerFormats.h b/include/xrpl/protocol/LedgerFormats.h similarity index 99% rename from src/ripple/protocol/LedgerFormats.h rename to include/xrpl/protocol/LedgerFormats.h index e0ea7bf6f46..0ee6c992d8d 100644 --- a/src/ripple/protocol/LedgerFormats.h +++ b/include/xrpl/protocol/LedgerFormats.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_PROTOCOL_LEDGERFORMATS_H_INCLUDED #define RIPPLE_PROTOCOL_LEDGERFORMATS_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/protocol/LedgerHeader.h b/include/xrpl/protocol/LedgerHeader.h similarity index 93% rename from src/ripple/protocol/LedgerHeader.h rename to include/xrpl/protocol/LedgerHeader.h index 2adcfcfd209..663eb709be2 100644 --- a/src/ripple/protocol/LedgerHeader.h +++ b/include/xrpl/protocol/LedgerHeader.h @@ -20,12 +20,12 @@ #ifndef RIPPLE_PROTOCOL_LEDGERHEADER_H_INCLUDED #define RIPPLE_PROTOCOL_LEDGERHEADER_H_INCLUDED -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/protocol/MultiApiJson.h b/include/xrpl/protocol/MultiApiJson.h similarity index 99% rename from src/ripple/protocol/MultiApiJson.h rename to include/xrpl/protocol/MultiApiJson.h index b6d1843ae69..4514c54ea34 100644 --- a/src/ripple/protocol/MultiApiJson.h +++ b/include/xrpl/protocol/MultiApiJson.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_JSON_MULTIAPIJSON_H_INCLUDED #define RIPPLE_JSON_MULTIAPIJSON_H_INCLUDED -#include -#include +#include +#include #include #include diff --git a/src/ripple/protocol/NFTSyntheticSerializer.h b/include/xrpl/protocol/NFTSyntheticSerializer.h similarity index 92% rename from src/ripple/protocol/NFTSyntheticSerializer.h rename to include/xrpl/protocol/NFTSyntheticSerializer.h index f9a0cd50a46..e57b3ff71c9 100644 --- a/src/ripple/protocol/NFTSyntheticSerializer.h +++ b/include/xrpl/protocol/NFTSyntheticSerializer.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_PROTOCOL_NFTSYNTHETICSERIALIZER_H_INCLUDED #define RIPPLE_PROTOCOL_NFTSYNTHETICSERIALIZER_H_INCLUDED -#include -#include -#include +#include +#include +#include #include diff --git a/src/ripple/protocol/NFTokenID.h b/include/xrpl/protocol/NFTokenID.h similarity index 92% rename from src/ripple/protocol/NFTokenID.h rename to include/xrpl/protocol/NFTokenID.h index f29713aba7b..b9ea75d2036 100644 --- a/src/ripple/protocol/NFTokenID.h +++ b/include/xrpl/protocol/NFTokenID.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_PROTOCOL_NFTOKENID_H_INCLUDED #define RIPPLE_PROTOCOL_NFTOKENID_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/protocol/NFTokenOfferID.h b/include/xrpl/protocol/NFTokenOfferID.h similarity index 92% rename from src/ripple/protocol/NFTokenOfferID.h rename to include/xrpl/protocol/NFTokenOfferID.h index 777324f4243..9645b0b34da 100644 --- a/src/ripple/protocol/NFTokenOfferID.h +++ b/include/xrpl/protocol/NFTokenOfferID.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_PROTOCOL_NFTOKENOFFERID_H_INCLUDED #define RIPPLE_PROTOCOL_NFTOKENOFFERID_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/protocol/PayChan.h b/include/xrpl/protocol/PayChan.h similarity index 90% rename from src/ripple/protocol/PayChan.h rename to include/xrpl/protocol/PayChan.h index 216835de270..8344120ccd6 100644 --- a/src/ripple/protocol/PayChan.h +++ b/include/xrpl/protocol/PayChan.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_PROTOCOL_PAYCHAN_H_INCLUDED #define RIPPLE_PROTOCOL_PAYCHAN_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/protocol/Protocol.h b/include/xrpl/protocol/Protocol.h similarity index 98% rename from src/ripple/protocol/Protocol.h rename to include/xrpl/protocol/Protocol.h index bd723627494..8d8a71dfef8 100644 --- a/src/ripple/protocol/Protocol.h +++ b/include/xrpl/protocol/Protocol.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_PROTOCOL_PROTOCOL_H_INCLUDED #define RIPPLE_PROTOCOL_PROTOCOL_H_INCLUDED -#include -#include +#include +#include #include namespace ripple { diff --git a/src/ripple/protocol/PublicKey.h b/include/xrpl/protocol/PublicKey.h similarity index 96% rename from src/ripple/protocol/PublicKey.h rename to include/xrpl/protocol/PublicKey.h index 9cf1a456953..c68656877c9 100644 --- a/src/ripple/protocol/PublicKey.h +++ b/include/xrpl/protocol/PublicKey.h @@ -20,12 +20,12 @@ #ifndef RIPPLE_PROTOCOL_PUBLICKEY_H_INCLUDED #define RIPPLE_PROTOCOL_PUBLICKEY_H_INCLUDED -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/protocol/Quality.h b/include/xrpl/protocol/Quality.h similarity index 98% rename from src/ripple/protocol/Quality.h rename to include/xrpl/protocol/Quality.h index 06b8254df5e..1ee2cc9f686 100644 --- a/src/ripple/protocol/Quality.h +++ b/include/xrpl/protocol/Quality.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_PROTOCOL_QUALITY_H_INCLUDED #define RIPPLE_PROTOCOL_QUALITY_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/protocol/QualityFunction.h b/include/xrpl/protocol/QualityFunction.h similarity index 96% rename from src/ripple/protocol/QualityFunction.h rename to include/xrpl/protocol/QualityFunction.h index 5e08bdf8cd3..f7184881489 100644 --- a/src/ripple/protocol/QualityFunction.h +++ b/include/xrpl/protocol/QualityFunction.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_PROTOCOL_QUALITYFUNCTION_H_INCLUDED #define RIPPLE_PROTOCOL_QUALITYFUNCTION_H_INCLUDED -#include -#include -#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/protocol/README.md b/include/xrpl/protocol/README.md similarity index 100% rename from src/ripple/protocol/README.md rename to include/xrpl/protocol/README.md diff --git a/src/ripple/protocol/RPCErr.h b/include/xrpl/protocol/RPCErr.h similarity index 97% rename from src/ripple/protocol/RPCErr.h rename to include/xrpl/protocol/RPCErr.h index e49e96b3df1..cb106b2f0da 100644 --- a/src/ripple/protocol/RPCErr.h +++ b/include/xrpl/protocol/RPCErr.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_NET_RPCERR_H_INCLUDED #define RIPPLE_NET_RPCERR_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/protocol/Rate.h b/include/xrpl/protocol/Rate.h similarity index 98% rename from src/ripple/protocol/Rate.h rename to include/xrpl/protocol/Rate.h index 3524eabb627..b065acb2316 100644 --- a/src/ripple/protocol/Rate.h +++ b/include/xrpl/protocol/Rate.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_PROTOCOL_RATE_H_INCLUDED #define RIPPLE_PROTOCOL_RATE_H_INCLUDED -#include +#include #include #include #include diff --git a/src/ripple/protocol/RippleLedgerHash.h b/include/xrpl/protocol/RippleLedgerHash.h similarity index 97% rename from src/ripple/protocol/RippleLedgerHash.h rename to include/xrpl/protocol/RippleLedgerHash.h index 2a7b5728342..19ba803b823 100644 --- a/src/ripple/protocol/RippleLedgerHash.h +++ b/include/xrpl/protocol/RippleLedgerHash.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_PROTOCOL_RIPPLELEDGERHASH_H_INCLUDED #define RIPPLE_PROTOCOL_RIPPLELEDGERHASH_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/protocol/Rules.h b/include/xrpl/protocol/Rules.h similarity index 96% rename from src/ripple/protocol/Rules.h rename to include/xrpl/protocol/Rules.h index f8ff8c00c0c..6b22d01afe0 100644 --- a/src/ripple/protocol/Rules.h +++ b/include/xrpl/protocol/Rules.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_LEDGER_RULES_H_INCLUDED #define RIPPLE_LEDGER_RULES_H_INCLUDED -#include -#include -#include +#include +#include +#include #include diff --git a/src/ripple/protocol/SField.h b/include/xrpl/protocol/SField.h similarity index 99% rename from src/ripple/protocol/SField.h rename to include/xrpl/protocol/SField.h index 727d531ff40..15aa2272d75 100644 --- a/src/ripple/protocol/SField.h +++ b/include/xrpl/protocol/SField.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_PROTOCOL_SFIELD_H_INCLUDED #define RIPPLE_PROTOCOL_SFIELD_H_INCLUDED -#include -#include +#include +#include #include #include diff --git a/src/ripple/protocol/SOTemplate.h b/include/xrpl/protocol/SOTemplate.h similarity index 98% rename from src/ripple/protocol/SOTemplate.h rename to include/xrpl/protocol/SOTemplate.h index 609c2d2c80b..c0fcfb64358 100644 --- a/src/ripple/protocol/SOTemplate.h +++ b/include/xrpl/protocol/SOTemplate.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_PROTOCOL_SOTEMPLATE_H_INCLUDED #define RIPPLE_PROTOCOL_SOTEMPLATE_H_INCLUDED -#include -#include +#include +#include #include #include #include diff --git a/src/ripple/protocol/STAccount.h b/include/xrpl/protocol/STAccount.h similarity index 96% rename from src/ripple/protocol/STAccount.h rename to include/xrpl/protocol/STAccount.h index c44327fe566..537a336e5db 100644 --- a/src/ripple/protocol/STAccount.h +++ b/include/xrpl/protocol/STAccount.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_PROTOCOL_STACCOUNT_H_INCLUDED #define RIPPLE_PROTOCOL_STACCOUNT_H_INCLUDED -#include -#include -#include +#include +#include +#include #include diff --git a/src/ripple/protocol/STAmount.h b/include/xrpl/protocol/STAmount.h similarity index 97% rename from src/ripple/protocol/STAmount.h rename to include/xrpl/protocol/STAmount.h index 1de1568ae03..3eed0860f54 100644 --- a/src/ripple/protocol/STAmount.h +++ b/include/xrpl/protocol/STAmount.h @@ -20,16 +20,16 @@ #ifndef RIPPLE_PROTOCOL_STAMOUNT_H_INCLUDED #define RIPPLE_PROTOCOL_STAMOUNT_H_INCLUDED -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/protocol/STArray.h b/include/xrpl/protocol/STArray.h similarity index 98% rename from src/ripple/protocol/STArray.h rename to include/xrpl/protocol/STArray.h index 8c3833d3fc8..7fa2ecad834 100644 --- a/src/ripple/protocol/STArray.h +++ b/include/xrpl/protocol/STArray.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_PROTOCOL_STARRAY_H_INCLUDED #define RIPPLE_PROTOCOL_STARRAY_H_INCLUDED -#include -#include +#include +#include namespace ripple { diff --git a/src/ripple/protocol/STBase.h b/include/xrpl/protocol/STBase.h similarity index 98% rename from src/ripple/protocol/STBase.h rename to include/xrpl/protocol/STBase.h index ec8c34a9ddd..e13ef6c5b3e 100644 --- a/src/ripple/protocol/STBase.h +++ b/include/xrpl/protocol/STBase.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_PROTOCOL_STBASE_H_INCLUDED #define RIPPLE_PROTOCOL_STBASE_H_INCLUDED -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/ripple/protocol/STBitString.h b/include/xrpl/protocol/STBitString.h similarity index 97% rename from src/ripple/protocol/STBitString.h rename to include/xrpl/protocol/STBitString.h index decdfa64861..7dc92303e72 100644 --- a/src/ripple/protocol/STBitString.h +++ b/include/xrpl/protocol/STBitString.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_PROTOCOL_STBITSTRING_H_INCLUDED #define RIPPLE_PROTOCOL_STBITSTRING_H_INCLUDED -#include -#include -#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/protocol/STBlob.h b/include/xrpl/protocol/STBlob.h similarity index 95% rename from src/ripple/protocol/STBlob.h rename to include/xrpl/protocol/STBlob.h index 3b2731be7f0..bdedbd92105 100644 --- a/src/ripple/protocol/STBlob.h +++ b/include/xrpl/protocol/STBlob.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_PROTOCOL_STBLOB_H_INCLUDED #define RIPPLE_PROTOCOL_STBLOB_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/protocol/STCurrency.h b/include/xrpl/protocol/STCurrency.h similarity index 94% rename from src/ripple/protocol/STCurrency.h rename to include/xrpl/protocol/STCurrency.h index f855c24832e..3383137fb3a 100644 --- a/src/ripple/protocol/STCurrency.h +++ b/include/xrpl/protocol/STCurrency.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_PROTOCOL_STCURRENCY_H_INCLUDED #define RIPPLE_PROTOCOL_STCURRENCY_H_INCLUDED -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/protocol/STExchange.h b/include/xrpl/protocol/STExchange.h similarity index 93% rename from src/ripple/protocol/STExchange.h rename to include/xrpl/protocol/STExchange.h index e22d75b08ee..e1a1215dbdd 100644 --- a/src/ripple/protocol/STExchange.h +++ b/include/xrpl/protocol/STExchange.h @@ -20,14 +20,14 @@ #ifndef RIPPLE_PROTOCOL_STEXCHANGE_H_INCLUDED #define RIPPLE_PROTOCOL_STEXCHANGE_H_INCLUDED -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/protocol/STInteger.h b/include/xrpl/protocol/STInteger.h similarity index 98% rename from src/ripple/protocol/STInteger.h rename to include/xrpl/protocol/STInteger.h index aaf0f8c904e..6bae2cc3152 100644 --- a/src/ripple/protocol/STInteger.h +++ b/include/xrpl/protocol/STInteger.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_PROTOCOL_STINTEGER_H_INCLUDED #define RIPPLE_PROTOCOL_STINTEGER_H_INCLUDED -#include -#include +#include +#include namespace ripple { diff --git a/src/ripple/protocol/STIssue.h b/include/xrpl/protocol/STIssue.h similarity index 94% rename from src/ripple/protocol/STIssue.h rename to include/xrpl/protocol/STIssue.h index 223798a8911..a0dfbd4faec 100644 --- a/src/ripple/protocol/STIssue.h +++ b/include/xrpl/protocol/STIssue.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_PROTOCOL_STISSUE_H_INCLUDED #define RIPPLE_PROTOCOL_STISSUE_H_INCLUDED -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/protocol/STLedgerEntry.h b/include/xrpl/protocol/STLedgerEntry.h similarity index 97% rename from src/ripple/protocol/STLedgerEntry.h rename to include/xrpl/protocol/STLedgerEntry.h index 6fd50aa154e..6a57b32451a 100644 --- a/src/ripple/protocol/STLedgerEntry.h +++ b/include/xrpl/protocol/STLedgerEntry.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_PROTOCOL_STLEDGERENTRY_H_INCLUDED #define RIPPLE_PROTOCOL_STLEDGERENTRY_H_INCLUDED -#include -#include +#include +#include namespace ripple { diff --git a/src/ripple/protocol/STObject.h b/include/xrpl/protocol/STObject.h similarity index 97% rename from src/ripple/protocol/STObject.h rename to include/xrpl/protocol/STObject.h index 38678f67a55..b3cef83de5f 100644 --- a/src/ripple/protocol/STObject.h +++ b/include/xrpl/protocol/STObject.h @@ -20,20 +20,20 @@ #ifndef RIPPLE_PROTOCOL_STOBJECT_H_INCLUDED #define RIPPLE_PROTOCOL_STOBJECT_H_INCLUDED -#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 #include @@ -44,7 +44,6 @@ namespace ripple { class STArray; -class Rules; inline void throwFieldNotFound(SField const& field) @@ -105,7 +104,7 @@ class STObject : public STBase, public CountedObject explicit STObject(SField const& name); static STObject - makeInnerObject(SField const& name, Rules const& rules); + makeInnerObject(SField const& name); iterator begin() const; diff --git a/src/ripple/protocol/STParsedJSON.h b/include/xrpl/protocol/STParsedJSON.h similarity index 98% rename from src/ripple/protocol/STParsedJSON.h rename to include/xrpl/protocol/STParsedJSON.h index 11cba574027..d2052bf1f4c 100644 --- a/src/ripple/protocol/STParsedJSON.h +++ b/include/xrpl/protocol/STParsedJSON.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_PROTOCOL_STPARSEDJSON_H_INCLUDED #define RIPPLE_PROTOCOL_STPARSEDJSON_H_INCLUDED -#include +#include #include namespace ripple { diff --git a/src/ripple/protocol/STPathSet.h b/include/xrpl/protocol/STPathSet.h similarity index 98% rename from src/ripple/protocol/STPathSet.h rename to include/xrpl/protocol/STPathSet.h index 8102bc76eb0..473086368fb 100644 --- a/src/ripple/protocol/STPathSet.h +++ b/include/xrpl/protocol/STPathSet.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_PROTOCOL_STPATHSET_H_INCLUDED #define RIPPLE_PROTOCOL_STPATHSET_H_INCLUDED -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/protocol/STTx.h b/include/xrpl/protocol/STTx.h similarity index 94% rename from src/ripple/protocol/STTx.h rename to include/xrpl/protocol/STTx.h index e166eb20dd4..08b9a1bad10 100644 --- a/src/ripple/protocol/STTx.h +++ b/include/xrpl/protocol/STTx.h @@ -20,14 +20,14 @@ #ifndef RIPPLE_PROTOCOL_STTX_H_INCLUDED #define RIPPLE_PROTOCOL_STTX_H_INCLUDED -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/protocol/STValidation.h b/include/xrpl/protocol/STValidation.h similarity index 97% rename from src/ripple/protocol/STValidation.h rename to include/xrpl/protocol/STValidation.h index edd922e7bfa..6cae0971f51 100644 --- a/src/ripple/protocol/STValidation.h +++ b/include/xrpl/protocol/STValidation.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_PROTOCOL_STVALIDATION_H_INCLUDED #define RIPPLE_PROTOCOL_STVALIDATION_H_INCLUDED -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/protocol/STVector256.h b/include/xrpl/protocol/STVector256.h similarity index 97% rename from src/ripple/protocol/STVector256.h rename to include/xrpl/protocol/STVector256.h index bf4a1cbec44..e70297a40bf 100644 --- a/src/ripple/protocol/STVector256.h +++ b/include/xrpl/protocol/STVector256.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_PROTOCOL_STVECTOR256_H_INCLUDED #define RIPPLE_PROTOCOL_STVECTOR256_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/protocol/STXChainBridge.h b/include/xrpl/protocol/STXChainBridge.h similarity index 97% rename from src/ripple/protocol/STXChainBridge.h rename to include/xrpl/protocol/STXChainBridge.h index 537a1d160b2..38db1912c70 100644 --- a/src/ripple/protocol/STXChainBridge.h +++ b/include/xrpl/protocol/STXChainBridge.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_PROTOCOL_STXCHAINBRIDGE_H_INCLUDED #define RIPPLE_PROTOCOL_STXCHAINBRIDGE_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/protocol/SecretKey.h b/include/xrpl/protocol/SecretKey.h similarity index 95% rename from src/ripple/protocol/SecretKey.h rename to include/xrpl/protocol/SecretKey.h index 824ae9b1e0f..67dc9c4ca59 100644 --- a/src/ripple/protocol/SecretKey.h +++ b/include/xrpl/protocol/SecretKey.h @@ -20,12 +20,12 @@ #ifndef RIPPLE_PROTOCOL_SECRETKEY_H_INCLUDED #define RIPPLE_PROTOCOL_SECRETKEY_H_INCLUDED -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/protocol/Seed.h b/include/xrpl/protocol/Seed.h similarity index 96% rename from src/ripple/protocol/Seed.h rename to include/xrpl/protocol/Seed.h index 2ebc64970f0..1d0a736db8a 100644 --- a/src/ripple/protocol/Seed.h +++ b/include/xrpl/protocol/Seed.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_PROTOCOL_SEED_H_INCLUDED #define RIPPLE_PROTOCOL_SEED_H_INCLUDED -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/ripple/protocol/SeqProxy.h b/include/xrpl/protocol/SeqProxy.h similarity index 100% rename from src/ripple/protocol/SeqProxy.h rename to include/xrpl/protocol/SeqProxy.h diff --git a/src/ripple/protocol/Serializer.h b/include/xrpl/protocol/Serializer.h similarity index 96% rename from src/ripple/protocol/Serializer.h rename to include/xrpl/protocol/Serializer.h index e3ef00eaf65..b85e8eb013d 100644 --- a/src/ripple/protocol/Serializer.h +++ b/include/xrpl/protocol/Serializer.h @@ -20,15 +20,15 @@ #ifndef RIPPLE_PROTOCOL_SERIALIZER_H_INCLUDED #define RIPPLE_PROTOCOL_SERIALIZER_H_INCLUDED -#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/protocol/Sign.h b/include/xrpl/protocol/Sign.h similarity index 95% rename from src/ripple/protocol/Sign.h rename to include/xrpl/protocol/Sign.h index 6af29530486..30fbb26244b 100644 --- a/src/ripple/protocol/Sign.h +++ b/include/xrpl/protocol/Sign.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_PROTOCOL_SIGN_H_INCLUDED #define RIPPLE_PROTOCOL_SIGN_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/protocol/SystemParameters.h b/include/xrpl/protocol/SystemParameters.h similarity index 97% rename from src/ripple/protocol/SystemParameters.h rename to include/xrpl/protocol/SystemParameters.h index bc2f7136ff9..c99944193ae 100644 --- a/src/ripple/protocol/SystemParameters.h +++ b/include/xrpl/protocol/SystemParameters.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_PROTOCOL_SYSTEMPARAMETERS_H_INCLUDED #define RIPPLE_PROTOCOL_SYSTEMPARAMETERS_H_INCLUDED -#include -#include +#include +#include #include #include diff --git a/src/ripple/protocol/TER.h b/include/xrpl/protocol/TER.h similarity index 99% rename from src/ripple/protocol/TER.h rename to include/xrpl/protocol/TER.h index 41c23a2d6a8..335ef8de39a 100644 --- a/src/ripple/protocol/TER.h +++ b/include/xrpl/protocol/TER.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_PROTOCOL_TER_H_INCLUDED #define RIPPLE_PROTOCOL_TER_H_INCLUDED -#include -#include +#include +#include #include #include diff --git a/src/ripple/protocol/TxFlags.h b/include/xrpl/protocol/TxFlags.h similarity index 100% rename from src/ripple/protocol/TxFlags.h rename to include/xrpl/protocol/TxFlags.h diff --git a/src/ripple/protocol/TxFormats.h b/include/xrpl/protocol/TxFormats.h similarity index 99% rename from src/ripple/protocol/TxFormats.h rename to include/xrpl/protocol/TxFormats.h index b5afa470f38..bd5dffd94e9 100644 --- a/src/ripple/protocol/TxFormats.h +++ b/include/xrpl/protocol/TxFormats.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_PROTOCOL_TXFORMATS_H_INCLUDED #define RIPPLE_PROTOCOL_TXFORMATS_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/protocol/TxMeta.h b/include/xrpl/protocol/TxMeta.h similarity index 95% rename from src/ripple/protocol/TxMeta.h rename to include/xrpl/protocol/TxMeta.h index 0a6578b1930..7932a4c55a3 100644 --- a/src/ripple/protocol/TxMeta.h +++ b/include/xrpl/protocol/TxMeta.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_APP_TX_TRANSACTIONMETA_H_INCLUDED #define RIPPLE_APP_TX_TRANSACTIONMETA_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/protocol/UintTypes.h b/include/xrpl/protocol/UintTypes.h similarity index 95% rename from src/ripple/protocol/UintTypes.h rename to include/xrpl/protocol/UintTypes.h index 6fb685551f8..a0a8069f669 100644 --- a/src/ripple/protocol/UintTypes.h +++ b/include/xrpl/protocol/UintTypes.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_PROTOCOL_UINTTYPES_H_INCLUDED #define RIPPLE_PROTOCOL_UINTTYPES_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include namespace ripple { namespace detail { diff --git a/src/ripple/protocol/XChainAttestations.h b/include/xrpl/protocol/XChainAttestations.h similarity index 97% rename from src/ripple/protocol/XChainAttestations.h rename to include/xrpl/protocol/XChainAttestations.h index b99a0b59a4b..721950ca9c1 100644 --- a/src/ripple/protocol/XChainAttestations.h +++ b/include/xrpl/protocol/XChainAttestations.h @@ -20,16 +20,16 @@ #ifndef RIPPLE_PROTOCOL_STXATTESTATIONS_H_INCLUDED #define RIPPLE_PROTOCOL_STXATTESTATIONS_H_INCLUDED -#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/protocol/impl/STVar.h b/include/xrpl/protocol/detail/STVar.h similarity index 97% rename from src/ripple/protocol/impl/STVar.h rename to include/xrpl/protocol/detail/STVar.h index 73863edbbe0..bee48aa53f6 100644 --- a/src/ripple/protocol/impl/STVar.h +++ b/include/xrpl/protocol/detail/STVar.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_PROTOCOL_STVAR_H_INCLUDED #define RIPPLE_PROTOCOL_STVAR_H_INCLUDED -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/ripple/protocol/impl/b58_utils.h b/include/xrpl/protocol/detail/b58_utils.h similarity index 99% rename from src/ripple/protocol/impl/b58_utils.h rename to include/xrpl/protocol/detail/b58_utils.h index c3bb0c03750..f21b416042b 100644 --- a/src/ripple/protocol/impl/b58_utils.h +++ b/include/xrpl/protocol/detail/b58_utils.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_PROTOCOL_B58_UTILS_H_INCLUDED #define RIPPLE_PROTOCOL_B58_UTILS_H_INCLUDED -#include +#include #include #include diff --git a/src/ripple/protocol/impl/secp256k1.h b/include/xrpl/protocol/detail/secp256k1.h similarity index 100% rename from src/ripple/protocol/impl/secp256k1.h rename to include/xrpl/protocol/detail/secp256k1.h diff --git a/src/ripple/protocol/impl/token_errors.h b/include/xrpl/protocol/detail/token_errors.h similarity index 100% rename from src/ripple/protocol/impl/token_errors.h rename to include/xrpl/protocol/detail/token_errors.h diff --git a/src/ripple/protocol/digest.h b/include/xrpl/protocol/digest.h similarity index 98% rename from src/ripple/protocol/digest.h rename to include/xrpl/protocol/digest.h index 6507057dcdc..f3fc2ea5c5d 100644 --- a/src/ripple/protocol/digest.h +++ b/include/xrpl/protocol/digest.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_PROTOCOL_DIGEST_H_INCLUDED #define RIPPLE_PROTOCOL_DIGEST_H_INCLUDED -#include -#include +#include +#include #include #include #include diff --git a/src/ripple/protocol/json_get_or_throw.h b/include/xrpl/protocol/json_get_or_throw.h similarity index 95% rename from src/ripple/protocol/json_get_or_throw.h rename to include/xrpl/protocol/json_get_or_throw.h index 86bd5924d3e..5277ee86484 100644 --- a/src/ripple/protocol/json_get_or_throw.h +++ b/include/xrpl/protocol/json_get_or_throw.h @@ -1,11 +1,11 @@ #ifndef PROTOCOL_GET_OR_THROW_H_ #define PROTOCOL_GET_OR_THROW_H_ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/protocol/jss.h b/include/xrpl/protocol/jss.h similarity index 99% rename from src/ripple/protocol/jss.h rename to include/xrpl/protocol/jss.h index b5f3d1fcb5d..a46e15f39ef 100644 --- a/src/ripple/protocol/jss.h +++ b/include/xrpl/protocol/jss.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_PROTOCOL_JSONFIELDS_H_INCLUDED #define RIPPLE_PROTOCOL_JSONFIELDS_H_INCLUDED -#include +#include namespace ripple { namespace jss { diff --git a/src/ripple/protocol/messages.h b/include/xrpl/protocol/messages.h similarity index 97% rename from src/ripple/protocol/messages.h rename to include/xrpl/protocol/messages.h index e9c9cf60b21..640305185ad 100644 --- a/src/ripple/protocol/messages.h +++ b/include/xrpl/protocol/messages.h @@ -31,6 +31,6 @@ #undef TYPE_BOOL #endif -#include +#include #endif diff --git a/src/ripple/protocol/nft.h b/include/xrpl/protocol/nft.h similarity index 97% rename from src/ripple/protocol/nft.h rename to include/xrpl/protocol/nft.h index 2df8e0b89ce..839d872a63a 100644 --- a/src/ripple/protocol/nft.h +++ b/include/xrpl/protocol/nft.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_PROTOCOL_NFT_H_INCLUDED #define RIPPLE_PROTOCOL_NFT_H_INCLUDED -#include -#include -#include +#include +#include +#include #include diff --git a/src/ripple/protocol/nftPageMask.h b/include/xrpl/protocol/nftPageMask.h similarity index 97% rename from src/ripple/protocol/nftPageMask.h rename to include/xrpl/protocol/nftPageMask.h index a4890b460cd..1f8c39aa138 100644 --- a/src/ripple/protocol/nftPageMask.h +++ b/include/xrpl/protocol/nftPageMask.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_PROTOCOL_NFT_PAGE_MASK_H_INCLUDED #define RIPPLE_PROTOCOL_NFT_PAGE_MASK_H_INCLUDED -#include +#include #include namespace ripple { diff --git a/src/ripple/protocol/serialize.h b/include/xrpl/protocol/serialize.h similarity index 92% rename from src/ripple/protocol/serialize.h rename to include/xrpl/protocol/serialize.h index 93c59acfd0a..6d171c5e86b 100644 --- a/src/ripple/protocol/serialize.h +++ b/include/xrpl/protocol/serialize.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_PROTOCOL_SERIALIZE_H_INCLUDED #define RIPPLE_PROTOCOL_SERIALIZE_H_INCLUDED -#include -#include -#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/protocol/st.h b/include/xrpl/protocol/st.h similarity index 66% rename from src/ripple/protocol/st.h rename to include/xrpl/protocol/st.h index 7d43ef75f15..7b0e3a3b2df 100644 --- a/src/ripple/protocol/st.h +++ b/include/xrpl/protocol/st.h @@ -20,20 +20,20 @@ #ifndef RIPPLE_PROTOCOL_ST_H_INCLUDED #define RIPPLE_PROTOCOL_ST_H_INCLUDED -#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 #endif diff --git a/src/ripple/protocol/tokens.h b/include/xrpl/protocol/tokens.h similarity index 97% rename from src/ripple/protocol/tokens.h rename to include/xrpl/protocol/tokens.h index f51c3f96f95..f0c4e79d43a 100644 --- a/src/ripple/protocol/tokens.h +++ b/include/xrpl/protocol/tokens.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_PROTOCOL_TOKENS_H_INCLUDED #define RIPPLE_PROTOCOL_TOKENS_H_INCLUDED -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/ripple/resource/Charge.h b/include/xrpl/resource/Charge.h similarity index 100% rename from src/ripple/resource/Charge.h rename to include/xrpl/resource/Charge.h diff --git a/src/ripple/resource/Consumer.h b/include/xrpl/resource/Consumer.h similarity index 96% rename from src/ripple/resource/Consumer.h rename to include/xrpl/resource/Consumer.h index 34fb02ee68f..00e4ad2c5f5 100644 --- a/src/ripple/resource/Consumer.h +++ b/include/xrpl/resource/Consumer.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_RESOURCE_CONSUMER_H_INCLUDED #define RIPPLE_RESOURCE_CONSUMER_H_INCLUDED -#include -#include -#include +#include +#include +#include namespace ripple { namespace Resource { diff --git a/src/ripple/resource/Disposition.h b/include/xrpl/resource/Disposition.h similarity index 100% rename from src/ripple/resource/Disposition.h rename to include/xrpl/resource/Disposition.h diff --git a/src/ripple/resource/Fees.h b/include/xrpl/resource/Fees.h similarity index 98% rename from src/ripple/resource/Fees.h rename to include/xrpl/resource/Fees.h index 09ff612a035..1eb1a9bd725 100644 --- a/src/ripple/resource/Fees.h +++ b/include/xrpl/resource/Fees.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_RESOURCE_FEES_H_INCLUDED #define RIPPLE_RESOURCE_FEES_H_INCLUDED -#include +#include namespace ripple { namespace Resource { diff --git a/src/ripple/resource/Gossip.h b/include/xrpl/resource/Gossip.h similarity index 97% rename from src/ripple/resource/Gossip.h rename to include/xrpl/resource/Gossip.h index 742fad640af..6e2a86ecd7c 100644 --- a/src/ripple/resource/Gossip.h +++ b/include/xrpl/resource/Gossip.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_RESOURCE_GOSSIP_H_INCLUDED #define RIPPLE_RESOURCE_GOSSIP_H_INCLUDED -#include +#include namespace ripple { namespace Resource { diff --git a/src/ripple/resource/README.md b/include/xrpl/resource/README.md similarity index 100% rename from src/ripple/resource/README.md rename to include/xrpl/resource/README.md diff --git a/src/ripple/resource/ResourceManager.h b/include/xrpl/resource/ResourceManager.h similarity index 90% rename from src/ripple/resource/ResourceManager.h rename to include/xrpl/resource/ResourceManager.h index 10e20a82f06..b33b141ee05 100644 --- a/src/ripple/resource/ResourceManager.h +++ b/include/xrpl/resource/ResourceManager.h @@ -20,13 +20,13 @@ #ifndef RIPPLE_RESOURCE_MANAGER_H_INCLUDED #define RIPPLE_RESOURCE_MANAGER_H_INCLUDED -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/resource/Types.h b/include/xrpl/resource/Types.h similarity index 100% rename from src/ripple/resource/Types.h rename to include/xrpl/resource/Types.h diff --git a/src/ripple/resource/impl/Entry.h b/include/xrpl/resource/detail/Entry.h similarity index 93% rename from src/ripple/resource/impl/Entry.h rename to include/xrpl/resource/detail/Entry.h index 126f2546456..d4f32080d9d 100644 --- a/src/ripple/resource/impl/Entry.h +++ b/include/xrpl/resource/detail/Entry.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_RESOURCE_ENTRY_H_INCLUDED #define RIPPLE_RESOURCE_ENTRY_H_INCLUDED -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/resource/impl/Import.h b/include/xrpl/resource/detail/Import.h similarity index 95% rename from src/ripple/resource/impl/Import.h rename to include/xrpl/resource/detail/Import.h index 4eae3fafea0..52315644969 100644 --- a/src/ripple/resource/impl/Import.h +++ b/include/xrpl/resource/detail/Import.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_RESOURCE_IMPORT_H_INCLUDED #define RIPPLE_RESOURCE_IMPORT_H_INCLUDED -#include -#include +#include +#include namespace ripple { namespace Resource { diff --git a/src/ripple/resource/impl/Key.h b/include/xrpl/resource/detail/Key.h similarity index 95% rename from src/ripple/resource/impl/Key.h rename to include/xrpl/resource/detail/Key.h index 929c13eebf6..3df2dce039d 100644 --- a/src/ripple/resource/impl/Key.h +++ b/include/xrpl/resource/detail/Key.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_RESOURCE_KEY_H_INCLUDED #define RIPPLE_RESOURCE_KEY_H_INCLUDED -#include -#include +#include +#include #include namespace ripple { diff --git a/src/ripple/resource/impl/Kind.h b/include/xrpl/resource/detail/Kind.h similarity index 100% rename from src/ripple/resource/impl/Kind.h rename to include/xrpl/resource/detail/Kind.h diff --git a/src/ripple/resource/impl/Logic.h b/include/xrpl/resource/detail/Logic.h similarity index 97% rename from src/ripple/resource/impl/Logic.h rename to include/xrpl/resource/detail/Logic.h index 07d89403b6a..a57e529e0a2 100644 --- a/src/ripple/resource/impl/Logic.h +++ b/include/xrpl/resource/detail/Logic.h @@ -20,17 +20,17 @@ #ifndef RIPPLE_RESOURCE_LOGIC_H_INCLUDED #define RIPPLE_RESOURCE_LOGIC_H_INCLUDED -#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/resource/impl/Tuning.h b/include/xrpl/resource/detail/Tuning.h similarity index 100% rename from src/ripple/resource/impl/Tuning.h rename to include/xrpl/resource/detail/Tuning.h diff --git a/src/ripple/server/Handoff.h b/include/xrpl/server/Handoff.h similarity index 98% rename from src/ripple/server/Handoff.h rename to include/xrpl/server/Handoff.h index 2b80d6179d6..f57c9ef57ec 100644 --- a/src/ripple/server/Handoff.h +++ b/include/xrpl/server/Handoff.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_SERVER_HANDOFF_H_INCLUDED #define RIPPLE_SERVER_HANDOFF_H_INCLUDED -#include +#include #include #include #include diff --git a/src/ripple/server/Port.h b/include/xrpl/server/Port.h similarity index 98% rename from src/ripple/server/Port.h rename to include/xrpl/server/Port.h index 9dccfdf9c08..4ab56efb459 100644 --- a/src/ripple/server/Port.h +++ b/include/xrpl/server/Port.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_SERVER_PORT_H_INCLUDED #define RIPPLE_SERVER_PORT_H_INCLUDED -#include -#include +#include +#include #include #include #include diff --git a/src/ripple/server/Server.h b/include/xrpl/server/Server.h similarity index 90% rename from src/ripple/server/Server.h rename to include/xrpl/server/Server.h index a149e34fbfb..e8157c03c6c 100644 --- a/src/ripple/server/Server.h +++ b/include/xrpl/server/Server.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_SERVER_SERVER_H_INCLUDED #define RIPPLE_SERVER_SERVER_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/server/Session.h b/include/xrpl/server/Session.h similarity index 96% rename from src/ripple/server/Session.h rename to include/xrpl/server/Session.h index 3b22c06b00b..25cf1ad747d 100644 --- a/src/ripple/server/Session.h +++ b/include/xrpl/server/Session.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_SERVER_SESSION_H_INCLUDED #define RIPPLE_SERVER_SESSION_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/server/SimpleWriter.h b/include/xrpl/server/SimpleWriter.h similarity index 98% rename from src/ripple/server/SimpleWriter.h rename to include/xrpl/server/SimpleWriter.h index 03582c00114..0e3f63b0d9d 100644 --- a/src/ripple/server/SimpleWriter.h +++ b/include/xrpl/server/SimpleWriter.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_SERVER_SIMPLEWRITER_H_INCLUDED #define RIPPLE_SERVER_SIMPLEWRITER_H_INCLUDED -#include +#include #include #include #include diff --git a/src/ripple/server/WSSession.h b/include/xrpl/server/WSSession.h similarity index 97% rename from src/ripple/server/WSSession.h rename to include/xrpl/server/WSSession.h index 812099108a5..d739afcefb7 100644 --- a/src/ripple/server/WSSession.h +++ b/include/xrpl/server/WSSession.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_SERVER_WSSESSION_H_INCLUDED #define RIPPLE_SERVER_WSSESSION_H_INCLUDED -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/ripple/server/Writer.h b/include/xrpl/server/Writer.h similarity index 100% rename from src/ripple/server/Writer.h rename to include/xrpl/server/Writer.h diff --git a/src/ripple/server/impl/BaseHTTPPeer.h b/include/xrpl/server/detail/BaseHTTPPeer.h similarity index 98% rename from src/ripple/server/impl/BaseHTTPPeer.h rename to include/xrpl/server/detail/BaseHTTPPeer.h index a6bbd18e1aa..171eb7134e1 100644 --- a/src/ripple/server/impl/BaseHTTPPeer.h +++ b/include/xrpl/server/detail/BaseHTTPPeer.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_SERVER_BASEHTTPPEER_H_INCLUDED #define RIPPLE_SERVER_BASEHTTPPEER_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/server/impl/BasePeer.h b/include/xrpl/server/detail/BasePeer.h similarity index 95% rename from src/ripple/server/impl/BasePeer.h rename to include/xrpl/server/detail/BasePeer.h index bc5375b87f7..a90eaabf6e4 100644 --- a/src/ripple/server/impl/BasePeer.h +++ b/include/xrpl/server/detail/BasePeer.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_SERVER_BASEPEER_H_INCLUDED #define RIPPLE_SERVER_BASEPEER_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/server/impl/BaseWSPeer.h b/include/xrpl/server/detail/BaseWSPeer.h similarity index 98% rename from src/ripple/server/impl/BaseWSPeer.h rename to include/xrpl/server/detail/BaseWSPeer.h index fd1722df003..4c4049a8b9b 100644 --- a/src/ripple/server/impl/BaseWSPeer.h +++ b/include/xrpl/server/detail/BaseWSPeer.h @@ -20,12 +20,12 @@ #ifndef RIPPLE_SERVER_BASEWSPEER_H_INCLUDED #define RIPPLE_SERVER_BASEWSPEER_H_INCLUDED -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/server/impl/Door.h b/include/xrpl/server/detail/Door.h similarity index 98% rename from src/ripple/server/impl/Door.h rename to include/xrpl/server/detail/Door.h index 94f39719569..20bdf421e38 100644 --- a/src/ripple/server/impl/Door.h +++ b/include/xrpl/server/detail/Door.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_SERVER_DOOR_H_INCLUDED #define RIPPLE_SERVER_DOOR_H_INCLUDED -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/server/impl/JSONRPCUtil.h b/include/xrpl/server/detail/JSONRPCUtil.h similarity index 95% rename from src/ripple/server/impl/JSONRPCUtil.h rename to include/xrpl/server/detail/JSONRPCUtil.h index d6b67e123c4..7eb00096263 100644 --- a/src/ripple/server/impl/JSONRPCUtil.h +++ b/include/xrpl/server/detail/JSONRPCUtil.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_SERVER_JSONRPCUTIL_H_INCLUDED #define RIPPLE_SERVER_JSONRPCUTIL_H_INCLUDED -#include -#include +#include +#include namespace ripple { diff --git a/src/ripple/server/impl/LowestLayer.h b/include/xrpl/server/detail/LowestLayer.h similarity index 100% rename from src/ripple/server/impl/LowestLayer.h rename to include/xrpl/server/detail/LowestLayer.h diff --git a/src/ripple/server/impl/PlainHTTPPeer.h b/include/xrpl/server/detail/PlainHTTPPeer.h similarity index 97% rename from src/ripple/server/impl/PlainHTTPPeer.h rename to include/xrpl/server/detail/PlainHTTPPeer.h index 4c593ce9cb6..d4b24c01313 100644 --- a/src/ripple/server/impl/PlainHTTPPeer.h +++ b/include/xrpl/server/detail/PlainHTTPPeer.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_SERVER_PLAINHTTPPEER_H_INCLUDED #define RIPPLE_SERVER_PLAINHTTPPEER_H_INCLUDED -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/ripple/server/impl/PlainWSPeer.h b/include/xrpl/server/detail/PlainWSPeer.h similarity index 98% rename from src/ripple/server/impl/PlainWSPeer.h rename to include/xrpl/server/detail/PlainWSPeer.h index 504b38baac7..8bcddee7e77 100644 --- a/src/ripple/server/impl/PlainWSPeer.h +++ b/include/xrpl/server/detail/PlainWSPeer.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_SERVER_PLAINWSPEER_H_INCLUDED #define RIPPLE_SERVER_PLAINWSPEER_H_INCLUDED -#include +#include #include #include diff --git a/src/ripple/server/impl/SSLHTTPPeer.h b/include/xrpl/server/detail/SSLHTTPPeer.h similarity index 98% rename from src/ripple/server/impl/SSLHTTPPeer.h rename to include/xrpl/server/detail/SSLHTTPPeer.h index 8b5b4e38c4e..db6af46b5b3 100644 --- a/src/ripple/server/impl/SSLHTTPPeer.h +++ b/include/xrpl/server/detail/SSLHTTPPeer.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_SERVER_SSLHTTPPEER_H_INCLUDED #define RIPPLE_SERVER_SSLHTTPPEER_H_INCLUDED -#include -#include +#include +#include #include #include #include diff --git a/src/ripple/server/impl/SSLWSPeer.h b/include/xrpl/server/detail/SSLWSPeer.h similarity index 97% rename from src/ripple/server/impl/SSLWSPeer.h rename to include/xrpl/server/detail/SSLWSPeer.h index 28c3184fce6..9c88b275397 100644 --- a/src/ripple/server/impl/SSLWSPeer.h +++ b/include/xrpl/server/detail/SSLWSPeer.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_SERVER_SSLWSPEER_H_INCLUDED #define RIPPLE_SERVER_SSLWSPEER_H_INCLUDED -#include -#include +#include +#include #include #include #include diff --git a/src/ripple/server/impl/ServerImpl.h b/include/xrpl/server/detail/ServerImpl.h similarity index 96% rename from src/ripple/server/impl/ServerImpl.h rename to include/xrpl/server/detail/ServerImpl.h index a3abf78914e..00a9a263846 100644 --- a/src/ripple/server/impl/ServerImpl.h +++ b/include/xrpl/server/detail/ServerImpl.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_SERVER_SERVERIMPL_H_INCLUDED #define RIPPLE_SERVER_SERVERIMPL_H_INCLUDED -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/server/impl/io_list.h b/include/xrpl/server/detail/io_list.h similarity index 100% rename from src/ripple/server/impl/io_list.h rename to include/xrpl/server/detail/io_list.h diff --git a/src/ripple/basics/impl/Archive.cpp b/src/libxrpl/basics/Archive.cpp similarity index 98% rename from src/ripple/basics/impl/Archive.cpp rename to src/libxrpl/basics/Archive.cpp index 73e14a93606..e5672bd953f 100644 --- a/src/ripple/basics/impl/Archive.cpp +++ b/src/libxrpl/basics/Archive.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include #include #include diff --git a/src/ripple/basics/impl/BasicConfig.cpp b/src/libxrpl/basics/BasicConfig.cpp similarity index 98% rename from src/ripple/basics/impl/BasicConfig.cpp rename to src/libxrpl/basics/BasicConfig.cpp index f557d2e6d46..932eea346f6 100644 --- a/src/ripple/basics/impl/BasicConfig.cpp +++ b/src/libxrpl/basics/BasicConfig.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include #include #include diff --git a/src/ripple/basics/impl/CountedObject.cpp b/src/libxrpl/basics/CountedObject.cpp similarity index 97% rename from src/ripple/basics/impl/CountedObject.cpp rename to src/libxrpl/basics/CountedObject.cpp index 5b25091632d..c18152938a9 100644 --- a/src/ripple/basics/impl/CountedObject.cpp +++ b/src/libxrpl/basics/CountedObject.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include #include diff --git a/src/ripple/basics/impl/FileUtilities.cpp b/src/libxrpl/basics/FileUtilities.cpp similarity index 98% rename from src/ripple/basics/impl/FileUtilities.cpp rename to src/libxrpl/basics/FileUtilities.cpp index be60a3e5c3d..e1331433553 100644 --- a/src/ripple/basics/impl/FileUtilities.cpp +++ b/src/libxrpl/basics/FileUtilities.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { diff --git a/src/ripple/basics/impl/IOUAmount.cpp b/src/libxrpl/basics/IOUAmount.cpp similarity index 99% rename from src/ripple/basics/impl/IOUAmount.cpp rename to src/libxrpl/basics/IOUAmount.cpp index e3c3411057b..a24e1b917f7 100644 --- a/src/ripple/basics/impl/IOUAmount.cpp +++ b/src/libxrpl/basics/IOUAmount.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include #include #include #include diff --git a/src/ripple/basics/impl/Log.cpp b/src/libxrpl/basics/Log.cpp similarity index 99% rename from src/ripple/basics/impl/Log.cpp rename to src/libxrpl/basics/Log.cpp index c023bc16485..3d5963cc266 100644 --- a/src/ripple/basics/impl/Log.cpp +++ b/src/libxrpl/basics/Log.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/ripple/basics/impl/Number.cpp b/src/libxrpl/basics/Number.cpp similarity index 99% rename from src/ripple/basics/impl/Number.cpp rename to src/libxrpl/basics/Number.cpp index 9b3247536f9..14260b653a2 100644 --- a/src/ripple/basics/impl/Number.cpp +++ b/src/libxrpl/basics/Number.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include #include #include diff --git a/src/ripple/basics/impl/ResolverAsio.cpp b/src/libxrpl/basics/ResolverAsio.cpp similarity index 98% rename from src/ripple/basics/impl/ResolverAsio.cpp rename to src/libxrpl/basics/ResolverAsio.cpp index f75a390304b..53530da9d8f 100644 --- a/src/ripple/basics/impl/ResolverAsio.cpp +++ b/src/libxrpl/basics/ResolverAsio.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/basics/impl/StringUtilities.cpp b/src/libxrpl/basics/StringUtilities.cpp similarity index 95% rename from src/ripple/basics/impl/StringUtilities.cpp rename to src/libxrpl/basics/StringUtilities.cpp index 67344b48013..cd9bdfbd030 100644 --- a/src/ripple/basics/impl/StringUtilities.cpp +++ b/src/libxrpl/basics/StringUtilities.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/basics/impl/UptimeClock.cpp b/src/libxrpl/basics/UptimeClock.cpp similarity index 98% rename from src/ripple/basics/impl/UptimeClock.cpp rename to src/libxrpl/basics/UptimeClock.cpp index 2dacaef46bf..4394d02f783 100644 --- a/src/ripple/basics/impl/UptimeClock.cpp +++ b/src/libxrpl/basics/UptimeClock.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { diff --git a/src/ripple/basics/impl/base64.cpp b/src/libxrpl/basics/base64.cpp similarity index 99% rename from src/ripple/basics/impl/base64.cpp rename to src/libxrpl/basics/base64.cpp index 4291a99556b..a8b4e352992 100644 --- a/src/ripple/basics/impl/base64.cpp +++ b/src/libxrpl/basics/base64.cpp @@ -54,7 +54,7 @@ */ -#include +#include #include #include diff --git a/src/ripple/basics/impl/contract.cpp b/src/libxrpl/basics/contract.cpp similarity index 95% rename from src/ripple/basics/impl/contract.cpp rename to src/libxrpl/basics/contract.cpp index 3a50db38010..fbda83c7a63 100644 --- a/src/ripple/basics/impl/contract.cpp +++ b/src/libxrpl/basics/contract.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include #include #include diff --git a/src/ripple/basics/impl/make_SSLContext.cpp b/src/libxrpl/basics/make_SSLContext.cpp similarity index 99% rename from src/ripple/basics/impl/make_SSLContext.cpp rename to src/libxrpl/basics/make_SSLContext.cpp index 7d72d9e08b4..4a9ea321d54 100644 --- a/src/ripple/basics/impl/make_SSLContext.cpp +++ b/src/libxrpl/basics/make_SSLContext.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include #include #include diff --git a/src/ripple/basics/impl/mulDiv.cpp b/src/libxrpl/basics/mulDiv.cpp similarity index 97% rename from src/ripple/basics/impl/mulDiv.cpp rename to src/libxrpl/basics/mulDiv.cpp index 6dd01c71fe7..7f9ffa45267 100644 --- a/src/ripple/basics/impl/mulDiv.cpp +++ b/src/libxrpl/basics/mulDiv.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include #include diff --git a/src/ripple/basics/impl/partitioned_unordered_map.cpp b/src/libxrpl/basics/partitioned_unordered_map.cpp similarity index 91% rename from src/ripple/basics/impl/partitioned_unordered_map.cpp rename to src/libxrpl/basics/partitioned_unordered_map.cpp index 3ced32eddff..a6d02cd2c6f 100644 --- a/src/ripple/basics/impl/partitioned_unordered_map.cpp +++ b/src/libxrpl/basics/partitioned_unordered_map.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/beast/clock/basic_seconds_clock.cpp b/src/libxrpl/beast/clock/basic_seconds_clock.cpp similarity index 98% rename from src/ripple/beast/clock/basic_seconds_clock.cpp rename to src/libxrpl/beast/clock/basic_seconds_clock.cpp index 7c55a3f8bc0..f5af8bd16ec 100644 --- a/src/ripple/beast/clock/basic_seconds_clock.cpp +++ b/src/libxrpl/beast/clock/basic_seconds_clock.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include #include diff --git a/src/ripple/beast/core/CurrentThreadName.cpp b/src/libxrpl/beast/core/CurrentThreadName.cpp similarity index 98% rename from src/ripple/beast/core/CurrentThreadName.cpp rename to src/libxrpl/beast/core/CurrentThreadName.cpp index 80d275a1fff..71b5d21fec3 100644 --- a/src/ripple/beast/core/CurrentThreadName.cpp +++ b/src/libxrpl/beast/core/CurrentThreadName.cpp @@ -21,7 +21,7 @@ */ //============================================================================== -#include +#include #include //------------------------------------------------------------------------------ diff --git a/src/ripple/beast/core/SemanticVersion.cpp b/src/libxrpl/beast/core/SemanticVersion.cpp similarity index 98% rename from src/ripple/beast/core/SemanticVersion.cpp rename to src/libxrpl/beast/core/SemanticVersion.cpp index 9d127a09513..b33ed2f48f4 100644 --- a/src/ripple/beast/core/SemanticVersion.cpp +++ b/src/libxrpl/beast/core/SemanticVersion.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include #include #include diff --git a/src/ripple/beast/insight/impl/Collector.cpp b/src/libxrpl/beast/insight/Collector.cpp similarity index 96% rename from src/ripple/beast/insight/impl/Collector.cpp rename to src/libxrpl/beast/insight/Collector.cpp index e0f0e6ec644..4fdf6de984d 100644 --- a/src/ripple/beast/insight/impl/Collector.cpp +++ b/src/libxrpl/beast/insight/Collector.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace beast { namespace insight { diff --git a/src/ripple/beast/insight/impl/Groups.cpp b/src/libxrpl/beast/insight/Groups.cpp similarity index 96% rename from src/ripple/beast/insight/impl/Groups.cpp rename to src/libxrpl/beast/insight/Groups.cpp index 7877034b97a..fcf7e65787e 100644 --- a/src/ripple/beast/insight/impl/Groups.cpp +++ b/src/libxrpl/beast/insight/Groups.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/ripple/beast/insight/impl/Hook.cpp b/src/libxrpl/beast/insight/Hook.cpp similarity index 96% rename from src/ripple/beast/insight/impl/Hook.cpp rename to src/libxrpl/beast/insight/Hook.cpp index 53ae6475aad..62538846349 100644 --- a/src/ripple/beast/insight/impl/Hook.cpp +++ b/src/libxrpl/beast/insight/Hook.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace beast { namespace insight { diff --git a/src/ripple/beast/insight/impl/Metric.cpp b/src/libxrpl/beast/insight/Metric.cpp similarity index 87% rename from src/ripple/beast/insight/impl/Metric.cpp rename to src/libxrpl/beast/insight/Metric.cpp index aa38e2f8166..64a4082fcec 100644 --- a/src/ripple/beast/insight/impl/Metric.cpp +++ b/src/libxrpl/beast/insight/Metric.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include -#include +#include +#include +#include +#include namespace beast { namespace insight { diff --git a/src/ripple/beast/insight/impl/NullCollector.cpp b/src/libxrpl/beast/insight/NullCollector.cpp similarity index 98% rename from src/ripple/beast/insight/impl/NullCollector.cpp rename to src/libxrpl/beast/insight/NullCollector.cpp index b859de552a2..637cd06ec3b 100644 --- a/src/ripple/beast/insight/impl/NullCollector.cpp +++ b/src/libxrpl/beast/insight/NullCollector.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace beast { namespace insight { diff --git a/src/ripple/beast/insight/impl/StatsDCollector.cpp b/src/libxrpl/beast/insight/StatsDCollector.cpp similarity index 98% rename from src/ripple/beast/insight/impl/StatsDCollector.cpp rename to src/libxrpl/beast/insight/StatsDCollector.cpp index 6949a7f86e7..76ae15b82d5 100644 --- a/src/ripple/beast/insight/impl/StatsDCollector.cpp +++ b/src/libxrpl/beast/insight/StatsDCollector.cpp @@ -17,14 +17,14 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/beast/net/impl/IPAddressConversion.cpp b/src/libxrpl/beast/net/IPAddressConversion.cpp similarity index 97% rename from src/ripple/beast/net/impl/IPAddressConversion.cpp rename to src/libxrpl/beast/net/IPAddressConversion.cpp index 6353c50dfba..2ab84c37015 100644 --- a/src/ripple/beast/net/impl/IPAddressConversion.cpp +++ b/src/libxrpl/beast/net/IPAddressConversion.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace beast { namespace IP { diff --git a/src/ripple/beast/net/impl/IPAddressV4.cpp b/src/libxrpl/beast/net/IPAddressV4.cpp similarity index 97% rename from src/ripple/beast/net/impl/IPAddressV4.cpp rename to src/libxrpl/beast/net/IPAddressV4.cpp index 7e428c4228e..83541479878 100644 --- a/src/ripple/beast/net/impl/IPAddressV4.cpp +++ b/src/libxrpl/beast/net/IPAddressV4.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include #include diff --git a/src/ripple/beast/net/impl/IPAddressV6.cpp b/src/libxrpl/beast/net/IPAddressV6.cpp similarity index 94% rename from src/ripple/beast/net/impl/IPAddressV6.cpp rename to src/libxrpl/beast/net/IPAddressV6.cpp index 07dd2baaee5..f90a6d066b0 100644 --- a/src/ripple/beast/net/impl/IPAddressV6.cpp +++ b/src/libxrpl/beast/net/IPAddressV6.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include namespace beast { namespace IP { diff --git a/src/ripple/beast/net/impl/IPEndpoint.cpp b/src/libxrpl/beast/net/IPEndpoint.cpp similarity index 99% rename from src/ripple/beast/net/impl/IPEndpoint.cpp rename to src/libxrpl/beast/net/IPEndpoint.cpp index 4ad71262c27..490777111bd 100644 --- a/src/ripple/beast/net/impl/IPEndpoint.cpp +++ b/src/libxrpl/beast/net/IPEndpoint.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include namespace beast { diff --git a/src/ripple/beast/utility/src/beast_Journal.cpp b/src/libxrpl/beast/utility/src/beast_Journal.cpp similarity index 98% rename from src/ripple/beast/utility/src/beast_Journal.cpp rename to src/libxrpl/beast/utility/src/beast_Journal.cpp index 7c332bf6b52..261e1f6ccab 100644 --- a/src/ripple/beast/utility/src/beast_Journal.cpp +++ b/src/libxrpl/beast/utility/src/beast_Journal.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include namespace beast { diff --git a/src/ripple/beast/utility/src/beast_PropertyStream.cpp b/src/libxrpl/beast/utility/src/beast_PropertyStream.cpp similarity index 99% rename from src/ripple/beast/utility/src/beast_PropertyStream.cpp rename to src/libxrpl/beast/utility/src/beast_PropertyStream.cpp index ecd707e9554..56e862ca8c0 100644 --- a/src/ripple/beast/utility/src/beast_PropertyStream.cpp +++ b/src/libxrpl/beast/utility/src/beast_PropertyStream.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include #include #include diff --git a/src/ripple/crypto/impl/RFC1751.cpp b/src/libxrpl/crypto/RFC1751.cpp similarity index 99% rename from src/ripple/crypto/impl/RFC1751.cpp rename to src/libxrpl/crypto/RFC1751.cpp index 6b6b2c31fb1..1c6f28287b0 100644 --- a/src/ripple/crypto/impl/RFC1751.cpp +++ b/src/libxrpl/crypto/RFC1751.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include #include #include diff --git a/src/ripple/crypto/impl/csprng.cpp b/src/libxrpl/crypto/csprng.cpp similarity index 97% rename from src/ripple/crypto/impl/csprng.cpp rename to src/libxrpl/crypto/csprng.cpp index 04b3b3fc385..480d561eacf 100644 --- a/src/ripple/crypto/impl/csprng.cpp +++ b/src/libxrpl/crypto/csprng.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include #include #include #include diff --git a/src/ripple/crypto/impl/secure_erase.cpp b/src/libxrpl/crypto/secure_erase.cpp similarity index 96% rename from src/ripple/crypto/impl/secure_erase.cpp rename to src/libxrpl/crypto/secure_erase.cpp index 8299ed7a6c9..93f189d519c 100644 --- a/src/ripple/crypto/impl/secure_erase.cpp +++ b/src/libxrpl/crypto/secure_erase.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include namespace ripple { diff --git a/src/ripple/json/impl/JsonPropertyStream.cpp b/src/libxrpl/json/JsonPropertyStream.cpp similarity index 97% rename from src/ripple/json/impl/JsonPropertyStream.cpp rename to src/libxrpl/json/JsonPropertyStream.cpp index 3083deeeee2..19387013b58 100644 --- a/src/ripple/json/impl/JsonPropertyStream.cpp +++ b/src/libxrpl/json/JsonPropertyStream.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include namespace ripple { diff --git a/src/ripple/json/impl/Object.cpp b/src/libxrpl/json/Object.cpp similarity index 98% rename from src/ripple/json/impl/Object.cpp rename to src/libxrpl/json/Object.cpp index a855fc31a2c..179b0e31ef2 100644 --- a/src/ripple/json/impl/Object.cpp +++ b/src/libxrpl/json/Object.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include #include namespace Json { diff --git a/src/ripple/json/impl/Output.cpp b/src/libxrpl/json/Output.cpp similarity index 97% rename from src/ripple/json/impl/Output.cpp rename to src/libxrpl/json/Output.cpp index b32e9ad5a67..c24c75b32dd 100644 --- a/src/ripple/json/impl/Output.cpp +++ b/src/libxrpl/json/Output.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include namespace Json { diff --git a/src/ripple/json/impl/Writer.cpp b/src/libxrpl/json/Writer.cpp similarity index 99% rename from src/ripple/json/impl/Writer.cpp rename to src/libxrpl/json/Writer.cpp index 44d106aa336..ba7336209e6 100644 --- a/src/ripple/json/impl/Writer.cpp +++ b/src/libxrpl/json/Writer.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include #include #include diff --git a/src/ripple/json/impl/json_reader.cpp b/src/libxrpl/json/json_reader.cpp similarity index 99% rename from src/ripple/json/impl/json_reader.cpp rename to src/libxrpl/json/json_reader.cpp index 001049bcdbc..42488b3ec87 100644 --- a/src/ripple/json/impl/json_reader.cpp +++ b/src/libxrpl/json/json_reader.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include #include #include diff --git a/src/ripple/json/impl/json_value.cpp b/src/libxrpl/json/json_value.cpp similarity index 99% rename from src/ripple/json/impl/json_value.cpp rename to src/libxrpl/json/json_value.cpp index 024ad2c88a0..155c3e1e044 100644 --- a/src/ripple/json/impl/json_value.cpp +++ b/src/libxrpl/json/json_value.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace Json { diff --git a/src/ripple/json/impl/json_valueiterator.cpp b/src/libxrpl/json/json_valueiterator.cpp similarity index 99% rename from src/ripple/json/impl/json_valueiterator.cpp rename to src/libxrpl/json/json_valueiterator.cpp index 355bfad23cd..c1a1bcc56a0 100644 --- a/src/ripple/json/impl/json_valueiterator.cpp +++ b/src/libxrpl/json/json_valueiterator.cpp @@ -19,7 +19,7 @@ // included by json_value.cpp -#include +#include namespace Json { diff --git a/src/ripple/json/impl/json_writer.cpp b/src/libxrpl/json/json_writer.cpp similarity index 99% rename from src/ripple/json/impl/json_writer.cpp rename to src/libxrpl/json/json_writer.cpp index 4d696ab55bc..5459042cddb 100644 --- a/src/ripple/json/impl/json_writer.cpp +++ b/src/libxrpl/json/json_writer.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include #include #include diff --git a/src/ripple/json/impl/to_string.cpp b/src/libxrpl/json/to_string.cpp similarity index 94% rename from src/ripple/json/impl/to_string.cpp rename to src/libxrpl/json/to_string.cpp index b965417721e..7bf58241201 100644 --- a/src/ripple/json/impl/to_string.cpp +++ b/src/libxrpl/json/to_string.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include namespace Json { diff --git a/src/ripple/protocol/impl/AMMCore.cpp b/src/libxrpl/protocol/AMMCore.cpp similarity index 94% rename from src/ripple/protocol/impl/AMMCore.cpp rename to src/libxrpl/protocol/AMMCore.cpp index b774ee4ee3b..7ac27041e76 100644 --- a/src/ripple/protocol/impl/AMMCore.cpp +++ b/src/libxrpl/protocol/AMMCore.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/protocol/impl/AccountID.cpp b/src/libxrpl/protocol/AccountID.cpp similarity index 96% rename from src/ripple/protocol/impl/AccountID.cpp rename to src/libxrpl/protocol/AccountID.cpp index c615807cf84..5f0fa631851 100644 --- a/src/ripple/protocol/impl/AccountID.cpp +++ b/src/libxrpl/protocol/AccountID.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/protocol/impl/Book.cpp b/src/libxrpl/protocol/Book.cpp similarity index 97% rename from src/ripple/protocol/impl/Book.cpp rename to src/libxrpl/protocol/Book.cpp index 3ad22675d1b..c096dba2b4e 100644 --- a/src/ripple/protocol/impl/Book.cpp +++ b/src/libxrpl/protocol/Book.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { diff --git a/src/ripple/protocol/impl/BuildInfo.cpp b/src/libxrpl/protocol/BuildInfo.cpp similarity index 96% rename from src/ripple/protocol/impl/BuildInfo.cpp rename to src/libxrpl/protocol/BuildInfo.cpp index 8a83011e906..b0a7bcc9ed7 100644 --- a/src/ripple/protocol/impl/BuildInfo.cpp +++ b/src/libxrpl/protocol/BuildInfo.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -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" +char const* const versionString = "2.3.0-b1" // clang-format on #if defined(DEBUG) || defined(SANITIZER) diff --git a/src/ripple/protocol/impl/ErrorCodes.cpp b/src/libxrpl/protocol/ErrorCodes.cpp similarity index 99% rename from src/ripple/protocol/impl/ErrorCodes.cpp rename to src/libxrpl/protocol/ErrorCodes.cpp index 3af48891c78..28024fab093 100644 --- a/src/ripple/protocol/impl/ErrorCodes.cpp +++ b/src/libxrpl/protocol/ErrorCodes.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include #include #include diff --git a/src/ripple/protocol/impl/Feature.cpp b/src/libxrpl/protocol/Feature.cpp similarity index 97% rename from src/ripple/protocol/impl/Feature.cpp rename to src/libxrpl/protocol/Feature.cpp index 4434a7fbdc3..87395b7e189 100644 --- a/src/ripple/protocol/impl/Feature.cpp +++ b/src/libxrpl/protocol/Feature.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include +#include -#include -#include -#include +#include +#include +#include #include #include #include @@ -496,6 +496,10 @@ REGISTER_FIX (fixAMMv1_1, Supported::yes, VoteBehavior::De REGISTER_FEATURE(NFTokenMintOffer, Supported::yes, VoteBehavior::DefaultNo); REGISTER_FIX (fixReducedOffersV2, Supported::yes, VoteBehavior::DefaultNo); REGISTER_FIX (fixEnforceNFTokenTrustline, Supported::yes, VoteBehavior::DefaultNo); +REGISTER_FIX (fixInnerObjTemplate2, Supported::yes, VoteBehavior::DefaultNo); +// InvariantsV1_1 will be changes to Supported::yes when all the +// invariants expected to be included under it are complete. +REGISTER_FEATURE(InvariantsV1_1, Supported::no, VoteBehavior::DefaultNo); // The following amendments are obsolete, but must remain supported // because they could potentially get enabled. diff --git a/src/ripple/protocol/impl/Indexes.cpp b/src/libxrpl/protocol/Indexes.cpp similarity index 97% rename from src/ripple/protocol/impl/Indexes.cpp rename to src/libxrpl/protocol/Indexes.cpp index 0ee52aab297..30d97416cfa 100644 --- a/src/ripple/protocol/impl/Indexes.cpp +++ b/src/libxrpl/protocol/Indexes.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/protocol/impl/InnerObjectFormats.cpp b/src/libxrpl/protocol/InnerObjectFormats.cpp similarity index 97% rename from src/ripple/protocol/impl/InnerObjectFormats.cpp rename to src/libxrpl/protocol/InnerObjectFormats.cpp index edebc57477e..6d7b855d199 100644 --- a/src/ripple/protocol/impl/InnerObjectFormats.cpp +++ b/src/libxrpl/protocol/InnerObjectFormats.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include -#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/protocol/impl/Issue.cpp b/src/libxrpl/protocol/Issue.cpp similarity index 94% rename from src/ripple/protocol/impl/Issue.cpp rename to src/libxrpl/protocol/Issue.cpp index 623ce24bb15..70d2c013d7b 100644 --- a/src/ripple/protocol/impl/Issue.cpp +++ b/src/libxrpl/protocol/Issue.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/protocol/impl/Keylet.cpp b/src/libxrpl/protocol/Keylet.cpp similarity index 94% rename from src/ripple/protocol/impl/Keylet.cpp rename to src/libxrpl/protocol/Keylet.cpp index 2488e8b45b6..23847811d3b 100644 --- a/src/ripple/protocol/impl/Keylet.cpp +++ b/src/libxrpl/protocol/Keylet.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include namespace ripple { diff --git a/src/ripple/protocol/impl/LedgerFormats.cpp b/src/libxrpl/protocol/LedgerFormats.cpp similarity index 99% rename from src/ripple/protocol/impl/LedgerFormats.cpp rename to src/libxrpl/protocol/LedgerFormats.cpp index 4f117a5d60d..9401c00278b 100644 --- a/src/ripple/protocol/impl/LedgerFormats.cpp +++ b/src/libxrpl/protocol/LedgerFormats.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include #include namespace ripple { diff --git a/src/ripple/protocol/impl/LedgerHeader.cpp b/src/libxrpl/protocol/LedgerHeader.cpp similarity index 98% rename from src/ripple/protocol/impl/LedgerHeader.cpp rename to src/libxrpl/protocol/LedgerHeader.cpp index 6d13db224fd..284c4dc0557 100644 --- a/src/ripple/protocol/impl/LedgerHeader.cpp +++ b/src/libxrpl/protocol/LedgerHeader.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { diff --git a/src/ripple/protocol/impl/NFTSyntheticSerializer.cpp b/src/libxrpl/protocol/NFTSyntheticSerializer.cpp similarity index 89% rename from src/ripple/protocol/impl/NFTSyntheticSerializer.cpp rename to src/libxrpl/protocol/NFTSyntheticSerializer.cpp index e34397ada6a..03c9e79e265 100644 --- a/src/ripple/protocol/impl/NFTSyntheticSerializer.cpp +++ b/src/libxrpl/protocol/NFTSyntheticSerializer.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include -#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/protocol/impl/NFTokenID.cpp b/src/libxrpl/protocol/NFTokenID.cpp similarity index 99% rename from src/ripple/protocol/impl/NFTokenID.cpp rename to src/libxrpl/protocol/NFTokenID.cpp index ea6ab984c19..72fb8b87bbe 100644 --- a/src/ripple/protocol/impl/NFTokenID.cpp +++ b/src/libxrpl/protocol/NFTokenID.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include namespace ripple { diff --git a/src/ripple/protocol/impl/NFTokenOfferID.cpp b/src/libxrpl/protocol/NFTokenOfferID.cpp similarity index 96% rename from src/ripple/protocol/impl/NFTokenOfferID.cpp rename to src/libxrpl/protocol/NFTokenOfferID.cpp index 51408bfb21a..3d761e6b939 100644 --- a/src/ripple/protocol/impl/NFTokenOfferID.cpp +++ b/src/libxrpl/protocol/NFTokenOfferID.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include namespace ripple { diff --git a/src/ripple/protocol/impl/PublicKey.cpp b/src/libxrpl/protocol/PublicKey.cpp similarity index 97% rename from src/ripple/protocol/impl/PublicKey.cpp rename to src/libxrpl/protocol/PublicKey.cpp index 22cb351e61c..fdab288cea0 100644 --- a/src/ripple/protocol/impl/PublicKey.cpp +++ b/src/libxrpl/protocol/PublicKey.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/protocol/impl/Quality.cpp b/src/libxrpl/protocol/Quality.cpp similarity index 99% rename from src/ripple/protocol/impl/Quality.cpp rename to src/libxrpl/protocol/Quality.cpp index 2cb60f738d8..38b641328b0 100644 --- a/src/ripple/protocol/impl/Quality.cpp +++ b/src/libxrpl/protocol/Quality.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include #include diff --git a/src/ripple/protocol/impl/QualityFunction.cpp b/src/libxrpl/protocol/QualityFunction.cpp similarity index 95% rename from src/ripple/protocol/impl/QualityFunction.cpp rename to src/libxrpl/protocol/QualityFunction.cpp index 29270928480..64e5a36989c 100644 --- a/src/ripple/protocol/impl/QualityFunction.cpp +++ b/src/libxrpl/protocol/QualityFunction.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include +#include -#include +#include namespace ripple { diff --git a/src/ripple/protocol/impl/RPCErr.cpp b/src/libxrpl/protocol/RPCErr.cpp similarity index 94% rename from src/ripple/protocol/impl/RPCErr.cpp rename to src/libxrpl/protocol/RPCErr.cpp index ec0474fe8b0..e9ca3c3c1e6 100644 --- a/src/ripple/protocol/impl/RPCErr.cpp +++ b/src/libxrpl/protocol/RPCErr.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include namespace ripple { diff --git a/src/ripple/protocol/impl/Rate2.cpp b/src/libxrpl/protocol/Rate2.cpp similarity index 97% rename from src/ripple/protocol/impl/Rate2.cpp rename to src/libxrpl/protocol/Rate2.cpp index 340b6719bca..d85a49a5958 100644 --- a/src/ripple/protocol/impl/Rate2.cpp +++ b/src/libxrpl/protocol/Rate2.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include namespace ripple { diff --git a/src/ripple/protocol/impl/Rules.cpp b/src/libxrpl/protocol/Rules.cpp similarity index 97% rename from src/ripple/protocol/impl/Rules.cpp rename to src/libxrpl/protocol/Rules.cpp index e65a9678f65..f47e966e138 100644 --- a/src/ripple/protocol/impl/Rules.cpp +++ b/src/libxrpl/protocol/Rules.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include -#include +#include +#include +#include #include diff --git a/src/ripple/protocol/impl/SField.cpp b/src/libxrpl/protocol/SField.cpp similarity index 99% rename from src/ripple/protocol/impl/SField.cpp rename to src/libxrpl/protocol/SField.cpp index 6d034db75ef..d56f3983352 100644 --- a/src/ripple/protocol/impl/SField.cpp +++ b/src/libxrpl/protocol/SField.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include #include #include diff --git a/src/ripple/protocol/impl/SOTemplate.cpp b/src/libxrpl/protocol/SOTemplate.cpp similarity index 98% rename from src/ripple/protocol/impl/SOTemplate.cpp rename to src/libxrpl/protocol/SOTemplate.cpp index 8457b759126..d75261c0a64 100644 --- a/src/ripple/protocol/impl/SOTemplate.cpp +++ b/src/libxrpl/protocol/SOTemplate.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { diff --git a/src/ripple/protocol/impl/STAccount.cpp b/src/libxrpl/protocol/STAccount.cpp similarity index 98% rename from src/ripple/protocol/impl/STAccount.cpp rename to src/libxrpl/protocol/STAccount.cpp index 5881ae5b264..8ae43f76863 100644 --- a/src/ripple/protocol/impl/STAccount.cpp +++ b/src/libxrpl/protocol/STAccount.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include diff --git a/src/ripple/protocol/impl/STAmount.cpp b/src/libxrpl/protocol/STAmount.cpp similarity index 99% rename from src/ripple/protocol/impl/STAmount.cpp rename to src/libxrpl/protocol/STAmount.cpp index a02dc9e89e1..236603d6cb8 100644 --- a/src/ripple/protocol/impl/STAmount.cpp +++ b/src/libxrpl/protocol/STAmount.cpp @@ -17,14 +17,14 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/protocol/impl/STArray.cpp b/src/libxrpl/protocol/STArray.cpp similarity index 96% rename from src/ripple/protocol/impl/STArray.cpp rename to src/libxrpl/protocol/STArray.cpp index 7ee3da1ff1a..0dea9c7665e 100644 --- a/src/ripple/protocol/impl/STArray.cpp +++ b/src/libxrpl/protocol/STArray.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include -#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/protocol/impl/STBase.cpp b/src/libxrpl/protocol/STBase.cpp similarity index 98% rename from src/ripple/protocol/impl/STBase.cpp rename to src/libxrpl/protocol/STBase.cpp index b49b65bf25d..b7e9c94ca24 100644 --- a/src/ripple/protocol/impl/STBase.cpp +++ b/src/libxrpl/protocol/STBase.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include #include #include diff --git a/src/ripple/protocol/impl/STBlob.cpp b/src/libxrpl/protocol/STBlob.cpp similarity index 96% rename from src/ripple/protocol/impl/STBlob.cpp rename to src/libxrpl/protocol/STBlob.cpp index 871c535e9dd..63e7b4bf3da 100644 --- a/src/ripple/protocol/impl/STBlob.cpp +++ b/src/libxrpl/protocol/STBlob.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include namespace ripple { diff --git a/src/ripple/protocol/impl/STCurrency.cpp b/src/libxrpl/protocol/STCurrency.cpp similarity index 96% rename from src/ripple/protocol/impl/STCurrency.cpp rename to src/libxrpl/protocol/STCurrency.cpp index d2bc1b3bea7..c8fc650135a 100644 --- a/src/ripple/protocol/impl/STCurrency.cpp +++ b/src/libxrpl/protocol/STCurrency.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include +#include +#include -#include +#include namespace ripple { diff --git a/src/ripple/protocol/impl/STInteger.cpp b/src/libxrpl/protocol/STInteger.cpp similarity index 93% rename from src/ripple/protocol/impl/STInteger.cpp rename to src/libxrpl/protocol/STInteger.cpp index 2b154e369e4..7b7420006f9 100644 --- a/src/ripple/protocol/impl/STInteger.cpp +++ b/src/libxrpl/protocol/STInteger.cpp @@ -17,14 +17,14 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/protocol/impl/STIssue.cpp b/src/libxrpl/protocol/STIssue.cpp similarity index 93% rename from src/ripple/protocol/impl/STIssue.cpp rename to src/libxrpl/protocol/STIssue.cpp index 356af438659..9dcee6498ab 100644 --- a/src/ripple/protocol/impl/STIssue.cpp +++ b/src/libxrpl/protocol/STIssue.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/protocol/impl/STLedgerEntry.cpp b/src/libxrpl/protocol/STLedgerEntry.cpp similarity index 93% rename from src/ripple/protocol/impl/STLedgerEntry.cpp rename to src/libxrpl/protocol/STLedgerEntry.cpp index 10ec5627aa3..68d1455cb1d 100644 --- a/src/ripple/protocol/impl/STLedgerEntry.cpp +++ b/src/libxrpl/protocol/STLedgerEntry.cpp @@ -17,16 +17,16 @@ */ //============================================================================== -#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/protocol/impl/STObject.cpp b/src/libxrpl/protocol/STObject.cpp similarity index 95% rename from src/ripple/protocol/impl/STObject.cpp rename to src/libxrpl/protocol/STObject.cpp index dbcb47e8794..bde83ec31a1 100644 --- a/src/ripple/protocol/impl/STObject.cpp +++ b/src/libxrpl/protocol/STObject.cpp @@ -17,15 +17,15 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { @@ -61,10 +61,19 @@ STObject::STObject(SerialIter& sit, SField const& name, int depth) noexcept( } STObject -STObject::makeInnerObject(SField const& name, Rules const& rules) +STObject::makeInnerObject(SField const& name) { STObject obj{name}; - if (rules.enabled(fixInnerObjTemplate)) + + // The if is complicated because inner object templates were added in + // two phases: + // 1. If there are no available Rules, then always apply the template. + // 2. fixInnerObjTemplate added templates to two AMM inner objects. + // 3. fixInnerObjTemplate2 added templates to all remaining inner objects. + std::optional const& rules = getCurrentTransactionRules(); + bool const isAMMObj = name == sfAuctionSlot || name == sfVoteEntry; + if (!rules || (rules->enabled(fixInnerObjTemplate) && isAMMObj) || + (rules->enabled(fixInnerObjTemplate2) && !isAMMObj)) { if (SOTemplate const* elements = InnerObjectFormats::getInstance().findSOTemplateBySField(name)) diff --git a/src/ripple/protocol/impl/STParsedJSON.cpp b/src/libxrpl/protocol/STParsedJSON.cpp similarity index 97% rename from src/ripple/protocol/impl/STParsedJSON.cpp rename to src/libxrpl/protocol/STParsedJSON.cpp index 6727fe7388c..dec5e87eaee 100644 --- a/src/ripple/protocol/impl/STParsedJSON.cpp +++ b/src/libxrpl/protocol/STParsedJSON.cpp @@ -17,29 +17,29 @@ */ //============================================================================== -#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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/protocol/impl/STPathSet.cpp b/src/libxrpl/protocol/STPathSet.cpp similarity index 96% rename from src/ripple/protocol/impl/STPathSet.cpp rename to src/libxrpl/protocol/STPathSet.cpp index cc1e367ba45..b658465272e 100644 --- a/src/ripple/protocol/impl/STPathSet.cpp +++ b/src/libxrpl/protocol/STPathSet.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/protocol/impl/STTx.cpp b/src/libxrpl/protocol/STTx.cpp similarity index 96% rename from src/ripple/protocol/impl/STTx.cpp rename to src/libxrpl/protocol/STTx.cpp index 51fb11ad761..149186d43ce 100644 --- a/src/ripple/protocol/impl/STTx.cpp +++ b/src/libxrpl/protocol/STTx.cpp @@ -17,22 +17,22 @@ */ //============================================================================== -#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 +#include +#include #include #include diff --git a/src/ripple/protocol/impl/STValidation.cpp b/src/libxrpl/protocol/STValidation.cpp similarity index 95% rename from src/ripple/protocol/impl/STValidation.cpp rename to src/libxrpl/protocol/STValidation.cpp index e62a81733bd..ca5ceb0d9ce 100644 --- a/src/ripple/protocol/impl/STValidation.cpp +++ b/src/libxrpl/protocol/STValidation.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/protocol/impl/STVar.cpp b/src/libxrpl/protocol/STVar.cpp similarity index 90% rename from src/ripple/protocol/impl/STVar.cpp rename to src/libxrpl/protocol/STVar.cpp index adda165901f..c8466259f32 100644 --- a/src/ripple/protocol/impl/STVar.cpp +++ b/src/libxrpl/protocol/STVar.cpp @@ -17,23 +17,23 @@ */ //============================================================================== -#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 +#include +#include namespace ripple { namespace detail { diff --git a/src/ripple/protocol/impl/STVector256.cpp b/src/libxrpl/protocol/STVector256.cpp similarity index 94% rename from src/ripple/protocol/impl/STVector256.cpp rename to src/libxrpl/protocol/STVector256.cpp index 0ef1295b16a..2d8bc4ee225 100644 --- a/src/ripple/protocol/impl/STVector256.cpp +++ b/src/libxrpl/protocol/STVector256.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include -#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/protocol/impl/STXChainBridge.cpp b/src/libxrpl/protocol/STXChainBridge.cpp similarity index 93% rename from src/ripple/protocol/impl/STXChainBridge.cpp rename to src/libxrpl/protocol/STXChainBridge.cpp index 8ff19ca7e3b..2347e63379a 100644 --- a/src/ripple/protocol/impl/STXChainBridge.cpp +++ b/src/libxrpl/protocol/STXChainBridge.cpp @@ -17,19 +17,19 @@ */ //============================================================================== -#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/protocol/impl/SecretKey.cpp b/src/libxrpl/protocol/SecretKey.cpp similarity index 97% rename from src/ripple/protocol/impl/SecretKey.cpp rename to src/libxrpl/protocol/SecretKey.cpp index e83068610c9..474c37ac802 100644 --- a/src/ripple/protocol/impl/SecretKey.cpp +++ b/src/libxrpl/protocol/SecretKey.cpp @@ -17,14 +17,14 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/protocol/impl/Seed.cpp b/src/libxrpl/protocol/Seed.cpp similarity index 89% rename from src/ripple/protocol/impl/Seed.cpp rename to src/libxrpl/protocol/Seed.cpp index 49da20a429d..453b4593bfb 100644 --- a/src/ripple/protocol/impl/Seed.cpp +++ b/src/libxrpl/protocol/Seed.cpp @@ -17,17 +17,17 @@ */ //============================================================================== -#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/protocol/impl/Serializer.cpp b/src/libxrpl/protocol/Serializer.cpp similarity index 98% rename from src/ripple/protocol/impl/Serializer.cpp rename to src/libxrpl/protocol/Serializer.cpp index 42f79cfc518..b99375f80dd 100644 --- a/src/ripple/protocol/impl/Serializer.cpp +++ b/src/libxrpl/protocol/Serializer.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include -#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/protocol/impl/Sign.cpp b/src/libxrpl/protocol/Sign.cpp similarity index 99% rename from src/ripple/protocol/impl/Sign.cpp rename to src/libxrpl/protocol/Sign.cpp index b6313827f91..32645c3762c 100644 --- a/src/ripple/protocol/impl/Sign.cpp +++ b/src/libxrpl/protocol/Sign.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { diff --git a/src/ripple/protocol/impl/TER.cpp b/src/libxrpl/protocol/TER.cpp similarity index 99% rename from src/ripple/protocol/impl/TER.cpp rename to src/libxrpl/protocol/TER.cpp index 93bc60a98ba..f452b05464e 100644 --- a/src/ripple/protocol/impl/TER.cpp +++ b/src/libxrpl/protocol/TER.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include #include diff --git a/src/ripple/protocol/impl/TxFormats.cpp b/src/libxrpl/protocol/TxFormats.cpp similarity index 98% rename from src/ripple/protocol/impl/TxFormats.cpp rename to src/libxrpl/protocol/TxFormats.cpp index 324c0e30790..71c333dc497 100644 --- a/src/ripple/protocol/impl/TxFormats.cpp +++ b/src/libxrpl/protocol/TxFormats.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include +#include -#include -#include -#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/protocol/impl/TxMeta.cpp b/src/libxrpl/protocol/TxMeta.cpp similarity index 97% rename from src/ripple/protocol/impl/TxMeta.cpp rename to src/libxrpl/protocol/TxMeta.cpp index 20fa61de2a8..253d00e8414 100644 --- a/src/ripple/protocol/impl/TxMeta.cpp +++ b/src/libxrpl/protocol/TxMeta.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/protocol/impl/UintTypes.cpp b/src/libxrpl/protocol/UintTypes.cpp similarity index 95% rename from src/ripple/protocol/impl/UintTypes.cpp rename to src/libxrpl/protocol/UintTypes.cpp index 821e81238b0..c57bcc153a3 100644 --- a/src/ripple/protocol/impl/UintTypes.cpp +++ b/src/libxrpl/protocol/UintTypes.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include -#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/protocol/impl/XChainAttestations.cpp b/src/libxrpl/protocol/XChainAttestations.cpp similarity index 95% rename from src/ripple/protocol/impl/XChainAttestations.cpp rename to src/libxrpl/protocol/XChainAttestations.cpp index 591b20ad5a0..82e73445693 100644 --- a/src/ripple/protocol/impl/XChainAttestations.cpp +++ b/src/libxrpl/protocol/XChainAttestations.cpp @@ -17,23 +17,23 @@ */ //============================================================================== -#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 +#include +#include #include #include @@ -203,7 +203,8 @@ AttestationClaim::AttestationClaim(Json::Value const& v) STObject AttestationClaim::toSTObject() const { - STObject o{sfXChainClaimAttestationCollectionElement}; + STObject o = + STObject::makeInnerObject(sfXChainClaimAttestationCollectionElement); addHelper(o); o[sfXChainClaimID] = claimID; if (dst) @@ -345,7 +346,8 @@ AttestationCreateAccount::AttestationCreateAccount( STObject AttestationCreateAccount::toSTObject() const { - STObject o{sfXChainCreateAccountAttestationCollectionElement}; + STObject o = STObject::makeInnerObject( + sfXChainCreateAccountAttestationCollectionElement); addHelper(o); o[sfXChainAccountCreateCount] = createCount; @@ -497,7 +499,7 @@ XChainClaimAttestation::XChainClaimAttestation( STObject XChainClaimAttestation::toSTObject() const { - STObject o{sfXChainClaimProofSig}; + STObject o = STObject::makeInnerObject(sfXChainClaimProofSig); o[sfAttestationSignerAccount] = STAccount{sfAttestationSignerAccount, keyAccount}; o[sfPublicKey] = publicKey; @@ -609,7 +611,7 @@ XChainCreateAccountAttestation::XChainCreateAccountAttestation( STObject XChainCreateAccountAttestation::toSTObject() const { - STObject o{sfXChainCreateAccountProofSig}; + STObject o = STObject::makeInnerObject(sfXChainCreateAccountProofSig); o[sfAttestationSignerAccount] = STAccount{sfAttestationSignerAccount, keyAccount}; diff --git a/src/ripple/protocol/impl/digest.cpp b/src/libxrpl/protocol/digest.cpp similarity index 98% rename from src/ripple/protocol/impl/digest.cpp rename to src/libxrpl/protocol/digest.cpp index 444a71fb863..237e7aa49f0 100644 --- a/src/ripple/protocol/impl/digest.cpp +++ b/src/libxrpl/protocol/digest.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include #include #include diff --git a/src/ripple/protocol/impl/tokens.cpp b/src/libxrpl/protocol/tokens.cpp similarity index 99% rename from src/ripple/protocol/impl/tokens.cpp rename to src/libxrpl/protocol/tokens.cpp index 8445eec38ca..bec16945654 100644 --- a/src/ripple/protocol/impl/tokens.cpp +++ b/src/libxrpl/protocol/tokens.cpp @@ -25,11 +25,11 @@ * file COPYING or http://www.opensource.org/licenses/mit-license.php. */ -#include +#include -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/ripple/resource/impl/Charge.cpp b/src/libxrpl/resource/Charge.cpp similarity index 98% rename from src/ripple/resource/impl/Charge.cpp rename to src/libxrpl/resource/Charge.cpp index 21cf2af3ef6..deec6b34eb6 100644 --- a/src/ripple/resource/impl/Charge.cpp +++ b/src/libxrpl/resource/Charge.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include namespace ripple { diff --git a/src/ripple/resource/impl/Consumer.cpp b/src/libxrpl/resource/Consumer.cpp similarity index 96% rename from src/ripple/resource/impl/Consumer.cpp rename to src/libxrpl/resource/Consumer.cpp index 34edbbfcc71..b8652546841 100644 --- a/src/ripple/resource/impl/Consumer.cpp +++ b/src/libxrpl/resource/Consumer.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include -#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/resource/impl/Fees.cpp b/src/libxrpl/resource/Fees.cpp similarity index 98% rename from src/ripple/resource/impl/Fees.cpp rename to src/libxrpl/resource/Fees.cpp index 0752e49ca48..13ae38bc6ad 100644 --- a/src/ripple/resource/impl/Fees.cpp +++ b/src/libxrpl/resource/Fees.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { namespace Resource { diff --git a/src/ripple/resource/impl/ResourceManager.cpp b/src/libxrpl/resource/ResourceManager.cpp similarity index 95% rename from src/ripple/resource/impl/ResourceManager.cpp rename to src/libxrpl/resource/ResourceManager.cpp index ae4eaac23fd..d73ca090024 100644 --- a/src/ripple/resource/impl/ResourceManager.cpp +++ b/src/libxrpl/resource/ResourceManager.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/server/impl/JSONRPCUtil.cpp b/src/libxrpl/server/JSONRPCUtil.cpp similarity index 95% rename from src/ripple/server/impl/JSONRPCUtil.cpp rename to src/libxrpl/server/JSONRPCUtil.cpp index 12d12829ca9..ce173b1e9eb 100644 --- a/src/ripple/server/impl/JSONRPCUtil.cpp +++ b/src/libxrpl/server/JSONRPCUtil.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/server/impl/Port.cpp b/src/libxrpl/server/Port.cpp similarity index 98% rename from src/ripple/server/impl/Port.cpp rename to src/libxrpl/server/Port.cpp index 1b869f6a5da..0554c8082a0 100644 --- a/src/ripple/server/impl/Port.cpp +++ b/src/libxrpl/server/Port.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/src/test/app/AMMCalc_test.cpp b/src/test/app/AMMCalc_test.cpp index e230ed4d3c5..058cdfd1d2d 100644 --- a/src/test/app/AMMCalc_test.cpp +++ b/src/test/app/AMMCalc_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include #include +#include +#include #include diff --git a/src/test/app/AMMExtended_test.cpp b/src/test/app/AMMExtended_test.cpp index 27fb2ce14f5..96053b93b44 100644 --- a/src/test/app/AMMExtended_test.cpp +++ b/src/test/app/AMMExtended_test.cpp @@ -16,25 +16,25 @@ 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 +#include +#include +#include +#include +#include #include #include diff --git a/src/test/app/AMM_test.cpp b/src/test/app/AMM_test.cpp index a3c4ae9800c..ceddc019504 100644 --- a/src/test/app/AMM_test.cpp +++ b/src/test/app/AMM_test.cpp @@ -16,23 +16,23 @@ 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 +#include +#include #include #include diff --git a/src/test/app/AccountDelete_test.cpp b/src/test/app/AccountDelete_test.cpp index fbd631f444a..5fbb0ba38b1 100644 --- a/src/test/app/AccountDelete_test.cpp +++ b/src/test/app/AccountDelete_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include #include +#include +#include namespace ripple { namespace test { diff --git a/src/test/app/AccountTxPaging_test.cpp b/src/test/app/AccountTxPaging_test.cpp index d3969e279b7..680e006a74f 100644 --- a/src/test/app/AccountTxPaging_test.cpp +++ b/src/test/app/AccountTxPaging_test.cpp @@ -16,15 +16,15 @@ 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 namespace ripple { diff --git a/src/test/app/AmendmentTable_test.cpp b/src/test/app/AmendmentTable_test.cpp index 238e05ba523..2f95fc0280b 100644 --- a/src/test/app/AmendmentTable_test.cpp +++ b/src/test/app/AmendmentTable_test.cpp @@ -17,21 +17,21 @@ */ //============================================================================== -#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 namespace ripple { diff --git a/src/test/app/Check_test.cpp b/src/test/app/Check_test.cpp index 8f0c0ec46b8..31b45abf43a 100644 --- a/src/test/app/Check_test.cpp +++ b/src/test/app/Check_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include #include +#include +#include namespace ripple { namespace test { diff --git a/src/test/app/Clawback_test.cpp b/src/test/app/Clawback_test.cpp index 630e4836d8e..a6909bb2f62 100644 --- a/src/test/app/Clawback_test.cpp +++ b/src/test/app/Clawback_test.cpp @@ -17,14 +17,14 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include #include #include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/test/app/CrossingLimits_test.cpp b/src/test/app/CrossingLimits_test.cpp index 09cca1e82af..6f6a7eb3e7f 100644 --- a/src/test/app/CrossingLimits_test.cpp +++ b/src/test/app/CrossingLimits_test.cpp @@ -15,9 +15,9 @@ */ //============================================================================== -#include -#include #include +#include +#include namespace ripple { namespace test { diff --git a/src/test/app/DID_test.cpp b/src/test/app/DID_test.cpp index 82e77a20264..20734518887 100644 --- a/src/test/app/DID_test.cpp +++ b/src/test/app/DID_test.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include #include #include diff --git a/src/test/app/DNS_test.cpp b/src/test/app/DNS_test.cpp index 6ae4bc8d64a..7a39c5f0790 100644 --- a/src/test/app/DNS_test.cpp +++ b/src/test/app/DNS_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include #include +#include +#include #include #include diff --git a/src/test/app/DeliverMin_test.cpp b/src/test/app/DeliverMin_test.cpp index 316d95ba740..3c62a47a4a4 100644 --- a/src/test/app/DeliverMin_test.cpp +++ b/src/test/app/DeliverMin_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include #include +#include +#include namespace ripple { namespace test { diff --git a/src/test/app/DepositAuth_test.cpp b/src/test/app/DepositAuth_test.cpp index f10633c5e46..9a11785b38c 100644 --- a/src/test/app/DepositAuth_test.cpp +++ b/src/test/app/DepositAuth_test.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/app/Discrepancy_test.cpp b/src/test/app/Discrepancy_test.cpp index c89432f9115..1eaa1ad86dd 100644 --- a/src/test/app/Discrepancy_test.cpp +++ b/src/test/app/Discrepancy_test.cpp @@ -17,14 +17,14 @@ */ //============================================================================== -#include -#include -#include -#include -#include #include #include #include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/test/app/Escrow_test.cpp b/src/test/app/Escrow_test.cpp index 083764fd371..0f465a14f4d 100644 --- a/src/test/app/Escrow_test.cpp +++ b/src/test/app/Escrow_test.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/test/app/FeeVote_test.cpp b/src/test/app/FeeVote_test.cpp index ad38aefb20a..289ce2a713e 100644 --- a/src/test/app/FeeVote_test.cpp +++ b/src/test/app/FeeVote_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include #include +#include +#include namespace ripple { namespace test { diff --git a/src/test/app/Flow_test.cpp b/src/test/app/Flow_test.cpp index bb7b96f1072..9d1257d16bf 100644 --- a/src/test/app/Flow_test.cpp +++ b/src/test/app/Flow_test.cpp @@ -17,17 +17,17 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/app/Freeze_test.cpp b/src/test/app/Freeze_test.cpp index cb4653c086d..0c54f0e1f39 100644 --- a/src/test/app/Freeze_test.cpp +++ b/src/test/app/Freeze_test.cpp @@ -16,12 +16,12 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ //============================================================================== -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/test/app/HashRouter_test.cpp b/src/test/app/HashRouter_test.cpp index 96d14e824cf..1234bc5b9cb 100644 --- a/src/test/app/HashRouter_test.cpp +++ b/src/test/app/HashRouter_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include -#include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/app/LedgerHistory_test.cpp b/src/test/app/LedgerHistory_test.cpp index 880cbea5980..e1a837a9cb2 100644 --- a/src/test/app/LedgerHistory_test.cpp +++ b/src/test/app/LedgerHistory_test.cpp @@ -17,17 +17,17 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include -#include -#include namespace ripple { namespace test { diff --git a/src/test/app/LedgerLoad_test.cpp b/src/test/app/LedgerLoad_test.cpp index 599215c2435..5b6df353d81 100644 --- a/src/test/app/LedgerLoad_test.cpp +++ b/src/test/app/LedgerLoad_test.cpp @@ -17,14 +17,14 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include #include #include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/test/app/LedgerMaster_test.cpp b/src/test/app/LedgerMaster_test.cpp index 87639c42fcd..d53d27b3185 100644 --- a/src/test/app/LedgerMaster_test.cpp +++ b/src/test/app/LedgerMaster_test.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include #include #include +#include +#include namespace ripple { namespace test { diff --git a/src/test/app/LedgerReplay_test.cpp b/src/test/app/LedgerReplay_test.cpp index aee24cd7d57..0b555a712cf 100644 --- a/src/test/app/LedgerReplay_test.cpp +++ b/src/test/app/LedgerReplay_test.cpp @@ -17,19 +17,19 @@ */ //============================================================================== -#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/test/app/LoadFeeTrack_test.cpp b/src/test/app/LoadFeeTrack_test.cpp index f8e73cebd16..fa7489bf1bb 100644 --- a/src/test/app/LoadFeeTrack_test.cpp +++ b/src/test/app/LoadFeeTrack_test.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include -#include +#include +#include +#include +#include namespace ripple { diff --git a/src/test/app/Manifest_test.cpp b/src/test/app/Manifest_test.cpp index b72623309e9..bf7b14c0d28 100644 --- a/src/test/app/Manifest_test.cpp +++ b/src/test/app/Manifest_test.cpp @@ -17,20 +17,20 @@ */ //============================================================================== -#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 namespace ripple { namespace test { diff --git a/src/test/app/MultiSign_test.cpp b/src/test/app/MultiSign_test.cpp index 0e151b38d0a..77d85d9011b 100644 --- a/src/test/app/MultiSign_test.cpp +++ b/src/test/app/MultiSign_test.cpp @@ -15,10 +15,10 @@ */ //============================================================================== -#include -#include -#include #include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/app/NFTokenBurn_test.cpp b/src/test/app/NFTokenBurn_test.cpp index abd9ed56e83..8219889b4be 100644 --- a/src/test/app/NFTokenBurn_test.cpp +++ b/src/test/app/NFTokenBurn_test.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include #include +#include +#include +#include #include diff --git a/src/test/app/NFTokenDir_test.cpp b/src/test/app/NFTokenDir_test.cpp index 8e6a9fe5209..23e4c671526 100644 --- a/src/test/app/NFTokenDir_test.cpp +++ b/src/test/app/NFTokenDir_test.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include -#include -#include -#include #include +#include +#include +#include +#include #include diff --git a/src/test/app/NFToken_test.cpp b/src/test/app/NFToken_test.cpp index 69432c85d17..9c0e09d6711 100644 --- a/src/test/app/NFToken_test.cpp +++ b/src/test/app/NFToken_test.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include -#include -#include -#include #include +#include +#include +#include +#include #include diff --git a/src/test/app/NetworkID_test.cpp b/src/test/app/NetworkID_test.cpp index 8d1b891345d..2f02a1fd7d2 100644 --- a/src/test/app/NetworkID_test.cpp +++ b/src/test/app/NetworkID_test.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include -#include -#include #include #include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/app/OfferStream_test.cpp b/src/test/app/OfferStream_test.cpp index ce25481cde8..bf712503687 100644 --- a/src/test/app/OfferStream_test.cpp +++ b/src/test/app/OfferStream_test.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include namespace ripple { diff --git a/src/test/app/Offer_test.cpp b/src/test/app/Offer_test.cpp index 3956adfbe0d..2b4245a1ae4 100644 --- a/src/test/app/Offer_test.cpp +++ b/src/test/app/Offer_test.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include -#include -#include #include #include #include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/app/Oracle_test.cpp b/src/test/app/Oracle_test.cpp index 16a72de70fd..c2f3c271265 100644 --- a/src/test/app/Oracle_test.cpp +++ b/src/test/app/Oracle_test.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/app/OversizeMeta_test.cpp b/src/test/app/OversizeMeta_test.cpp index 554033eb531..0a7f42e1801 100644 --- a/src/test/app/OversizeMeta_test.cpp +++ b/src/test/app/OversizeMeta_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include #include +#include +#include namespace ripple { namespace test { diff --git a/src/test/app/Path_test.cpp b/src/test/app/Path_test.cpp index 0f9916cbcff..1db15388ff0 100644 --- a/src/test/app/Path_test.cpp +++ b/src/test/app/Path_test.cpp @@ -17,25 +17,25 @@ */ //============================================================================== -#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 #include #include #include -#include -#include #include namespace ripple { diff --git a/src/test/app/PayChan_test.cpp b/src/test/app/PayChan_test.cpp index a479e43b170..0dffe5e388f 100644 --- a/src/test/app/PayChan_test.cpp +++ b/src/test/app/PayChan_test.cpp @@ -17,16 +17,16 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/app/PayStrand_test.cpp b/src/test/app/PayStrand_test.cpp index ae17b8e0d43..f00a7361292 100644 --- a/src/test/app/PayStrand_test.cpp +++ b/src/test/app/PayStrand_test.cpp @@ -15,20 +15,20 @@ */ //============================================================================== -#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 namespace ripple { namespace test { diff --git a/src/test/app/PseudoTx_test.cpp b/src/test/app/PseudoTx_test.cpp index 78ca7cc05b1..238041a17bc 100644 --- a/src/test/app/PseudoTx_test.cpp +++ b/src/test/app/PseudoTx_test.cpp @@ -15,11 +15,11 @@ */ //============================================================================== -#include -#include -#include -#include #include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/test/app/RCLCensorshipDetector_test.cpp b/src/test/app/RCLCensorshipDetector_test.cpp index 12bb3bbba3f..b5440b90903 100644 --- a/src/test/app/RCLCensorshipDetector_test.cpp +++ b/src/test/app/RCLCensorshipDetector_test.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include #include #include diff --git a/src/test/app/RCLValidations_test.cpp b/src/test/app/RCLValidations_test.cpp index 0380795a8ae..540d98bc1f1 100644 --- a/src/test/app/RCLValidations_test.cpp +++ b/src/test/app/RCLValidations_test.cpp @@ -17,14 +17,14 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/app/ReducedOffer_test.cpp b/src/test/app/ReducedOffer_test.cpp index 186162d5023..a070051e435 100644 --- a/src/test/app/ReducedOffer_test.cpp +++ b/src/test/app/ReducedOffer_test.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include #include +#include +#include +#include #include diff --git a/src/test/app/Regression_test.cpp b/src/test/app/Regression_test.cpp index f743a30f079..f54a88ace00 100644 --- a/src/test/app/Regression_test.cpp +++ b/src/test/app/Regression_test.cpp @@ -15,13 +15,13 @@ */ //============================================================================== -#include -#include -#include -#include -#include #include #include +#include +#include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/app/SHAMapStore_test.cpp b/src/test/app/SHAMapStore_test.cpp index 8a47b186957..376cb4eb7ba 100644 --- a/src/test/app/SHAMapStore_test.cpp +++ b/src/test/app/SHAMapStore_test.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include -#include -#include -#include -#include #include #include +#include +#include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/app/SetAuth_test.cpp b/src/test/app/SetAuth_test.cpp index 8066ef0dacf..adb909314d3 100644 --- a/src/test/app/SetAuth_test.cpp +++ b/src/test/app/SetAuth_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include #include +#include +#include namespace ripple { namespace test { diff --git a/src/test/app/SetRegularKey_test.cpp b/src/test/app/SetRegularKey_test.cpp index 799b7797b85..024d8de137b 100644 --- a/src/test/app/SetRegularKey_test.cpp +++ b/src/test/app/SetRegularKey_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include #include +#include +#include namespace ripple { diff --git a/src/test/app/SetTrust_test.cpp b/src/test/app/SetTrust_test.cpp index cab0132ae1c..57e18d712f8 100644 --- a/src/test/app/SetTrust_test.cpp +++ b/src/test/app/SetTrust_test.cpp @@ -16,9 +16,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ //============================================================================== -#include -#include #include +#include +#include namespace ripple { diff --git a/src/test/app/Taker_test.cpp b/src/test/app/Taker_test.cpp index 0b69b25f24b..89e44b2b98b 100644 --- a/src/test/app/Taker_test.cpp +++ b/src/test/app/Taker_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include -#include +#include +#include +#include #include namespace ripple { diff --git a/src/test/app/TheoreticalQuality_test.cpp b/src/test/app/TheoreticalQuality_test.cpp index ae537a45657..917d23377bf 100644 --- a/src/test/app/TheoreticalQuality_test.cpp +++ b/src/test/app/TheoreticalQuality_test.cpp @@ -17,20 +17,20 @@ */ //============================================================================== -#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 namespace ripple { namespace test { diff --git a/src/test/app/Ticket_test.cpp b/src/test/app/Ticket_test.cpp index b50059711ec..9467390502c 100644 --- a/src/test/app/Ticket_test.cpp +++ b/src/test/app/Ticket_test.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include #include +#include +#include +#include namespace ripple { diff --git a/src/test/app/Transaction_ordering_test.cpp b/src/test/app/Transaction_ordering_test.cpp index 0353df90663..928fcdb8389 100644 --- a/src/test/app/Transaction_ordering_test.cpp +++ b/src/test/app/Transaction_ordering_test.cpp @@ -15,9 +15,9 @@ */ //============================================================================== -#include -#include #include +#include +#include namespace ripple { namespace test { diff --git a/src/test/app/TrustAndBalance_test.cpp b/src/test/app/TrustAndBalance_test.cpp index 5b0c1d6480e..bf7c8629b69 100644 --- a/src/test/app/TrustAndBalance_test.cpp +++ b/src/test/app/TrustAndBalance_test.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include -#include -#include -#include #include #include +#include +#include +#include +#include namespace ripple { diff --git a/src/test/app/TxQ_test.cpp b/src/test/app/TxQ_test.cpp index 086bb787d68..e7b70203c91 100644 --- a/src/test/app/TxQ_test.cpp +++ b/src/test/app/TxQ_test.cpp @@ -17,19 +17,19 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/test/app/ValidatorKeys_test.cpp b/src/test/app/ValidatorKeys_test.cpp index 99bd6188261..9281ec4bd77 100644 --- a/src/test/app/ValidatorKeys_test.cpp +++ b/src/test/app/ValidatorKeys_test.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include #include diff --git a/src/test/app/ValidatorList_test.cpp b/src/test/app/ValidatorList_test.cpp index 638c2060d32..05989c0f601 100644 --- a/src/test/app/ValidatorList_test.cpp +++ b/src/test/app/ValidatorList_test.cpp @@ -17,19 +17,19 @@ */ //============================================================================== -#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/test/app/ValidatorSite_test.cpp b/src/test/app/ValidatorSite_test.cpp index 00512d157ec..4bc7f2f270d 100644 --- a/src/test/app/ValidatorSite_test.cpp +++ b/src/test/app/ValidatorSite_test.cpp @@ -17,25 +17,25 @@ */ //============================================================================== -#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 -#include -#include namespace ripple { namespace test { diff --git a/src/test/app/XChain_test.cpp b/src/test/app/XChain_test.cpp index a0837782a9c..4f24d17601e 100644 --- a/src/test/app/XChain_test.cpp +++ b/src/test/app/XChain_test.cpp @@ -17,15 +17,15 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/test/app/tx/apply_test.cpp b/src/test/app/tx/apply_test.cpp index 61a512805a4..df76e839a71 100644 --- a/src/test/app/tx/apply_test.cpp +++ b/src/test/app/tx/apply_test.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include #include +#include +#include +#include namespace ripple { diff --git a/src/test/basics/Buffer_test.cpp b/src/test/basics/Buffer_test.cpp index 45d2147a054..da8bcc8f12c 100644 --- a/src/test/basics/Buffer_test.cpp +++ b/src/test/basics/Buffer_test.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include #include #include diff --git a/src/test/basics/DetectCrash_test.cpp b/src/test/basics/DetectCrash_test.cpp index 70f0bdb83be..1ae761f34a4 100644 --- a/src/test/basics/DetectCrash_test.cpp +++ b/src/test/basics/DetectCrash_test.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include diff --git a/src/test/basics/Expected_test.cpp b/src/test/basics/Expected_test.cpp index b89b9f6d309..d60809aee1f 100644 --- a/src/test/basics/Expected_test.cpp +++ b/src/test/basics/Expected_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include -#include +#include +#include +#include #if BOOST_VERSION >= 107500 #include // Not part of boost before version 1.75 #endif // BOOST_VERSION diff --git a/src/test/basics/FeeUnits_test.cpp b/src/test/basics/FeeUnits_test.cpp index 3ded5812947..6608a072621 100644 --- a/src/test/basics/FeeUnits_test.cpp +++ b/src/test/basics/FeeUnits_test.cpp @@ -16,9 +16,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include -#include -#include +#include +#include +#include #include namespace ripple { diff --git a/src/test/basics/FileUtilities_test.cpp b/src/test/basics/FileUtilities_test.cpp index 2a9710f8e95..2b84998da7c 100644 --- a/src/test/basics/FileUtilities_test.cpp +++ b/src/test/basics/FileUtilities_test.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include #include +#include +#include +#include namespace ripple { diff --git a/src/test/basics/IOUAmount_test.cpp b/src/test/basics/IOUAmount_test.cpp index a5f7d0456ad..6e7c662635f 100644 --- a/src/test/basics/IOUAmount_test.cpp +++ b/src/test/basics/IOUAmount_test.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include namespace ripple { diff --git a/src/test/basics/KeyCache_test.cpp b/src/test/basics/KeyCache_test.cpp index 7f3f13e272d..eab0e87d0a7 100644 --- a/src/test/basics/KeyCache_test.cpp +++ b/src/test/basics/KeyCache_test.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/test/basics/Number_test.cpp b/src/test/basics/Number_test.cpp index 8c12ff7c5e4..cf626354e0f 100644 --- a/src/test/basics/Number_test.cpp +++ b/src/test/basics/Number_test.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/test/basics/PerfLog_test.cpp b/src/test/basics/PerfLog_test.cpp index f0a6645195b..756988cbdac 100644 --- a/src/test/basics/PerfLog_test.cpp +++ b/src/test/basics/PerfLog_test.cpp @@ -17,15 +17,15 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include #include #include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/test/basics/RangeSet_test.cpp b/src/test/basics/RangeSet_test.cpp index ccf76fad0d4..e0136ab8907 100644 --- a/src/test/basics/RangeSet_test.cpp +++ b/src/test/basics/RangeSet_test.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include namespace ripple { class RangeSet_test : public beast::unit_test::suite diff --git a/src/test/basics/Slice_test.cpp b/src/test/basics/Slice_test.cpp index fb88315bd98..a169de98539 100644 --- a/src/test/basics/Slice_test.cpp +++ b/src/test/basics/Slice_test.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include #include #include diff --git a/src/test/basics/StringUtilities_test.cpp b/src/test/basics/StringUtilities_test.cpp index 6146a3dcd41..cf916c62651 100644 --- a/src/test/basics/StringUtilities_test.cpp +++ b/src/test/basics/StringUtilities_test.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include -#include +#include +#include +#include +#include namespace ripple { diff --git a/src/test/basics/TaggedCache_test.cpp b/src/test/basics/TaggedCache_test.cpp index 6a5b4429996..6fbba1a4795 100644 --- a/src/test/basics/TaggedCache_test.cpp +++ b/src/test/basics/TaggedCache_test.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/test/basics/XRPAmount_test.cpp b/src/test/basics/XRPAmount_test.cpp index 37c827180de..c4c96dbfbde 100644 --- a/src/test/basics/XRPAmount_test.cpp +++ b/src/test/basics/XRPAmount_test.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include namespace ripple { diff --git a/src/test/basics/base58_test.cpp b/src/test/basics/base58_test.cpp index 6f3d495d7a9..f204cdd0e3a 100644 --- a/src/test/basics/base58_test.cpp +++ b/src/test/basics/base58_test.cpp @@ -19,9 +19,9 @@ #ifndef _MSC_VER -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/test/basics/base64_test.cpp b/src/test/basics/base64_test.cpp index d9622a8c28a..b6d67c7c069 100644 --- a/src/test/basics/base64_test.cpp +++ b/src/test/basics/base64_test.cpp @@ -26,8 +26,8 @@ // Official repository: https://github.com/boostorg/beast // -#include -#include +#include +#include namespace ripple { diff --git a/src/test/basics/base_uint_test.cpp b/src/test/basics/base_uint_test.cpp index 9b1f7696dd5..43000a1128c 100644 --- a/src/test/basics/base_uint_test.cpp +++ b/src/test/basics/base_uint_test.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/test/basics/contract_test.cpp b/src/test/basics/contract_test.cpp index 58844ba97f8..99f118794ee 100644 --- a/src/test/basics/contract_test.cpp +++ b/src/test/basics/contract_test.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include #include namespace ripple { diff --git a/src/test/basics/hardened_hash_test.cpp b/src/test/basics/hardened_hash_test.cpp index 9296b7faf02..343894e52b0 100644 --- a/src/test/basics/hardened_hash_test.cpp +++ b/src/test/basics/hardened_hash_test.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include #include #include #include diff --git a/src/test/basics/join_test.cpp b/src/test/basics/join_test.cpp index 730fcb69343..1b094828243 100644 --- a/src/test/basics/join_test.cpp +++ b/src/test/basics/join_test.cpp @@ -19,8 +19,8 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include -#include -#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/basics/mulDiv_test.cpp b/src/test/basics/mulDiv_test.cpp index f51b91fecf4..47332fd45ba 100644 --- a/src/test/basics/mulDiv_test.cpp +++ b/src/test/basics/mulDiv_test.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/basics/scope_test.cpp b/src/test/basics/scope_test.cpp index 414e67b5c7e..654f7e0a11b 100644 --- a/src/test/basics/scope_test.cpp +++ b/src/test/basics/scope_test.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/basics/tagged_integer_test.cpp b/src/test/basics/tagged_integer_test.cpp index dd9d9022dde..22cdc5ad53f 100644 --- a/src/test/basics/tagged_integer_test.cpp +++ b/src/test/basics/tagged_integer_test.cpp @@ -18,8 +18,8 @@ */ //============================================================================== -#include -#include +#include +#include #include namespace ripple { diff --git a/src/test/beast/IPEndpointCommon.h b/src/test/beast/IPEndpointCommon.h index bf8e7613fe5..aa2c1e597fb 100644 --- a/src/test/beast/IPEndpointCommon.h +++ b/src/test/beast/IPEndpointCommon.h @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include namespace beast { namespace IP { diff --git a/src/test/beast/IPEndpoint_test.cpp b/src/test/beast/IPEndpoint_test.cpp index 1a29ddefa43..1ad49443dc3 100644 --- a/src/test/beast/IPEndpoint_test.cpp +++ b/src/test/beast/IPEndpoint_test.cpp @@ -20,13 +20,13 @@ // MODULES: ../impl/IPEndpoint.cpp ../impl/IPAddressV4.cpp // ../impl/IPAddressV6.cpp -#include -#include -#include +#include +#include +#include +#include #include #include #include -#include #include namespace beast { diff --git a/src/test/beast/LexicalCast_test.cpp b/src/test/beast/LexicalCast_test.cpp index 680dc6d69ac..22638f27e6e 100644 --- a/src/test/beast/LexicalCast_test.cpp +++ b/src/test/beast/LexicalCast_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include -#include +#include +#include +#include namespace beast { diff --git a/src/test/beast/SemanticVersion_test.cpp b/src/test/beast/SemanticVersion_test.cpp index 5026f0fbae7..2f24a0c8926 100644 --- a/src/test/beast/SemanticVersion_test.cpp +++ b/src/test/beast/SemanticVersion_test.cpp @@ -16,8 +16,8 @@ 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 namespace beast { class SemanticVersion_test : public unit_test::suite diff --git a/src/test/beast/aged_associative_container_test.cpp b/src/test/beast/aged_associative_container_test.cpp index be17240811d..e5736764e06 100644 --- a/src/test/beast/aged_associative_container_test.cpp +++ b/src/test/beast/aged_associative_container_test.cpp @@ -17,17 +17,17 @@ */ //============================================================================== -#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/test/beast/beast_CurrentThreadName_test.cpp b/src/test/beast/beast_CurrentThreadName_test.cpp index 6e46808f4b2..653b0a89618 100644 --- a/src/test/beast/beast_CurrentThreadName_test.cpp +++ b/src/test/beast/beast_CurrentThreadName_test.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include #include #include diff --git a/src/test/beast/beast_Journal_test.cpp b/src/test/beast/beast_Journal_test.cpp index 9d3567c277d..6f1652381a0 100644 --- a/src/test/beast/beast_Journal_test.cpp +++ b/src/test/beast/beast_Journal_test.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include namespace beast { diff --git a/src/test/beast/beast_PropertyStream_test.cpp b/src/test/beast/beast_PropertyStream_test.cpp index 2c4d32ce459..e91f527d3c9 100644 --- a/src/test/beast/beast_PropertyStream_test.cpp +++ b/src/test/beast/beast_PropertyStream_test.cpp @@ -16,8 +16,8 @@ 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 namespace beast { class PropertyStream_test : public unit_test::suite diff --git a/src/test/beast/beast_Zero_test.cpp b/src/test/beast/beast_Zero_test.cpp index 42b07343741..b6071636255 100644 --- a/src/test/beast/beast_Zero_test.cpp +++ b/src/test/beast/beast_Zero_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include +#include -#include +#include namespace beast { diff --git a/src/test/beast/beast_abstract_clock_test.cpp b/src/test/beast/beast_abstract_clock_test.cpp index eba9a3d77b1..a026df26376 100644 --- a/src/test/beast/beast_abstract_clock_test.cpp +++ b/src/test/beast/beast_abstract_clock_test.cpp @@ -19,9 +19,9 @@ // MODULES: ../impl/chrono_io.cpp -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/test/beast/beast_basic_seconds_clock_test.cpp b/src/test/beast/beast_basic_seconds_clock_test.cpp index 5e55aab598b..f3926634dc4 100644 --- a/src/test/beast/beast_basic_seconds_clock_test.cpp +++ b/src/test/beast/beast_basic_seconds_clock_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include +#include -#include +#include namespace beast { diff --git a/src/test/beast/beast_io_latency_probe_test.cpp b/src/test/beast/beast_io_latency_probe_test.cpp index 32206ced7f7..96228194304 100644 --- a/src/test/beast/beast_io_latency_probe_test.cpp +++ b/src/test/beast/beast_io_latency_probe_test.cpp @@ -16,10 +16,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ //============================================================================== -#include -#include +#include +#include -#include +#include #include #include diff --git a/src/test/beast/define_print.cpp b/src/test/beast/define_print.cpp index 3f527907a3f..0d36cd76982 100644 --- a/src/test/beast/define_print.cpp +++ b/src/test/beast/define_print.cpp @@ -5,9 +5,9 @@ // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -#include -#include -#include +#include +#include +#include #include // Include this .cpp in your project to gain access to the printing suite diff --git a/src/test/conditions/PreimageSha256_test.cpp b/src/test/conditions/PreimageSha256_test.cpp index cf4bc8c7c1e..9a6840b11c3 100644 --- a/src/test/conditions/PreimageSha256_test.cpp +++ b/src/test/conditions/PreimageSha256_test.cpp @@ -17,14 +17,14 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/test/consensus/ByzantineFailureSim_test.cpp b/src/test/consensus/ByzantineFailureSim_test.cpp index a907b7c224e..ce59adbe9f0 100644 --- a/src/test/consensus/ByzantineFailureSim_test.cpp +++ b/src/test/consensus/ByzantineFailureSim_test.cpp @@ -16,9 +16,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ //============================================================================== -#include -#include #include +#include +#include #include namespace ripple { diff --git a/src/test/consensus/Consensus_test.cpp b/src/test/consensus/Consensus_test.cpp index 1ef1a718d3c..88280994c10 100644 --- a/src/test/consensus/Consensus_test.cpp +++ b/src/test/consensus/Consensus_test.cpp @@ -16,12 +16,12 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ //============================================================================== -#include -#include -#include -#include #include #include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/test/consensus/DistributedValidatorsSim_test.cpp b/src/test/consensus/DistributedValidatorsSim_test.cpp index ef1ae8b8722..3abac36b4f1 100644 --- a/src/test/consensus/DistributedValidatorsSim_test.cpp +++ b/src/test/consensus/DistributedValidatorsSim_test.cpp @@ -16,9 +16,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ //============================================================================== -#include -#include #include +#include +#include #include #include diff --git a/src/test/consensus/LedgerTiming_test.cpp b/src/test/consensus/LedgerTiming_test.cpp index 98b0548bf11..95e27f5c854 100644 --- a/src/test/consensus/LedgerTiming_test.cpp +++ b/src/test/consensus/LedgerTiming_test.cpp @@ -16,8 +16,8 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ //============================================================================== -#include -#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/consensus/LedgerTrie_test.cpp b/src/test/consensus/LedgerTrie_test.cpp index 3feb3b09959..6f13db43be2 100644 --- a/src/test/consensus/LedgerTrie_test.cpp +++ b/src/test/consensus/LedgerTrie_test.cpp @@ -16,10 +16,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ //============================================================================== -#include -#include -#include #include +#include +#include +#include #include namespace ripple { diff --git a/src/test/consensus/NegativeUNL_test.cpp b/src/test/consensus/NegativeUNL_test.cpp index 8cbb57444bd..200cd166031 100644 --- a/src/test/consensus/NegativeUNL_test.cpp +++ b/src/test/consensus/NegativeUNL_test.cpp @@ -17,15 +17,15 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/consensus/ScaleFreeSim_test.cpp b/src/test/consensus/ScaleFreeSim_test.cpp index 4fe911eacf4..3e3cec97618 100644 --- a/src/test/consensus/ScaleFreeSim_test.cpp +++ b/src/test/consensus/ScaleFreeSim_test.cpp @@ -16,10 +16,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ //============================================================================== -#include -#include #include #include +#include +#include #include namespace ripple { diff --git a/src/test/consensus/Validations_test.cpp b/src/test/consensus/Validations_test.cpp index 7dc2086e55c..0279d6330cc 100644 --- a/src/test/consensus/Validations_test.cpp +++ b/src/test/consensus/Validations_test.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include -#include -#include -#include -#include #include #include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/test/core/ClosureCounter_test.cpp b/src/test/core/ClosureCounter_test.cpp index c4199a0b06e..83d2fdb6e4a 100644 --- a/src/test/core/ClosureCounter_test.cpp +++ b/src/test/core/ClosureCounter_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include #include +#include +#include #include #include diff --git a/src/test/core/Config_test.cpp b/src/test/core/Config_test.cpp index c991f3b11a2..3cf77fba2ef 100644 --- a/src/test/core/Config_test.cpp +++ b/src/test/core/Config_test.cpp @@ -17,16 +17,16 @@ */ //============================================================================== -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include #include -#include -#include namespace ripple { namespace detail { diff --git a/src/test/core/Coroutine_test.cpp b/src/test/core/Coroutine_test.cpp index 6d1e5e33304..0fdc5a4f49a 100644 --- a/src/test/core/Coroutine_test.cpp +++ b/src/test/core/Coroutine_test.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include +#include +#include #include #include #include -#include namespace ripple { namespace test { diff --git a/src/test/core/CryptoPRNG_test.cpp b/src/test/core/CryptoPRNG_test.cpp index 11bf9b7a161..303a2176315 100644 --- a/src/test/core/CryptoPRNG_test.cpp +++ b/src/test/core/CryptoPRNG_test.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include -#include +#include +#include +#include #include #include #include -#include namespace ripple { diff --git a/src/test/core/JobQueue_test.cpp b/src/test/core/JobQueue_test.cpp index cba0217675c..42338063db3 100644 --- a/src/test/core/JobQueue_test.cpp +++ b/src/test/core/JobQueue_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include #include +#include +#include namespace ripple { namespace test { diff --git a/src/test/core/SociDB_test.cpp b/src/test/core/SociDB_test.cpp index c0365ad9ae7..82d0cbe9035 100644 --- a/src/test/core/SociDB_test.cpp +++ b/src/test/core/SociDB_test.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include -#include namespace ripple { class SociDB_test final : public TestSuite diff --git a/src/test/core/Workers_test.cpp b/src/test/core/Workers_test.cpp index 155dd14f030..3fac4808f9f 100644 --- a/src/test/core/Workers_test.cpp +++ b/src/test/core/Workers_test.cpp @@ -17,11 +17,11 @@ 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/test/csf/BasicNetwork_test.cpp b/src/test/csf/BasicNetwork_test.cpp index f3b18216ac7..61660ae4c4e 100644 --- a/src/test/csf/BasicNetwork_test.cpp +++ b/src/test/csf/BasicNetwork_test.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include #include #include +#include +#include #include namespace ripple { diff --git a/src/test/csf/CollectorRef.h b/src/test/csf/CollectorRef.h index 0f8d90c8ec9..72d1e9545d8 100644 --- a/src/test/csf/CollectorRef.h +++ b/src/test/csf/CollectorRef.h @@ -40,7 +40,7 @@ namespace csf { level when adding to the simulation. The example code below demonstrates the reason for storing the collector - as a reference. The collector's lifetime will generally be be longer than + as a reference. The collector's lifetime will generally be longer than the simulation; perhaps several simulations are run for a single collector instance. The collector potentially stores lots of data as well, so the simulation needs to point to the single instance, rather than requiring diff --git a/src/test/csf/Digraph.h b/src/test/csf/Digraph.h index 2c6b356bf02..3f079eac17c 100644 --- a/src/test/csf/Digraph.h +++ b/src/test/csf/Digraph.h @@ -220,7 +220,7 @@ class Digraph @param fileName The output file (creates) @param vertexName A invokable T vertexName(Vertex const &) that returns the name target use for the vertex in the file - T must be be ostream-able + T must be ostream-able */ template void diff --git a/src/test/csf/Digraph_test.cpp b/src/test/csf/Digraph_test.cpp index ac2063e49f2..80319445caf 100644 --- a/src/test/csf/Digraph_test.cpp +++ b/src/test/csf/Digraph_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include #include +#include +#include #include namespace ripple { diff --git a/src/test/csf/Histogram_test.cpp b/src/test/csf/Histogram_test.cpp index bf392ec8ac1..ea8b864780a 100644 --- a/src/test/csf/Histogram_test.cpp +++ b/src/test/csf/Histogram_test.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/csf/Peer.h b/src/test/csf/Peer.h index 6d3008f7348..5eed78569f6 100644 --- a/src/test/csf/Peer.h +++ b/src/test/csf/Peer.h @@ -19,13 +19,6 @@ #ifndef RIPPLE_TEST_CSF_PEER_H_INCLUDED #define RIPPLE_TEST_CSF_PEER_H_INCLUDED -#include -#include -#include -#include -#include -#include -#include #include #include #include @@ -33,6 +26,13 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/csf/PeerGroup.h b/src/test/csf/PeerGroup.h index 1f3421a4adb..b59bfa6763c 100644 --- a/src/test/csf/PeerGroup.h +++ b/src/test/csf/PeerGroup.h @@ -19,9 +19,9 @@ #ifndef RIPPLE_TEST_CSF_PEERGROUP_H_INCLUDED #define RIPPLE_TEST_CSF_PEERGROUP_H_INCLUDED -#include #include #include +#include #include namespace ripple { diff --git a/src/test/csf/Proposal.h b/src/test/csf/Proposal.h index d1cee16c1a7..1d70464bab5 100644 --- a/src/test/csf/Proposal.h +++ b/src/test/csf/Proposal.h @@ -19,10 +19,10 @@ #ifndef RIPPLE_TEST_CSF_PROPOSAL_H_INCLUDED #define RIPPLE_TEST_CSF_PROPOSAL_H_INCLUDED -#include #include #include #include +#include namespace ripple { namespace test { diff --git a/src/test/csf/Scheduler.h b/src/test/csf/Scheduler.h index 2dc24222b26..62dff86402b 100644 --- a/src/test/csf/Scheduler.h +++ b/src/test/csf/Scheduler.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_TEST_CSF_SCHEDULER_H_INCLUDED #define RIPPLE_TEST_CSF_SCHEDULER_H_INCLUDED -#include -#include +#include +#include #include #include diff --git a/src/test/csf/Scheduler_test.cpp b/src/test/csf/Scheduler_test.cpp index ac9fab2534b..931150bbeb2 100644 --- a/src/test/csf/Scheduler_test.cpp +++ b/src/test/csf/Scheduler_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include #include +#include +#include #include diff --git a/src/test/csf/SimTime.h b/src/test/csf/SimTime.h index 2e18a5f9ee5..930338108e1 100644 --- a/src/test/csf/SimTime.h +++ b/src/test/csf/SimTime.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TEST_CSF_SIMTIME_H_INCLUDED #define RIPPLE_TEST_CSF_SIMTIME_H_INCLUDED -#include +#include #include namespace ripple { diff --git a/src/test/csf/TrustGraph.h b/src/test/csf/TrustGraph.h index 31bb8534037..649f210646f 100644 --- a/src/test/csf/TrustGraph.h +++ b/src/test/csf/TrustGraph.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_TEST_CSF_UNL_H_INCLUDED #define RIPPLE_TEST_CSF_UNL_H_INCLUDED -#include #include +#include #include #include diff --git a/src/test/csf/Tx.h b/src/test/csf/Tx.h index 7f3645a59e6..b21481dcbf9 100644 --- a/src/test/csf/Tx.h +++ b/src/test/csf/Tx.h @@ -18,8 +18,8 @@ //============================================================================== #ifndef RIPPLE_TEST_CSF_TX_H_INCLUDED #define RIPPLE_TEST_CSF_TX_H_INCLUDED -#include -#include +#include +#include #include #include #include diff --git a/src/test/csf/Validation.h b/src/test/csf/Validation.h index aacb155fb1f..57c2bc66681 100644 --- a/src/test/csf/Validation.h +++ b/src/test/csf/Validation.h @@ -19,8 +19,8 @@ #ifndef RIPPLE_TEST_CSF_VALIDATION_H_INCLUDED #define RIPPLE_TEST_CSF_VALIDATION_H_INCLUDED -#include #include +#include #include #include diff --git a/src/test/csf/collectors.h b/src/test/csf/collectors.h index 352aa4cb8c2..511fb2c4b0f 100644 --- a/src/test/csf/collectors.h +++ b/src/test/csf/collectors.h @@ -19,10 +19,10 @@ #ifndef RIPPLE_TEST_CSF_COLLECTORS_H_INCLUDED #define RIPPLE_TEST_CSF_COLLECTORS_H_INCLUDED -#include #include #include #include +#include #include #include diff --git a/src/test/csf/events.h b/src/test/csf/events.h index cdda88cd094..37d1b4b0bd7 100644 --- a/src/test/csf/events.h +++ b/src/test/csf/events.h @@ -19,11 +19,11 @@ #ifndef RIPPLE_TEST_CSF_EVENTS_H_INCLUDED #define RIPPLE_TEST_CSF_EVENTS_H_INCLUDED -#include #include #include #include #include +#include namespace ripple { namespace test { diff --git a/src/test/csf/impl/ledgers.cpp b/src/test/csf/impl/ledgers.cpp index ccc767008a7..775ec2e58b1 100644 --- a/src/test/csf/impl/ledgers.cpp +++ b/src/test/csf/impl/ledgers.cpp @@ -16,8 +16,8 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ //============================================================================== -#include #include +#include #include diff --git a/src/test/csf/ledgers.h b/src/test/csf/ledgers.h index 987c5e706c6..1c8d4eb54c6 100644 --- a/src/test/csf/ledgers.h +++ b/src/test/csf/ledgers.h @@ -19,16 +19,16 @@ #ifndef RIPPLE_TEST_CSF_LEDGERS_H_INCLUDED #define RIPPLE_TEST_CSF_LEDGERS_H_INCLUDED -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include -#include namespace ripple { namespace test { diff --git a/src/test/csf/timers.h b/src/test/csf/timers.h index b2a2b5a2da5..7e5d88c6696 100644 --- a/src/test/csf/timers.h +++ b/src/test/csf/timers.h @@ -19,10 +19,10 @@ #ifndef RIPPLE_TEST_CSF_TIMERS_H_INCLUDED #define RIPPLE_TEST_CSF_TIMERS_H_INCLUDED -#include -#include #include #include +#include +#include namespace ripple { namespace test { diff --git a/src/test/json/Object_test.cpp b/src/test/json/Object_test.cpp index bfdb6427059..4a64d6538a3 100644 --- a/src/test/json/Object_test.cpp +++ b/src/test/json/Object_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include #include +#include +#include namespace Json { diff --git a/src/test/json/Output_test.cpp b/src/test/json/Output_test.cpp index 670f9c191f0..ddc5f08992b 100644 --- a/src/test/json/Output_test.cpp +++ b/src/test/json/Output_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include #include +#include +#include namespace Json { diff --git a/src/test/json/TestOutputSuite.h b/src/test/json/TestOutputSuite.h index 0634f42a796..a4f36dac4ee 100644 --- a/src/test/json/TestOutputSuite.h +++ b/src/test/json/TestOutputSuite.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_RPC_TESTOUTPUTSUITE_H_INCLUDED #define RIPPLE_RPC_TESTOUTPUTSUITE_H_INCLUDED -#include -#include #include +#include +#include namespace ripple { namespace test { diff --git a/src/test/json/Writer_test.cpp b/src/test/json/Writer_test.cpp index 99450ffeec5..97d4297c926 100644 --- a/src/test/json/Writer_test.cpp +++ b/src/test/json/Writer_test.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include #include +#include +#include +#include namespace Json { diff --git a/src/test/json/json_value_test.cpp b/src/test/json/json_value_test.cpp index 543a91a8a06..dacc22cc014 100644 --- a/src/test/json/json_value_test.cpp +++ b/src/test/json/json_value_test.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/test/jtx.h b/src/test/jtx.h index e6651fc1f0d..a3255ef3af9 100644 --- a/src/test/jtx.h +++ b/src/test/jtx.h @@ -22,7 +22,6 @@ // Convenience header that includes everything -#include #include #include #include @@ -66,5 +65,6 @@ #include #include #include +#include #endif diff --git a/src/test/jtx/AMM.h b/src/test/jtx/AMM.h index bb1032e006d..77b9c8c9ec6 100644 --- a/src/test/jtx/AMM.h +++ b/src/test/jtx/AMM.h @@ -20,15 +20,15 @@ #ifndef RIPPLE_TEST_JTX_AMM_H_INCLUDED #define RIPPLE_TEST_JTX_AMM_H_INCLUDED -#include -#include -#include -#include #include #include #include #include #include +#include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/AMMTest.h b/src/test/jtx/AMMTest.h index 5de805a10a7..0481dc98a49 100644 --- a/src/test/jtx/AMMTest.h +++ b/src/test/jtx/AMMTest.h @@ -19,11 +19,11 @@ #ifndef RIPPLE_TEST_JTX_AMMTEST_H_INCLUDED #define RIPPLE_TEST_JTX_AMMTEST_H_INCLUDED -#include -#include #include #include #include +#include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/AbstractClient.h b/src/test/jtx/AbstractClient.h index 672ce422f0e..b447b9dedb1 100644 --- a/src/test/jtx/AbstractClient.h +++ b/src/test/jtx/AbstractClient.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TEST_ABSTRACTCLIENT_H_INCLUDED #define RIPPLE_TEST_ABSTRACTCLIENT_H_INCLUDED -#include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/Account.h b/src/test/jtx/Account.h index cca92e76fe0..bcf117d9357 100644 --- a/src/test/jtx/Account.h +++ b/src/test/jtx/Account.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_TEST_JTX_ACCOUNT_H_INCLUDED #define RIPPLE_TEST_JTX_ACCOUNT_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/test/jtx/CaptureLogs.h b/src/test/jtx/CaptureLogs.h index 9a64396ab7f..62bf25bda90 100644 --- a/src/test/jtx/CaptureLogs.h +++ b/src/test/jtx/CaptureLogs.h @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/CheckMessageLogs.h b/src/test/jtx/CheckMessageLogs.h index 66f5f7e106c..dc3253278cd 100644 --- a/src/test/jtx/CheckMessageLogs.h +++ b/src/test/jtx/CheckMessageLogs.h @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/Env.h b/src/test/jtx/Env.h index 0f21bff9fb6..2c5f2f37062 100644 --- a/src/test/jtx/Env.h +++ b/src/test/jtx/Env.h @@ -20,25 +20,6 @@ #ifndef RIPPLE_TEST_JTX_ENV_H_INCLUDED #define RIPPLE_TEST_JTX_ENV_H_INCLUDED -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include @@ -48,6 +29,25 @@ #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/test/jtx/Env_test.cpp b/src/test/jtx/Env_test.cpp index 5c08469e0b8..691f96c2591 100644 --- a/src/test/jtx/Env_test.cpp +++ b/src/test/jtx/Env_test.cpp @@ -17,15 +17,15 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/test/jtx/JSONRPCClient.h b/src/test/jtx/JSONRPCClient.h index bfd3154579e..bbffc726694 100644 --- a/src/test/jtx/JSONRPCClient.h +++ b/src/test/jtx/JSONRPCClient.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_TEST_HTTPCLIENT_H_INCLUDED #define RIPPLE_TEST_HTTPCLIENT_H_INCLUDED -#include -#include #include +#include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/JTx.h b/src/test/jtx/JTx.h index 2eeb6ccf8f4..a5a4a9eb1b9 100644 --- a/src/test/jtx/JTx.h +++ b/src/test/jtx/JTx.h @@ -20,12 +20,12 @@ #ifndef RIPPLE_TEST_JTX_JTX_H_INCLUDED #define RIPPLE_TEST_JTX_JTX_H_INCLUDED -#include -#include -#include -#include #include #include +#include +#include +#include +#include #include #include diff --git a/src/test/jtx/ManualTimeKeeper.h b/src/test/jtx/ManualTimeKeeper.h index f3adb29b5f0..86477bf99f6 100644 --- a/src/test/jtx/ManualTimeKeeper.h +++ b/src/test/jtx/ManualTimeKeeper.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TEST_MANUALTIMEKEEPER_H_INCLUDED #define RIPPLE_TEST_MANUALTIMEKEEPER_H_INCLUDED -#include +#include #include namespace ripple { diff --git a/src/test/jtx/Oracle.h b/src/test/jtx/Oracle.h index ac46b32d092..32ec0b2e859 100644 --- a/src/test/jtx/Oracle.h +++ b/src/test/jtx/Oracle.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_TEST_JTX_ORACLE_H_INCLUDED #define RIPPLE_TEST_JTX_ORACLE_H_INCLUDED -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/PathSet.h b/src/test/jtx/PathSet.h index f578ceb190d..0f4c4ddd3dd 100644 --- a/src/test/jtx/PathSet.h +++ b/src/test/jtx/PathSet.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_LEDGER_TESTS_PATHSET_H_INCLUDED #define RIPPLE_LEDGER_TESTS_PATHSET_H_INCLUDED -#include -#include #include +#include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/TestHelpers.h b/src/test/jtx/TestHelpers.h index b065cec470a..800662aa05b 100644 --- a/src/test/jtx/TestHelpers.h +++ b/src/test/jtx/TestHelpers.h @@ -19,13 +19,13 @@ #ifndef RIPPLE_TEST_JTX_TESTHELPERS_H_INCLUDED #define RIPPLE_TEST_JTX_TESTHELPERS_H_INCLUDED -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include #include diff --git a/src/test/jtx/TestSuite.h b/src/test/jtx/TestSuite.h index 9bd8d50ab57..22b8fb7e53b 100644 --- a/src/test/jtx/TestSuite.h +++ b/src/test/jtx/TestSuite.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_BASICS_TESTSUITE_H_INCLUDED #define RIPPLE_BASICS_TESTSUITE_H_INCLUDED -#include +#include #include namespace ripple { diff --git a/src/test/jtx/TrustedPublisherServer.h b/src/test/jtx/TrustedPublisherServer.h index db57b2d94c6..a10b9999ad2 100644 --- a/src/test/jtx/TrustedPublisherServer.h +++ b/src/test/jtx/TrustedPublisherServer.h @@ -19,12 +19,13 @@ #ifndef RIPPLE_TEST_TRUSTED_PUBLISHER_SERVER_H_INCLUDED #define RIPPLE_TEST_TRUSTED_PUBLISHER_SERVER_H_INCLUDED -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -33,7 +34,6 @@ #include #include #include -#include #include #include diff --git a/src/test/jtx/WSClient.h b/src/test/jtx/WSClient.h index 8961522a038..d0356dbcbf7 100644 --- a/src/test/jtx/WSClient.h +++ b/src/test/jtx/WSClient.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_TEST_WSCLIENT_H_INCLUDED #define RIPPLE_TEST_WSCLIENT_H_INCLUDED -#include #include +#include #include #include diff --git a/src/test/jtx/WSClient_test.cpp b/src/test/jtx/WSClient_test.cpp index 85440003ba4..18dadb0bf9a 100644 --- a/src/test/jtx/WSClient_test.cpp +++ b/src/test/jtx/WSClient_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include #include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/amount.h b/src/test/jtx/amount.h index f8a8f67c75e..c8e0d0c3701 100644 --- a/src/test/jtx/amount.h +++ b/src/test/jtx/amount.h @@ -20,16 +20,16 @@ #ifndef RIPPLE_TEST_JTX_AMOUNT_H_INCLUDED #define RIPPLE_TEST_JTX_AMOUNT_H_INCLUDED -#include -#include -#include -#include -#include -#include -#include #include #include #include +#include +#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/test/jtx/attester.h b/src/test/jtx/attester.h index 7741991b752..327fb2e4873 100644 --- a/src/test/jtx/attester.h +++ b/src/test/jtx/attester.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_TEST_JTX_ATTESTER_H_INCLUDED #define RIPPLE_TEST_JTX_ATTESTER_H_INCLUDED -#include -#include +#include +#include #include #include diff --git a/src/test/jtx/delivermin.h b/src/test/jtx/delivermin.h index 579b66e97ff..46e633dab20 100644 --- a/src/test/jtx/delivermin.h +++ b/src/test/jtx/delivermin.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_TEST_JTX_DELIVERMIN_H_INCLUDED #define RIPPLE_TEST_JTX_DELIVERMIN_H_INCLUDED -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/envconfig.h b/src/test/jtx/envconfig.h index 02c99c52f09..259b61b6caf 100644 --- a/src/test/jtx/envconfig.h +++ b/src/test/jtx/envconfig.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TEST_JTX_ENVCONFIG_H_INCLUDED #define RIPPLE_TEST_JTX_ENVCONFIG_H_INCLUDED -#include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/fee.h b/src/test/jtx/fee.h index 58813409edd..c671e0b2a1e 100644 --- a/src/test/jtx/fee.h +++ b/src/test/jtx/fee.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_TEST_JTX_FEE_H_INCLUDED #define RIPPLE_TEST_JTX_FEE_H_INCLUDED -#include -#include #include #include +#include +#include #include diff --git a/src/test/jtx/flags.h b/src/test/jtx/flags.h index 27b6ea95611..c8887cdee4b 100644 --- a/src/test/jtx/flags.h +++ b/src/test/jtx/flags.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_TEST_JTX_FLAGS_H_INCLUDED #define RIPPLE_TEST_JTX_FLAGS_H_INCLUDED -#include -#include -#include #include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/AMM.cpp b/src/test/jtx/impl/AMM.cpp index a36384f4a29..c083b6df35c 100644 --- a/src/test/jtx/impl/AMM.cpp +++ b/src/test/jtx/impl/AMM.cpp @@ -19,12 +19,12 @@ #include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/AMMTest.cpp b/src/test/jtx/impl/AMMTest.cpp index 187cb3cee05..575e2e1d889 100644 --- a/src/test/jtx/impl/AMMTest.cpp +++ b/src/test/jtx/impl/AMMTest.cpp @@ -19,13 +19,13 @@ #include -#include -#include -#include -#include #include #include #include +#include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/Account.cpp b/src/test/jtx/impl/Account.cpp index a17186d4ffb..9d41456ef75 100644 --- a/src/test/jtx/impl/Account.cpp +++ b/src/test/jtx/impl/Account.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include #include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/Env.cpp b/src/test/jtx/impl/Env.cpp index 884caf9162e..6f0f9e3fc73 100644 --- a/src/test/jtx/impl/Env.cpp +++ b/src/test/jtx/impl/Env.cpp @@ -17,27 +17,6 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include @@ -49,6 +28,27 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/JSONRPCClient.cpp b/src/test/jtx/impl/JSONRPCClient.cpp index 1e3664c60ec..20f2149e4a0 100644 --- a/src/test/jtx/impl/JSONRPCClient.cpp +++ b/src/test/jtx/impl/JSONRPCClient.cpp @@ -16,10 +16,11 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ //============================================================================== -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include @@ -27,7 +28,6 @@ #include #include #include -#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/Oracle.cpp b/src/test/jtx/impl/Oracle.cpp index 34249a61228..df9483cbaae 100644 --- a/src/test/jtx/impl/Oracle.cpp +++ b/src/test/jtx/impl/Oracle.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include #include +#include +#include #include #include diff --git a/src/test/jtx/impl/TestHelpers.cpp b/src/test/jtx/impl/TestHelpers.cpp index 41d9db7c7e5..b8105b1a631 100644 --- a/src/test/jtx/impl/TestHelpers.cpp +++ b/src/test/jtx/impl/TestHelpers.cpp @@ -19,9 +19,9 @@ #include -#include #include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/WSClient.cpp b/src/test/jtx/impl/WSClient.cpp index e9b27168108..185d0ea5dba 100644 --- a/src/test/jtx/impl/WSClient.cpp +++ b/src/test/jtx/impl/WSClient.cpp @@ -17,14 +17,14 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include #include #include +#include +#include +#include +#include +#include +#include #include #include @@ -32,7 +32,7 @@ #include -#include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/acctdelete.cpp b/src/test/jtx/impl/acctdelete.cpp index a62ab6a48bb..d7f8f10e04d 100644 --- a/src/test/jtx/impl/acctdelete.cpp +++ b/src/test/jtx/impl/acctdelete.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/amount.cpp b/src/test/jtx/impl/amount.cpp index 86f51d135d7..01fa5369592 100644 --- a/src/test/jtx/impl/amount.cpp +++ b/src/test/jtx/impl/amount.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include +#include +#include +#include #include #include #include -#include -#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/attester.cpp b/src/test/jtx/impl/attester.cpp index dd00f536af8..66be9da83b3 100644 --- a/src/test/jtx/impl/attester.cpp +++ b/src/test/jtx/impl/attester.cpp @@ -19,11 +19,11 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/check.cpp b/src/test/jtx/impl/check.cpp index d862130bc70..21af6c9cc3f 100644 --- a/src/test/jtx/impl/check.cpp +++ b/src/test/jtx/impl/check.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include #include +#include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/delivermin.cpp b/src/test/jtx/impl/delivermin.cpp index 464c31e0118..6e4838c7c0a 100644 --- a/src/test/jtx/impl/delivermin.cpp +++ b/src/test/jtx/impl/delivermin.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/deposit.cpp b/src/test/jtx/impl/deposit.cpp index 803705c8cb5..09f0cb704b0 100644 --- a/src/test/jtx/impl/deposit.cpp +++ b/src/test/jtx/impl/deposit.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/did.cpp b/src/test/jtx/impl/did.cpp index 94dfcc32754..a9a6e974ef4 100644 --- a/src/test/jtx/impl/did.cpp +++ b/src/test/jtx/impl/did.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include #include +#include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/envconfig.cpp b/src/test/jtx/impl/envconfig.cpp index cbca244be6d..c9788a6d70f 100644 --- a/src/test/jtx/impl/envconfig.cpp +++ b/src/test/jtx/impl/envconfig.cpp @@ -19,8 +19,8 @@ #include -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/fee.cpp b/src/test/jtx/impl/fee.cpp index dea666cd3e8..e390136a3c0 100644 --- a/src/test/jtx/impl/fee.cpp +++ b/src/test/jtx/impl/fee.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/flags.cpp b/src/test/jtx/impl/flags.cpp index c80e329fdc8..992e1a88bb2 100644 --- a/src/test/jtx/impl/flags.cpp +++ b/src/test/jtx/impl/flags.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/jtx_json.cpp b/src/test/jtx/impl/jtx_json.cpp index d5fb7bfae91..c9cf6636cf9 100644 --- a/src/test/jtx/impl/jtx_json.cpp +++ b/src/test/jtx/impl/jtx_json.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include #include #include +#include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/last_ledger_sequence.cpp b/src/test/jtx/impl/last_ledger_sequence.cpp index b0d7bd5c5eb..57742bab2a1 100644 --- a/src/test/jtx/impl/last_ledger_sequence.cpp +++ b/src/test/jtx/impl/last_ledger_sequence.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/memo.cpp b/src/test/jtx/impl/memo.cpp index 174a132eb3d..6469748b4f9 100644 --- a/src/test/jtx/impl/memo.cpp +++ b/src/test/jtx/impl/memo.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include #include +#include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/multisign.cpp b/src/test/jtx/impl/multisign.cpp index 1e1f5141798..42c3bfc78bf 100644 --- a/src/test/jtx/impl/multisign.cpp +++ b/src/test/jtx/impl/multisign.cpp @@ -17,15 +17,15 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include #include #include +#include +#include +#include +#include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/offer.cpp b/src/test/jtx/impl/offer.cpp index 6e9a1b4f2ff..55a1af4beab 100644 --- a/src/test/jtx/impl/offer.cpp +++ b/src/test/jtx/impl/offer.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/paths.cpp b/src/test/jtx/impl/paths.cpp index 5de9761a110..393e36e9d61 100644 --- a/src/test/jtx/impl/paths.cpp +++ b/src/test/jtx/impl/paths.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include #include +#include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/pay.cpp b/src/test/jtx/impl/pay.cpp index 35df2ec191c..2a627223fdd 100644 --- a/src/test/jtx/impl/pay.cpp +++ b/src/test/jtx/impl/pay.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include #include +#include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/quality2.cpp b/src/test/jtx/impl/quality2.cpp index e1837035e2d..dd10b3c6117 100644 --- a/src/test/jtx/impl/quality2.cpp +++ b/src/test/jtx/impl/quality2.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include #include +#include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/rate.cpp b/src/test/jtx/impl/rate.cpp index cf4cd3211a8..f95170537f3 100644 --- a/src/test/jtx/impl/rate.cpp +++ b/src/test/jtx/impl/rate.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include #include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/regkey.cpp b/src/test/jtx/impl/regkey.cpp index 917fb440624..9fc260d2d03 100644 --- a/src/test/jtx/impl/regkey.cpp +++ b/src/test/jtx/impl/regkey.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/sendmax.cpp b/src/test/jtx/impl/sendmax.cpp index a292e2a98ef..9514b923166 100644 --- a/src/test/jtx/impl/sendmax.cpp +++ b/src/test/jtx/impl/sendmax.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/seq.cpp b/src/test/jtx/impl/seq.cpp index ca57e79227d..3a3de002db6 100644 --- a/src/test/jtx/impl/seq.cpp +++ b/src/test/jtx/impl/seq.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/tag.cpp b/src/test/jtx/impl/tag.cpp index 33ec2c3b89b..be456a1e0e8 100644 --- a/src/test/jtx/impl/tag.cpp +++ b/src/test/jtx/impl/tag.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/ticket.cpp b/src/test/jtx/impl/ticket.cpp index 951c62ab72e..69bcab4d9f1 100644 --- a/src/test/jtx/impl/ticket.cpp +++ b/src/test/jtx/impl/ticket.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/token.cpp b/src/test/jtx/impl/token.cpp index 12b738ca42f..5faf56185b9 100644 --- a/src/test/jtx/impl/token.cpp +++ b/src/test/jtx/impl/token.cpp @@ -20,9 +20,9 @@ #include #include -#include -#include -#include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/trust.cpp b/src/test/jtx/impl/trust.cpp index 4ceb10a2365..641a0f79f28 100644 --- a/src/test/jtx/impl/trust.cpp +++ b/src/test/jtx/impl/trust.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include #include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/txflags.cpp b/src/test/jtx/impl/txflags.cpp index 5c78be8bae6..7bc59876a99 100644 --- a/src/test/jtx/impl/txflags.cpp +++ b/src/test/jtx/impl/txflags.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/utility.cpp b/src/test/jtx/impl/utility.cpp index 196fd9258d7..c10fb918540 100644 --- a/src/test/jtx/impl/utility.cpp +++ b/src/test/jtx/impl/utility.cpp @@ -17,17 +17,17 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/xchain_bridge.cpp b/src/test/jtx/impl/xchain_bridge.cpp index 0b81ccdcd91..43b0e7c2f96 100644 --- a/src/test/jtx/impl/xchain_bridge.cpp +++ b/src/test/jtx/impl/xchain_bridge.cpp @@ -19,17 +19,17 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/jtx_json.h b/src/test/jtx/jtx_json.h index 59cc09537e2..837d6524766 100644 --- a/src/test/jtx/jtx_json.h +++ b/src/test/jtx/jtx_json.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_TEST_JTX_JSON_H_INCLUDED #define RIPPLE_TEST_JTX_JSON_H_INCLUDED -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/multisign.h b/src/test/jtx/multisign.h index 0617ea2fcbb..3946ea14b26 100644 --- a/src/test/jtx/multisign.h +++ b/src/test/jtx/multisign.h @@ -20,13 +20,13 @@ #ifndef RIPPLE_TEST_JTX_MULTISIGN_H_INCLUDED #define RIPPLE_TEST_JTX_MULTISIGN_H_INCLUDED -#include -#include -#include #include #include #include #include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/offer.h b/src/test/jtx/offer.h index 35a46d19b6b..3951f4f934a 100644 --- a/src/test/jtx/offer.h +++ b/src/test/jtx/offer.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_TEST_JTX_OFFER_H_INCLUDED #define RIPPLE_TEST_JTX_OFFER_H_INCLUDED -#include -#include #include +#include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/owners.h b/src/test/jtx/owners.h index 9c802ec91dc..2299af2d7f3 100644 --- a/src/test/jtx/owners.h +++ b/src/test/jtx/owners.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_TEST_JTX_OWNERS_H_INCLUDED #define RIPPLE_TEST_JTX_OWNERS_H_INCLUDED -#include -#include -#include -#include #include +#include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/paths.h b/src/test/jtx/paths.h index 240582825f3..cc9caf3af72 100644 --- a/src/test/jtx/paths.h +++ b/src/test/jtx/paths.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_TEST_JTX_PATHS_H_INCLUDED #define RIPPLE_TEST_JTX_PATHS_H_INCLUDED -#include #include +#include #include namespace ripple { diff --git a/src/test/jtx/pay.h b/src/test/jtx/pay.h index f66075a3e80..6294b5b3082 100644 --- a/src/test/jtx/pay.h +++ b/src/test/jtx/pay.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_TEST_JTX_PAY_H_INCLUDED #define RIPPLE_TEST_JTX_PAY_H_INCLUDED -#include #include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/prop.h b/src/test/jtx/prop.h index 6724ebf8087..8dc5f21917d 100644 --- a/src/test/jtx/prop.h +++ b/src/test/jtx/prop.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_TEST_JTX_PROP_H_INCLUDED #define RIPPLE_TEST_JTX_PROP_H_INCLUDED -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/rate.h b/src/test/jtx/rate.h index 6427b4988e5..0f8186accfc 100644 --- a/src/test/jtx/rate.h +++ b/src/test/jtx/rate.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_TEST_JTX_RATE_H_INCLUDED #define RIPPLE_TEST_JTX_RATE_H_INCLUDED -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/regkey.h b/src/test/jtx/regkey.h index 94869d1d006..7d021e4f277 100644 --- a/src/test/jtx/regkey.h +++ b/src/test/jtx/regkey.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_TEST_JTX_REGKEY_H_INCLUDED #define RIPPLE_TEST_JTX_REGKEY_H_INCLUDED -#include #include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/require.h b/src/test/jtx/require.h index 64b1f36b5fa..271419e51b9 100644 --- a/src/test/jtx/require.h +++ b/src/test/jtx/require.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_TEST_JTX_REQUIRE_H_INCLUDED #define RIPPLE_TEST_JTX_REQUIRE_H_INCLUDED -#include #include +#include #include namespace ripple { diff --git a/src/test/jtx/sendmax.h b/src/test/jtx/sendmax.h index 41e09a4313b..495c61c33b8 100644 --- a/src/test/jtx/sendmax.h +++ b/src/test/jtx/sendmax.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_TEST_JTX_SENDMAX_H_INCLUDED #define RIPPLE_TEST_JTX_SENDMAX_H_INCLUDED -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/token.h b/src/test/jtx/token.h index 957e499cefa..9b4f81b7061 100644 --- a/src/test/jtx/token.h +++ b/src/test/jtx/token.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include diff --git a/src/test/jtx/trust.h b/src/test/jtx/trust.h index 5b6dd78b3cd..f9fddf4871a 100644 --- a/src/test/jtx/trust.h +++ b/src/test/jtx/trust.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_TEST_JTX_TRUST_H_INCLUDED #define RIPPLE_TEST_JTX_TRUST_H_INCLUDED -#include -#include #include +#include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/utility.h b/src/test/jtx/utility.h index 42a2180eed2..6d34452cdf8 100644 --- a/src/test/jtx/utility.h +++ b/src/test/jtx/utility.h @@ -20,12 +20,12 @@ #ifndef RIPPLE_TEST_JTX_UTILITY_H_INCLUDED #define RIPPLE_TEST_JTX_UTILITY_H_INCLUDED -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/xchain_bridge.h b/src/test/jtx/xchain_bridge.h index 8a398bc6f20..9968317c8de 100644 --- a/src/test/jtx/xchain_bridge.h +++ b/src/test/jtx/xchain_bridge.h @@ -20,12 +20,12 @@ #ifndef RIPPLE_TEST_JTX_XCHAINBRIDGE_H_INCLUDED #define RIPPLE_TEST_JTX_XCHAINBRIDGE_H_INCLUDED -#include -#include -#include #include #include #include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/ledger/BookDirs_test.cpp b/src/test/ledger/BookDirs_test.cpp index c7dbea3d6d9..b50f4381f48 100644 --- a/src/test/ledger/BookDirs_test.cpp +++ b/src/test/ledger/BookDirs_test.cpp @@ -15,9 +15,9 @@ */ //============================================================================== -#include -#include #include +#include +#include namespace ripple { namespace test { diff --git a/src/test/ledger/Directory_test.cpp b/src/test/ledger/Directory_test.cpp index 42dcdab9bd1..4904b6e6fbf 100644 --- a/src/test/ledger/Directory_test.cpp +++ b/src/test/ledger/Directory_test.cpp @@ -15,15 +15,14 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/ledger/Invariants_test.cpp b/src/test/ledger/Invariants_test.cpp index 898376bdaf7..66523700a88 100644 --- a/src/test/ledger/Invariants_test.cpp +++ b/src/test/ledger/Invariants_test.cpp @@ -17,19 +17,29 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include #include +#include #include +#include +#include +#include +#include +#include +#include namespace ripple { class Invariants_test : public beast::unit_test::suite { + // The optional Preclose function is used to process additional transactions + // on the ledger after creating two accounts, but before closing it, and + // before the Precheck function. These should only be valid functions, and + // not direct manipulations. Preclose is not commonly used. + using Preclose = std::function; + // this is common setup/method for running a failing invariant check. The // precheck function is used to manipulate the ApplyContext with view // changes that will cause the check to fail. @@ -38,22 +48,42 @@ class Invariants_test : public beast::unit_test::suite test::jtx::Account const& b, ApplyContext& ac)>; + /** Run a specific test case to put the ledger into a state that will be + * detected by an invariant. Simulates the actions of a transaction that + * would violate an invariant. + * + * @param expect_logs One or more messages related to the failing invariant + * that should be in the log output + * @precheck See "Precheck" above + * @fee If provided, the fee amount paid by the simulated transaction. + * @tx A mock transaction that took the actions to trigger the invariant. In + * most cases, only the type matters. + * @ters The TER results expected on the two passes of the invariant + * checker. + * @preclose See "Preclose" above. Note that @preclose runs *before* + * @precheck, but is the last parameter for historical reasons + * + */ void doInvariantCheck( std::vector const& expect_logs, Precheck const& precheck, XRPAmount fee = XRPAmount{}, STTx tx = STTx{ttACCOUNT_SET, [](STObject&) {}}, - std::initializer_list ters = { - tecINVARIANT_FAILED, - tefINVARIANT_FAILED}) + std::initializer_list ters = + {tecINVARIANT_FAILED, tefINVARIANT_FAILED}, + Preclose const& preclose = {}) { using namespace test::jtx; - Env env{*this}; + FeatureBitset amendments = + supported_amendments() | featureInvariantsV1_1; + Env env{*this, amendments}; - Account A1{"A1"}; - Account A2{"A2"}; + Account const A1{"A1"}; + Account const A2{"A2"}; env.fund(XRP(1000), A1, A2); + if (preclose) + BEAST_EXPECT(preclose(A1, A2, env)); env.close(); OpenView ov{*env.current()}; @@ -162,6 +192,165 @@ class Invariants_test : public beast::unit_test::suite STTx{ttACCOUNT_DELETE, [](STObject& tx) {}}); } + void + testAccountRootsDeletedClean() + { + using namespace test::jtx; + testcase << "account root deletion left artifact"; + + for (auto const& keyletInfo : directAccountKeylets) + { + // TODO: Use structured binding once LLVM 16 is the minimum + // supported version. See also: + // https://github.com/llvm/llvm-project/issues/48582 + // https://github.com/llvm/llvm-project/commit/127bf44385424891eb04cff8e52d3f157fc2cb7c + if (!keyletInfo.includeInTests) + continue; + auto const& keyletfunc = keyletInfo.function; + auto const& type = keyletInfo.expectedLEName; + + using namespace std::string_literals; + + doInvariantCheck( + {{"account deletion left behind a "s + type.c_str() + + " object"}}, + [&](Account const& A1, Account const& A2, ApplyContext& ac) { + // Add an object to the ledger for account A1, then delete + // A1 + auto const a1 = A1.id(); + auto const sleA1 = ac.view().peek(keylet::account(a1)); + if (!sleA1) + return false; + + auto const key = std::invoke(keyletfunc, a1); + auto const newSLE = std::make_shared(key); + ac.view().insert(newSLE); + ac.view().erase(sleA1); + + return true; + }, + XRPAmount{}, + STTx{ttACCOUNT_DELETE, [](STObject& tx) {}}); + }; + + // NFT special case + doInvariantCheck( + {{"account deletion left behind a NFTokenPage object"}}, + [&](Account const& A1, Account const&, ApplyContext& ac) { + // remove an account from the view + auto const sle = ac.view().peek(keylet::account(A1.id())); + if (!sle) + return false; + ac.view().erase(sle); + return true; + }, + XRPAmount{}, + STTx{ttACCOUNT_DELETE, [](STObject& tx) {}}, + {tecINVARIANT_FAILED, tefINVARIANT_FAILED}, + [&](Account const& A1, Account const&, Env& env) { + // Preclose callback to mint the NFT which will be deleted in + // the Precheck callback above. + env(token::mint(A1)); + + return true; + }); + + // AMM special cases + AccountID ammAcctID; + uint256 ammKey; + Issue ammIssue; + doInvariantCheck( + {{"account deletion left behind a DirectoryNode object"}}, + [&](Account const& A1, Account const& A2, ApplyContext& ac) { + // Delete the AMM account without cleaning up the directory or + // deleting the AMM object + auto const sle = ac.view().peek(keylet::account(ammAcctID)); + if (!sle) + return false; + + BEAST_EXPECT(sle->at(~sfAMMID)); + BEAST_EXPECT(sle->at(~sfAMMID) == ammKey); + + ac.view().erase(sle); + + return true; + }, + XRPAmount{}, + STTx{ttAMM_WITHDRAW, [](STObject& tx) {}}, + {tecINVARIANT_FAILED, tefINVARIANT_FAILED}, + [&](Account const& A1, Account const& A2, Env& env) { + // Preclose callback to create the AMM which will be partially + // deleted in the Precheck callback above. + AMM const amm(env, A1, XRP(100), A1["USD"](50)); + ammAcctID = amm.ammAccount(); + ammKey = amm.ammID(); + ammIssue = amm.lptIssue(); + return true; + }); + doInvariantCheck( + {{"account deletion left behind a AMM object"}}, + [&](Account const& A1, Account const& A2, ApplyContext& ac) { + // Delete all the AMM's trust lines, remove the AMM from the AMM + // account's directory (this deletes the directory), and delete + // the AMM account. Do not delete the AMM object. + auto const sle = ac.view().peek(keylet::account(ammAcctID)); + if (!sle) + return false; + + BEAST_EXPECT(sle->at(~sfAMMID)); + BEAST_EXPECT(sle->at(~sfAMMID) == ammKey); + + for (auto const& trustKeylet : + {keylet::line(ammAcctID, A1["USD"]), + keylet::line(A1, ammIssue)}) + { + if (auto const line = ac.view().peek(trustKeylet); !line) + { + return false; + } + else + { + STAmount const lowLimit = line->at(sfLowLimit); + STAmount const highLimit = line->at(sfHighLimit); + BEAST_EXPECT( + trustDelete( + ac.view(), + line, + lowLimit.getIssuer(), + highLimit.getIssuer(), + ac.journal) == tesSUCCESS); + } + } + + auto const ammSle = ac.view().peek(keylet::amm(ammKey)); + if (!BEAST_EXPECT(ammSle)) + return false; + auto const ownerDirKeylet = keylet::ownerDir(ammAcctID); + + BEAST_EXPECT(ac.view().dirRemove( + ownerDirKeylet, ammSle->at(sfOwnerNode), ammKey, false)); + BEAST_EXPECT( + !ac.view().exists(ownerDirKeylet) || + ac.view().emptyDirDelete(ownerDirKeylet)); + + ac.view().erase(sle); + + return true; + }, + XRPAmount{}, + STTx{ttAMM_WITHDRAW, [](STObject& tx) {}}, + {tecINVARIANT_FAILED, tefINVARIANT_FAILED}, + [&](Account const& A1, Account const& A2, Env& env) { + // Preclose callback to create the AMM which will be partially + // deleted in the Precheck callback above. + AMM const amm(env, A1, XRP(100), A1["USD"](50)); + ammAcctID = amm.ammAccount(); + ammKey = amm.ammID(); + ammIssue = amm.lptIssue(); + return true; + }); + } + void testTypesMatch() { @@ -175,7 +364,7 @@ class Invariants_test : public beast::unit_test::suite auto const sle = ac.view().peek(keylet::account(A1.id())); if (!sle) return false; - auto sleNew = std::make_shared(ltTICKET, sle->key()); + auto const sleNew = std::make_shared(ltTICKET, sle->key()); ac.rawView().rawReplace(sleNew); return true; }); @@ -191,7 +380,7 @@ class Invariants_test : public beast::unit_test::suite // make a dummy escrow ledger entry, then change the type to an // unsupported value so that the valid type invariant check // will fail. - auto sleNew = std::make_shared( + auto const sleNew = std::make_shared( keylet::escrow(A1, (*sle)[sfSequence] + 2)); // We don't use ltNICKNAME directly since it's marked deprecated @@ -231,7 +420,7 @@ class Invariants_test : public beast::unit_test::suite auto const sle = ac.view().peek(keylet::account(A1.id())); if (!sle) return false; - STAmount nonNative(A2["USD"](51)); + STAmount const nonNative(A2["USD"](51)); sle->setFieldAmount(sfBalance, nonNative); ac.view().update(sle); return true; @@ -420,7 +609,7 @@ class Invariants_test : public beast::unit_test::suite [](Account const&, Account const&, ApplyContext& ac) { // Insert a new account root created by a non-payment into // the view. - const Account A3{"A3"}; + Account const A3{"A3"}; Keylet const acctKeylet = keylet::account(A3); auto const sleNew = std::make_shared(acctKeylet); ac.view().insert(sleNew); @@ -432,13 +621,13 @@ class Invariants_test : public beast::unit_test::suite [](Account const&, Account const&, ApplyContext& ac) { // Insert two new account roots into the view. { - const Account A3{"A3"}; + Account const A3{"A3"}; Keylet const acctKeylet = keylet::account(A3); auto const sleA3 = std::make_shared(acctKeylet); ac.view().insert(sleA3); } { - const Account A4{"A4"}; + Account const A4{"A4"}; Keylet const acctKeylet = keylet::account(A4); auto const sleA4 = std::make_shared(acctKeylet); ac.view().insert(sleA4); @@ -450,7 +639,7 @@ class Invariants_test : public beast::unit_test::suite {{"account created with wrong starting sequence number"}}, [](Account const&, Account const&, ApplyContext& ac) { // Insert a new account root with the wrong starting sequence. - const Account A3{"A3"}; + Account const A3{"A3"}; Keylet const acctKeylet = keylet::account(A3); auto const sleNew = std::make_shared(acctKeylet); sleNew->setFieldU32(sfSequence, ac.view().seq() + 1); @@ -467,6 +656,7 @@ class Invariants_test : public beast::unit_test::suite { testXRPNotCreated(); testAccountRootsNotRemoved(); + testAccountRootsDeletedClean(); testTypesMatch(); testNoXRPTrustLine(); testXRPBalanceCheck(); diff --git a/src/test/ledger/PaymentSandbox_test.cpp b/src/test/ledger/PaymentSandbox_test.cpp index b5ad8c7712c..e3ede19b4b6 100644 --- a/src/test/ledger/PaymentSandbox_test.cpp +++ b/src/test/ledger/PaymentSandbox_test.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/ledger/PendingSaves_test.cpp b/src/test/ledger/PendingSaves_test.cpp index d826d2019fd..1bd42a64a60 100644 --- a/src/test/ledger/PendingSaves_test.cpp +++ b/src/test/ledger/PendingSaves_test.cpp @@ -15,8 +15,8 @@ */ //============================================================================== -#include -#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/ledger/SkipList_test.cpp b/src/test/ledger/SkipList_test.cpp index 4fd117a4ca1..3e8987a806a 100644 --- a/src/test/ledger/SkipList_test.cpp +++ b/src/test/ledger/SkipList_test.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include -#include -#include -#include #include +#include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/ledger/View_test.cpp b/src/test/ledger/View_test.cpp index bbb1eec8fa5..29ceb54cc09 100644 --- a/src/test/ledger/View_test.cpp +++ b/src/test/ledger/View_test.cpp @@ -17,15 +17,15 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/test/net/DatabaseDownloader_test.cpp b/src/test/net/DatabaseDownloader_test.cpp index 31c8abfd12c..99e98dd3d01 100644 --- a/src/test/net/DatabaseDownloader_test.cpp +++ b/src/test/net/DatabaseDownloader_test.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include -#include -#include -#include #include #include #include +#include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/nodestore/Backend_test.cpp b/src/test/nodestore/Backend_test.cpp index 8c8432bb5b8..dc1fe8c7fe2 100644 --- a/src/test/nodestore/Backend_test.cpp +++ b/src/test/nodestore/Backend_test.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include -#include -#include -#include -#include #include #include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/test/nodestore/Basics_test.cpp b/src/test/nodestore/Basics_test.cpp index 92f2ae15aaf..aa423e7dc03 100644 --- a/src/test/nodestore/Basics_test.cpp +++ b/src/test/nodestore/Basics_test.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include -#include -#include -#include #include +#include +#include +#include +#include namespace ripple { namespace NodeStore { diff --git a/src/test/nodestore/DatabaseShard_test.cpp b/src/test/nodestore/DatabaseShard_test.cpp index 5c074b14938..e185c43d157 100644 --- a/src/test/nodestore/DatabaseShard_test.cpp +++ b/src/test/nodestore/DatabaseShard_test.cpp @@ -17,24 +17,24 @@ */ //============================================================================== -#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 +#include +#include +#include #include #include diff --git a/src/test/nodestore/Database_test.cpp b/src/test/nodestore/Database_test.cpp index 0cf2afb21a7..6774857dfc6 100644 --- a/src/test/nodestore/Database_test.cpp +++ b/src/test/nodestore/Database_test.cpp @@ -17,15 +17,15 @@ */ //============================================================================== -#include -#include -#include -#include #include #include #include #include #include +#include +#include +#include +#include namespace ripple { diff --git a/src/test/nodestore/TestBase.h b/src/test/nodestore/TestBase.h index 9ccf2e1698d..98608c5fb11 100644 --- a/src/test/nodestore/TestBase.h +++ b/src/test/nodestore/TestBase.h @@ -20,14 +20,14 @@ #ifndef RIPPLE_NODESTORE_BASE_H_INCLUDED #define RIPPLE_NODESTORE_BASE_H_INCLUDED -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/test/nodestore/Timing_test.cpp b/src/test/nodestore/Timing_test.cpp index 61cfb0994dc..73789c02449 100644 --- a/src/test/nodestore/Timing_test.cpp +++ b/src/test/nodestore/Timing_test.cpp @@ -17,16 +17,18 @@ */ //============================================================================== -#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 @@ -36,8 +38,6 @@ #include #include #include -#include -#include #include #include #include diff --git a/src/test/nodestore/import_test.cpp b/src/test/nodestore/import_test.cpp index 4a9ee9f0ac3..e13fe9c0c8d 100644 --- a/src/test/nodestore/import_test.cpp +++ b/src/test/nodestore/import_test.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -34,7 +34,7 @@ #include #include -#include +#include /* diff --git a/src/test/nodestore/varint_test.cpp b/src/test/nodestore/varint_test.cpp index a84506b7eac..da7ae9d2858 100644 --- a/src/test/nodestore/varint_test.cpp +++ b/src/test/nodestore/varint_test.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include #include #include diff --git a/src/test/overlay/ProtocolVersion_test.cpp b/src/test/overlay/ProtocolVersion_test.cpp index a5a26fe74ec..dfc0ee70b8e 100644 --- a/src/test/overlay/ProtocolVersion_test.cpp +++ b/src/test/overlay/ProtocolVersion_test.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include namespace ripple { diff --git a/src/test/overlay/cluster_test.cpp b/src/test/overlay/cluster_test.cpp index afbc12a20ee..d22674d28c6 100644 --- a/src/test/overlay/cluster_test.cpp +++ b/src/test/overlay/cluster_test.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include -#include -#include -#include #include #include +#include +#include +#include +#include namespace ripple { namespace tests { diff --git a/src/test/overlay/compression_test.cpp b/src/test/overlay/compression_test.cpp index 81f21258e30..19669efc23f 100644 --- a/src/test/overlay/compression_test.cpp +++ b/src/test/overlay/compression_test.cpp @@ -17,34 +17,34 @@ */ //============================================================================== -#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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/test/overlay/handshake_test.cpp b/src/test/overlay/handshake_test.cpp index 25bf20add12..93038e522a4 100644 --- a/src/test/overlay/handshake_test.cpp +++ b/src/test/overlay/handshake_test.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include namespace ripple { diff --git a/src/test/overlay/reduce_relay_test.cpp b/src/test/overlay/reduce_relay_test.cpp index 025e3295f2a..4d9086dab10 100644 --- a/src/test/overlay/reduce_relay_test.cpp +++ b/src/test/overlay/reduce_relay_test.cpp @@ -16,15 +16,15 @@ 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 diff --git a/src/test/overlay/short_read_test.cpp b/src/test/overlay/short_read_test.cpp index 434b4100852..6dd4f8c00b8 100644 --- a/src/test/overlay/short_read_test.cpp +++ b/src/test/overlay/short_read_test.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include #include +#include +#include +#include #include #include diff --git a/src/test/overlay/tx_reduce_relay_test.cpp b/src/test/overlay/tx_reduce_relay_test.cpp index 7b26ad0962f..074976e8586 100644 --- a/src/test/overlay/tx_reduce_relay_test.cpp +++ b/src/test/overlay/tx_reduce_relay_test.cpp @@ -16,12 +16,12 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ //============================================================================== -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/test/peerfinder/Livecache_test.cpp b/src/test/peerfinder/Livecache_test.cpp index b6d193f21f5..7fb9f02f42a 100644 --- a/src/test/peerfinder/Livecache_test.cpp +++ b/src/test/peerfinder/Livecache_test.cpp @@ -17,14 +17,14 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include #include #include +#include +#include +#include +#include +#include +#include namespace ripple { namespace PeerFinder { diff --git a/src/test/peerfinder/PeerFinder_test.cpp b/src/test/peerfinder/PeerFinder_test.cpp index feabe69b647..a1cb8d7408d 100644 --- a/src/test/peerfinder/PeerFinder_test.cpp +++ b/src/test/peerfinder/PeerFinder_test.cpp @@ -17,15 +17,15 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { namespace PeerFinder { diff --git a/src/test/protocol/ApiVersion_test.cpp b/src/test/protocol/ApiVersion_test.cpp index 81ff0184e1e..7d634dc569d 100644 --- a/src/test/protocol/ApiVersion_test.cpp +++ b/src/test/protocol/ApiVersion_test.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/test/protocol/BuildInfo_test.cpp b/src/test/protocol/BuildInfo_test.cpp index 82ad4d67963..2c40681603c 100644 --- a/src/test/protocol/BuildInfo_test.cpp +++ b/src/test/protocol/BuildInfo_test.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include namespace ripple { diff --git a/src/test/protocol/Hooks_test.cpp b/src/test/protocol/Hooks_test.cpp index 1f71abb3af7..fb61d10a739 100644 --- a/src/test/protocol/Hooks_test.cpp +++ b/src/test/protocol/Hooks_test.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include #include +#include +#include +#include #include namespace ripple { diff --git a/src/test/protocol/InnerObjectFormats_test.cpp b/src/test/protocol/InnerObjectFormats_test.cpp index 009ceef2563..cfc8d123c22 100644 --- a/src/test/protocol/InnerObjectFormats_test.cpp +++ b/src/test/protocol/InnerObjectFormats_test.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include -#include -#include // Json::Reader -#include // RPC::containsError -#include -#include // STParsedJSONObject #include +#include +#include +#include // Json::Reader +#include // RPC::containsError +#include +#include // STParsedJSONObject namespace ripple { diff --git a/src/test/protocol/Issue_test.cpp b/src/test/protocol/Issue_test.cpp index 44eb6e0c0e3..7ec1507e04b 100644 --- a/src/test/protocol/Issue_test.cpp +++ b/src/test/protocol/Issue_test.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/src/test/protocol/Memo_test.cpp b/src/test/protocol/Memo_test.cpp index e119ee76eec..bd63e7003ad 100644 --- a/src/test/protocol/Memo_test.cpp +++ b/src/test/protocol/Memo_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include #include +#include +#include namespace ripple { diff --git a/src/test/protocol/MultiApiJson_test.cpp b/src/test/protocol/MultiApiJson_test.cpp index a7b0e7e9aec..2c0b410f899 100644 --- a/src/test/protocol/MultiApiJson_test.cpp +++ b/src/test/protocol/MultiApiJson_test.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include #include #include diff --git a/src/test/protocol/PublicKey_test.cpp b/src/test/protocol/PublicKey_test.cpp index 040d752f481..7fa798d1483 100644 --- a/src/test/protocol/PublicKey_test.cpp +++ b/src/test/protocol/PublicKey_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include -#include +#include +#include +#include #include namespace ripple { diff --git a/src/test/protocol/Quality_test.cpp b/src/test/protocol/Quality_test.cpp index a36591b0247..741a341d980 100644 --- a/src/test/protocol/Quality_test.cpp +++ b/src/test/protocol/Quality_test.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include #include namespace ripple { diff --git a/src/test/protocol/STAccount_test.cpp b/src/test/protocol/STAccount_test.cpp index f8f79752a5a..034e0e9e087 100644 --- a/src/test/protocol/STAccount_test.cpp +++ b/src/test/protocol/STAccount_test.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include namespace ripple { diff --git a/src/test/protocol/STAmount_test.cpp b/src/test/protocol/STAmount_test.cpp index bd3e96694fd..e48d0500ba6 100644 --- a/src/test/protocol/STAmount_test.cpp +++ b/src/test/protocol/STAmount_test.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include -#include +#include +#include +#include +#include namespace ripple { diff --git a/src/test/protocol/STObject_test.cpp b/src/test/protocol/STObject_test.cpp index 34d1cc82fac..39a5b9c2f65 100644 --- a/src/test/protocol/STObject_test.cpp +++ b/src/test/protocol/STObject_test.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/test/protocol/STTx_test.cpp b/src/test/protocol/STTx_test.cpp index f41c283e3ab..e0f6796af33 100644 --- a/src/test/protocol/STTx_test.cpp +++ b/src/test/protocol/STTx_test.cpp @@ -17,17 +17,17 @@ */ //============================================================================== -#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/test/protocol/STValidation_test.cpp b/src/test/protocol/STValidation_test.cpp index 3435db22ca7..8efb5847488 100644 --- a/src/test/protocol/STValidation_test.cpp +++ b/src/test/protocol/STValidation_test.cpp @@ -17,16 +17,16 @@ */ //============================================================================== -#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/test/protocol/SecretKey_test.cpp b/src/test/protocol/SecretKey_test.cpp index 08a19124508..bce89bce734 100644 --- a/src/test/protocol/SecretKey_test.cpp +++ b/src/test/protocol/SecretKey_test.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/test/protocol/Seed_test.cpp b/src/test/protocol/Seed_test.cpp index 86cf449e1ca..3619e84541e 100644 --- a/src/test/protocol/Seed_test.cpp +++ b/src/test/protocol/Seed_test.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/test/protocol/SeqProxy_test.cpp b/src/test/protocol/SeqProxy_test.cpp index 99a29dfe000..5e44bca5b40 100644 --- a/src/test/protocol/SeqProxy_test.cpp +++ b/src/test/protocol/SeqProxy_test.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include #include #include diff --git a/src/test/protocol/TER_test.cpp b/src/test/protocol/TER_test.cpp index 3cf21db2c0a..a43fd8758ad 100644 --- a/src/test/protocol/TER_test.cpp +++ b/src/test/protocol/TER_test.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include #include #include diff --git a/src/test/protocol/types_test.cpp b/src/test/protocol/types_test.cpp index 2ae7d15ef5c..ac4314df640 100644 --- a/src/test/protocol/types_test.cpp +++ b/src/test/protocol/types_test.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include namespace ripple { diff --git a/src/test/resource/Logic_test.cpp b/src/test/resource/Logic_test.cpp index 25379370f4d..b445890c326 100644 --- a/src/test/resource/Logic_test.cpp +++ b/src/test/resource/Logic_test.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/test/rpc/AMMInfo_test.cpp b/src/test/rpc/AMMInfo_test.cpp index 664a0c04cd5..e4523bb0473 100644 --- a/src/test/rpc/AMMInfo_test.cpp +++ b/src/test/rpc/AMMInfo_test.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include -#include #include #include #include +#include +#include #include diff --git a/src/test/rpc/AccountCurrencies_test.cpp b/src/test/rpc/AccountCurrencies_test.cpp index c3e46a3e66c..472dc02c438 100644 --- a/src/test/rpc/AccountCurrencies_test.cpp +++ b/src/test/rpc/AccountCurrencies_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include #include +#include +#include namespace ripple { diff --git a/src/test/rpc/AccountInfo_test.cpp b/src/test/rpc/AccountInfo_test.cpp index ff23a5e53c1..8c69dce13d1 100644 --- a/src/test/rpc/AccountInfo_test.cpp +++ b/src/test/rpc/AccountInfo_test.cpp @@ -17,15 +17,15 @@ */ //============================================================================== -#include -#include #include +#include +#include -#include -#include -#include #include #include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/rpc/AccountLinesRPC_test.cpp b/src/test/rpc/AccountLinesRPC_test.cpp index 04688156d12..3c25dbe7810 100644 --- a/src/test/rpc/AccountLinesRPC_test.cpp +++ b/src/test/rpc/AccountLinesRPC_test.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include -#include -#include -#include #include +#include +#include +#include +#include namespace ripple { diff --git a/src/test/rpc/AccountObjects_test.cpp b/src/test/rpc/AccountObjects_test.cpp index 17217f2c880..0757ca40bf0 100644 --- a/src/test/rpc/AccountObjects_test.cpp +++ b/src/test/rpc/AccountObjects_test.cpp @@ -17,13 +17,15 @@ */ //============================================================================== -#include -#include -#include -#include #include #include #include +#include +#include +#include +#include +#include +#include #include @@ -556,11 +558,11 @@ class AccountObjects_test : public beast::unit_test::suite Env env(*this, features); // Make a lambda we can use to get "account_objects" easily. - auto acct_objs = [&env]( - AccountID const& acct, - std::optional const& type, - std::optional limit = std::nullopt, - std::optional marker = std::nullopt) { + auto acctObjs = [&env]( + AccountID const& acct, + std::optional const& type, + std::optional limit = std::nullopt, + std::optional marker = std::nullopt) { Json::Value params; params[jss::account] = to_string(acct); if (type) @@ -574,32 +576,42 @@ class AccountObjects_test : public beast::unit_test::suite }; // Make a lambda that easily identifies the size of account objects. - auto acct_objs_is_size = [](Json::Value const& resp, unsigned size) { + auto acctObjsIsSize = [](Json::Value const& resp, unsigned size) { return resp[jss::result][jss::account_objects].isArray() && (resp[jss::result][jss::account_objects].size() == size); }; + // Make a lambda that checks if the response has error for invalid type + auto acctObjsTypeIsInvalid = [](Json::Value const& resp) { + return resp[jss::result].isMember(jss::error) && + resp[jss::result][jss::error_message] == + "Invalid field \'type\'."; + }; + env.fund(XRP(10000), gw, alice); env.close(); // Since the account is empty now, all account objects should come // back empty. - BEAST_EXPECT(acct_objs_is_size(acct_objs(gw, jss::account), 0)); - BEAST_EXPECT(acct_objs_is_size(acct_objs(gw, jss::amendments), 0)); - BEAST_EXPECT(acct_objs_is_size(acct_objs(gw, jss::check), 0)); - BEAST_EXPECT(acct_objs_is_size(acct_objs(gw, jss::deposit_preauth), 0)); - BEAST_EXPECT(acct_objs_is_size(acct_objs(gw, jss::directory), 0)); - BEAST_EXPECT(acct_objs_is_size(acct_objs(gw, jss::escrow), 0)); - BEAST_EXPECT(acct_objs_is_size(acct_objs(gw, jss::fee), 0)); - BEAST_EXPECT(acct_objs_is_size(acct_objs(gw, jss::hashes), 0)); - BEAST_EXPECT(acct_objs_is_size(acct_objs(gw, jss::nft_page), 0)); - BEAST_EXPECT(acct_objs_is_size(acct_objs(gw, jss::offer), 0)); - BEAST_EXPECT(acct_objs_is_size(acct_objs(gw, jss::payment_channel), 0)); - BEAST_EXPECT(acct_objs_is_size(acct_objs(gw, jss::signer_list), 0)); - BEAST_EXPECT(acct_objs_is_size(acct_objs(gw, jss::state), 0)); - BEAST_EXPECT(acct_objs_is_size(acct_objs(gw, jss::ticket), 0)); - BEAST_EXPECT(acct_objs_is_size(acct_objs(gw, jss::amm), 0)); - BEAST_EXPECT(acct_objs_is_size(acct_objs(gw, jss::did), 0)); + BEAST_EXPECT(acctObjsIsSize(acctObjs(gw, jss::account), 0)); + BEAST_EXPECT(acctObjsIsSize(acctObjs(gw, jss::check), 0)); + BEAST_EXPECT(acctObjsIsSize(acctObjs(gw, jss::deposit_preauth), 0)); + BEAST_EXPECT(acctObjsIsSize(acctObjs(gw, jss::escrow), 0)); + BEAST_EXPECT(acctObjsIsSize(acctObjs(gw, jss::nft_page), 0)); + BEAST_EXPECT(acctObjsIsSize(acctObjs(gw, jss::offer), 0)); + BEAST_EXPECT(acctObjsIsSize(acctObjs(gw, jss::payment_channel), 0)); + BEAST_EXPECT(acctObjsIsSize(acctObjs(gw, jss::signer_list), 0)); + BEAST_EXPECT(acctObjsIsSize(acctObjs(gw, jss::state), 0)); + BEAST_EXPECT(acctObjsIsSize(acctObjs(gw, jss::ticket), 0)); + BEAST_EXPECT(acctObjsIsSize(acctObjs(gw, jss::amm), 0)); + BEAST_EXPECT(acctObjsIsSize(acctObjs(gw, jss::did), 0)); + + // we expect invalid field type reported for the following types + BEAST_EXPECT(acctObjsTypeIsInvalid(acctObjs(gw, jss::amendments))); + BEAST_EXPECT(acctObjsTypeIsInvalid(acctObjs(gw, jss::directory))); + BEAST_EXPECT(acctObjsTypeIsInvalid(acctObjs(gw, jss::fee))); + BEAST_EXPECT(acctObjsTypeIsInvalid(acctObjs(gw, jss::hashes))); + BEAST_EXPECT(acctObjsTypeIsInvalid(acctObjs(gw, jss::NegativeUNL))); // gw mints an NFT so we can find it. uint256 const nftID{token::getNextID(env, gw, 0u, tfTransferable)}; @@ -607,8 +619,8 @@ class AccountObjects_test : public beast::unit_test::suite env.close(); { // Find the NFToken page and make sure it's the right one. - Json::Value const resp = acct_objs(gw, jss::nft_page); - BEAST_EXPECT(acct_objs_is_size(resp, 1)); + Json::Value const resp = acctObjs(gw, jss::nft_page); + BEAST_EXPECT(acctObjsIsSize(resp, 1)); auto const& nftPage = resp[jss::result][jss::account_objects][0u]; BEAST_EXPECT(nftPage[sfNFTokens.jsonName].size() == 1); @@ -624,8 +636,8 @@ class AccountObjects_test : public beast::unit_test::suite env.close(); { // Find the trustline and make sure it's the right one. - Json::Value const resp = acct_objs(gw, jss::state); - BEAST_EXPECT(acct_objs_is_size(resp, 1)); + Json::Value const resp = acctObjs(gw, jss::state); + BEAST_EXPECT(acctObjsIsSize(resp, 1)); auto const& state = resp[jss::result][jss::account_objects][0u]; BEAST_EXPECT(state[sfBalance.jsonName][jss::value].asInt() == -5); @@ -637,8 +649,8 @@ class AccountObjects_test : public beast::unit_test::suite env.close(); { // Find the check. - Json::Value const resp = acct_objs(gw, jss::check); - BEAST_EXPECT(acct_objs_is_size(resp, 1)); + Json::Value const resp = acctObjs(gw, jss::check); + BEAST_EXPECT(acctObjsIsSize(resp, 1)); auto const& check = resp[jss::result][jss::account_objects][0u]; BEAST_EXPECT(check[sfAccount.jsonName] == gw.human()); @@ -650,8 +662,8 @@ class AccountObjects_test : public beast::unit_test::suite env.close(); { // Find the preauthorization. - Json::Value const resp = acct_objs(gw, jss::deposit_preauth); - BEAST_EXPECT(acct_objs_is_size(resp, 1)); + Json::Value const resp = acctObjs(gw, jss::deposit_preauth); + BEAST_EXPECT(acctObjsIsSize(resp, 1)); auto const& preauth = resp[jss::result][jss::account_objects][0u]; BEAST_EXPECT(preauth[sfAccount.jsonName] == gw.human()); @@ -672,8 +684,8 @@ class AccountObjects_test : public beast::unit_test::suite } { // Find the escrow. - Json::Value const resp = acct_objs(gw, jss::escrow); - BEAST_EXPECT(acct_objs_is_size(resp, 1)); + Json::Value const resp = acctObjs(gw, jss::escrow); + BEAST_EXPECT(acctObjsIsSize(resp, 1)); auto const& escrow = resp[jss::result][jss::account_objects][0u]; BEAST_EXPECT(escrow[sfAccount.jsonName] == gw.human()); @@ -686,7 +698,7 @@ class AccountObjects_test : public beast::unit_test::suite Env scEnv(*this, envconfig(port_increment, 3), features); x.createScBridgeObjects(scEnv); - auto scenv_acct_objs = [&](Account const& acct, char const* type) { + auto scEnvAcctObjs = [&](Account const& acct, char const* type) { Json::Value params; params[jss::account] = acct.human(); params[jss::type] = type; @@ -695,9 +707,9 @@ class AccountObjects_test : public beast::unit_test::suite }; Json::Value const resp = - scenv_acct_objs(Account::master, jss::bridge); + scEnvAcctObjs(Account::master, jss::bridge); - BEAST_EXPECT(acct_objs_is_size(resp, 1)); + BEAST_EXPECT(acctObjsIsSize(resp, 1)); auto const& acct_bridge = resp[jss::result][jss::account_objects][0u]; BEAST_EXPECT( @@ -733,7 +745,7 @@ class AccountObjects_test : public beast::unit_test::suite scEnv(xchain_create_claim_id(x.scBob, x.jvb, x.reward, x.mcBob)); scEnv.close(); - auto scenv_acct_objs = [&](Account const& acct, char const* type) { + auto scEnvAcctObjs = [&](Account const& acct, char const* type) { Json::Value params; params[jss::account] = acct.human(); params[jss::type] = type; @@ -744,8 +756,8 @@ class AccountObjects_test : public beast::unit_test::suite { // Find the xchain sequence number for Andrea. Json::Value const resp = - scenv_acct_objs(x.scAlice, jss::xchain_owned_claim_id); - BEAST_EXPECT(acct_objs_is_size(resp, 1)); + scEnvAcctObjs(x.scAlice, jss::xchain_owned_claim_id); + BEAST_EXPECT(acctObjsIsSize(resp, 1)); auto const& xchain_seq = resp[jss::result][jss::account_objects][0u]; @@ -757,8 +769,8 @@ class AccountObjects_test : public beast::unit_test::suite { // and the one for Bob Json::Value const resp = - scenv_acct_objs(x.scBob, jss::xchain_owned_claim_id); - BEAST_EXPECT(acct_objs_is_size(resp, 1)); + scEnvAcctObjs(x.scBob, jss::xchain_owned_claim_id); + BEAST_EXPECT(acctObjsIsSize(resp, 1)); auto const& xchain_seq = resp[jss::result][jss::account_objects][0u]; @@ -790,7 +802,7 @@ class AccountObjects_test : public beast::unit_test::suite x.signers[0])); scEnv.close(); - auto scenv_acct_objs = [&](Account const& acct, char const* type) { + auto scEnvAcctObjs = [&](Account const& acct, char const* type) { Json::Value params; params[jss::account] = acct.human(); params[jss::type] = type; @@ -800,9 +812,9 @@ class AccountObjects_test : public beast::unit_test::suite { // Find the xchain_create_account_claim_id - Json::Value const resp = scenv_acct_objs( + Json::Value const resp = scEnvAcctObjs( Account::master, jss::xchain_owned_create_account_claim_id); - BEAST_EXPECT(acct_objs_is_size(resp, 1)); + BEAST_EXPECT(acctObjsIsSize(resp, 1)); auto const& xchain_create_account_claim_id = resp[jss::result][jss::account_objects][0u]; @@ -821,8 +833,8 @@ class AccountObjects_test : public beast::unit_test::suite env.close(); { // Find the offer. - Json::Value const resp = acct_objs(gw, jss::offer); - BEAST_EXPECT(acct_objs_is_size(resp, 1)); + Json::Value const resp = acctObjs(gw, jss::offer); + BEAST_EXPECT(acctObjsIsSize(resp, 1)); auto const& offer = resp[jss::result][jss::account_objects][0u]; BEAST_EXPECT(offer[sfAccount.jsonName] == gw.human()); @@ -846,8 +858,8 @@ class AccountObjects_test : public beast::unit_test::suite } { // Find the payment channel. - Json::Value const resp = acct_objs(gw, jss::payment_channel); - BEAST_EXPECT(acct_objs_is_size(resp, 1)); + Json::Value const resp = acctObjs(gw, jss::payment_channel); + BEAST_EXPECT(acctObjsIsSize(resp, 1)); auto const& payChan = resp[jss::result][jss::account_objects][0u]; BEAST_EXPECT(payChan[sfAccount.jsonName] == gw.human()); @@ -868,8 +880,8 @@ class AccountObjects_test : public beast::unit_test::suite } { // Find the DID. - Json::Value const resp = acct_objs(gw, jss::did); - BEAST_EXPECT(acct_objs_is_size(resp, 1)); + Json::Value const resp = acctObjs(gw, jss::did); + BEAST_EXPECT(acctObjsIsSize(resp, 1)); auto const& did = resp[jss::result][jss::account_objects][0u]; BEAST_EXPECT(did[sfAccount.jsonName] == gw.human()); @@ -880,8 +892,8 @@ class AccountObjects_test : public beast::unit_test::suite env.close(); { // Find the signer list. - Json::Value const resp = acct_objs(gw, jss::signer_list); - BEAST_EXPECT(acct_objs_is_size(resp, 1)); + Json::Value const resp = acctObjs(gw, jss::signer_list); + BEAST_EXPECT(acctObjsIsSize(resp, 1)); auto const& signerList = resp[jss::result][jss::account_objects][0u]; @@ -896,8 +908,8 @@ class AccountObjects_test : public beast::unit_test::suite env.close(); { // Find the ticket. - Json::Value const resp = acct_objs(gw, jss::ticket); - BEAST_EXPECT(acct_objs_is_size(resp, 1)); + Json::Value const resp = acctObjs(gw, jss::ticket); + BEAST_EXPECT(acctObjsIsSize(resp, 1)); auto const& ticket = resp[jss::result][jss::account_objects][0u]; BEAST_EXPECT(ticket[sfAccount.jsonName] == gw.human()); @@ -925,7 +937,7 @@ class AccountObjects_test : public beast::unit_test::suite std::uint32_t const expectedAccountObjects{ static_cast(std::size(expectedLedgerTypes))}; - if (BEAST_EXPECT(acct_objs_is_size(resp, expectedAccountObjects))) + if (BEAST_EXPECT(acctObjsIsSize(resp, expectedAccountObjects))) { auto const& aobjs = resp[jss::result][jss::account_objects]; std::vector gotLedgerTypes; @@ -948,7 +960,7 @@ class AccountObjects_test : public beast::unit_test::suite params[jss::type] = jss::escrow; auto resp = env.rpc("json", "account_objects", to_string(params)); - if (BEAST_EXPECT(acct_objs_is_size(resp, 1u))) + if (BEAST_EXPECT(acctObjsIsSize(resp, 1u))) { auto const& aobjs = resp[jss::result][jss::account_objects]; BEAST_EXPECT(aobjs[0u]["LedgerEntryType"] == jss::Escrow); @@ -969,7 +981,7 @@ class AccountObjects_test : public beast::unit_test::suite auto expectObjects = [&](Json::Value const& resp, std::vector const& types) -> bool { - if (!acct_objs_is_size(resp, types.size())) + if (!acctObjsIsSize(resp, types.size())) return false; std::vector typesOut; getTypes(resp, typesOut); @@ -983,13 +995,13 @@ class AccountObjects_test : public beast::unit_test::suite BEAST_EXPECT(lines[jss::lines].size() == 3); // request AMM only, doesn't depend on the limit BEAST_EXPECT( - acct_objs_is_size(acct_objs(amm.ammAccount(), jss::amm), 1)); + acctObjsIsSize(acctObjs(amm.ammAccount(), jss::amm), 1)); // request first two objects - auto resp = acct_objs(amm.ammAccount(), std::nullopt, 2); + auto resp = acctObjs(amm.ammAccount(), std::nullopt, 2); std::vector typesOut; getTypes(resp, typesOut); // request next two objects - resp = acct_objs( + resp = acctObjs( amm.ammAccount(), std::nullopt, 10, @@ -1003,7 +1015,7 @@ class AccountObjects_test : public beast::unit_test::suite jss::RippleState.c_str(), jss::RippleState.c_str()})); // filter by state: there are three trustlines - resp = acct_objs(amm.ammAccount(), jss::state, 10); + resp = acctObjs(amm.ammAccount(), jss::state, 10); BEAST_EXPECT(expectObjects( resp, {jss::RippleState.c_str(), @@ -1011,11 +1023,18 @@ class AccountObjects_test : public beast::unit_test::suite jss::RippleState.c_str()})); // AMM account doesn't own offers BEAST_EXPECT( - acct_objs_is_size(acct_objs(amm.ammAccount(), jss::offer), 0)); + acctObjsIsSize(acctObjs(amm.ammAccount(), jss::offer), 0)); // gw account doesn't own AMM object - BEAST_EXPECT(acct_objs_is_size(acct_objs(gw, jss::amm), 0)); + BEAST_EXPECT(acctObjsIsSize(acctObjs(gw, jss::amm), 0)); } + // we still expect invalid field type reported for the following types + BEAST_EXPECT(acctObjsTypeIsInvalid(acctObjs(gw, jss::amendments))); + BEAST_EXPECT(acctObjsTypeIsInvalid(acctObjs(gw, jss::directory))); + BEAST_EXPECT(acctObjsTypeIsInvalid(acctObjs(gw, jss::fee))); + BEAST_EXPECT(acctObjsTypeIsInvalid(acctObjs(gw, jss::hashes))); + BEAST_EXPECT(acctObjsTypeIsInvalid(acctObjs(gw, jss::NegativeUNL))); + // Run up the number of directory entries so gw has two // directory nodes. for (int d = 1'000'032; d >= 1'000'000; --d) @@ -1025,11 +1044,129 @@ class AccountObjects_test : public beast::unit_test::suite } // Verify that the non-returning types still don't return anything. - BEAST_EXPECT(acct_objs_is_size(acct_objs(gw, jss::account), 0)); - BEAST_EXPECT(acct_objs_is_size(acct_objs(gw, jss::amendments), 0)); - BEAST_EXPECT(acct_objs_is_size(acct_objs(gw, jss::directory), 0)); - BEAST_EXPECT(acct_objs_is_size(acct_objs(gw, jss::fee), 0)); - BEAST_EXPECT(acct_objs_is_size(acct_objs(gw, jss::hashes), 0)); + BEAST_EXPECT(acctObjsIsSize(acctObjs(gw, jss::account), 0)); + } + + void + testNFTsMarker() + { + // there's some bug found in account_nfts method that it did not + // return invalid params when providing unassociated nft marker. + // this test tests both situations when providing valid nft marker + // and unassociated nft marker. + testcase("NFTsMarker"); + + using namespace jtx; + Env env(*this); + + Account const bob{"bob"}; + env.fund(XRP(10000), bob); + + static constexpr unsigned nftsSize = 10; + for (unsigned i = 0; i < nftsSize; i++) + { + env(token::mint(bob, 0)); + } + + env.close(); + + // save the NFTokenIDs to use later + std::vector tokenIDs; + { + Json::Value params; + params[jss::account] = bob.human(); + params[jss::ledger_index] = "validated"; + Json::Value const resp = + env.rpc("json", "account_nfts", to_string(params)); + Json::Value const& nfts = resp[jss::result][jss::account_nfts]; + for (Json::Value const& nft : nfts) + tokenIDs.push_back(nft["NFTokenID"]); + } + + // this lambda function is used to check if the account_nfts method + // returns the correct token information. lastIndex is used to query the + // last marker. + auto compareNFTs = [&tokenIDs, &env, &bob]( + unsigned const limit, unsigned const lastIndex) { + Json::Value params; + params[jss::account] = bob.human(); + params[jss::limit] = limit; + params[jss::marker] = tokenIDs[lastIndex]; + params[jss::ledger_index] = "validated"; + Json::Value const resp = + env.rpc("json", "account_nfts", to_string(params)); + + if (resp[jss::result].isMember(jss::error)) + return false; + + Json::Value const& nfts = resp[jss::result][jss::account_nfts]; + unsigned const nftsCount = tokenIDs.size() - lastIndex - 1 < limit + ? tokenIDs.size() - lastIndex - 1 + : limit; + + if (nfts.size() != nftsCount) + return false; + + for (unsigned i = 0; i < nftsCount; i++) + { + if (nfts[i]["NFTokenID"] != tokenIDs[lastIndex + 1 + i]) + return false; + } + + return true; + }; + + // test a valid marker which is equal to the third tokenID + BEAST_EXPECT(compareNFTs(4, 2)); + + // test a valid marker which is equal to the 8th tokenID + BEAST_EXPECT(compareNFTs(4, 7)); + + // lambda that holds common code for invalid cases. + auto testInvalidMarker = [&env, &bob]( + auto marker, char const* errorMessage) { + Json::Value params; + params[jss::account] = bob.human(); + params[jss::limit] = 4; + params[jss::ledger_index] = jss::validated; + params[jss::marker] = marker; + Json::Value const resp = + env.rpc("json", "account_nfts", to_string(params)); + return resp[jss::result][jss::error_message] == errorMessage; + }; + + // test an invalid marker that is not a string + BEAST_EXPECT( + testInvalidMarker(17, "Invalid field \'marker\', not string.")); + + // test an invalid marker that has a non-hex character + BEAST_EXPECT(testInvalidMarker( + "00000000F51DFC2A09D62CBBA1DFBDD4691DAC96AD98B900000000000000000G", + "Invalid field \'marker\'.")); + + // this lambda function is used to create some fake marker using given + // taxon and sequence because we want to test some unassociated markers + // later + auto createFakeNFTMarker = [](AccountID const& issuer, + std::uint32_t taxon, + std::uint32_t tokenSeq, + std::uint16_t flags = 0, + std::uint16_t fee = 0) { + // the marker has the exact same format as an NFTokenID + return to_string(NFTokenMint::createNFTokenID( + flags, fee, issuer, nft::toTaxon(taxon), tokenSeq)); + }; + + // test an unassociated marker which does not exist in the NFTokenIDs + BEAST_EXPECT(testInvalidMarker( + createFakeNFTMarker(bob.id(), 0x000000000, 0x00000000), + "Invalid field \'marker\'.")); + + // test an unassociated marker which exceeds the maximum value of the + // existing NFTokenID + BEAST_EXPECT(testInvalidMarker( + createFakeNFTMarker(bob.id(), 0xFFFFFFFF, 0xFFFFFFFF), + "Invalid field \'marker\'.")); } void @@ -1039,6 +1176,7 @@ class AccountObjects_test : public beast::unit_test::suite testUnsteppedThenStepped(); testUnsteppedThenSteppedWithNFTs(); testObjectTypes(); + testNFTsMarker(); } }; diff --git a/src/test/rpc/AccountOffers_test.cpp b/src/test/rpc/AccountOffers_test.cpp index d94442ea8e5..d53fb9ecb0b 100644 --- a/src/test/rpc/AccountOffers_test.cpp +++ b/src/test/rpc/AccountOffers_test.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/rpc/AccountSet_test.cpp b/src/test/rpc/AccountSet_test.cpp index 3fa214c5b4e..e5475e3f530 100644 --- a/src/test/rpc/AccountSet_test.cpp +++ b/src/test/rpc/AccountSet_test.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/test/rpc/AccountTx_test.cpp b/src/test/rpc/AccountTx_test.cpp index 6601996925e..54ca3f1f418 100644 --- a/src/test/rpc/AccountTx_test.cpp +++ b/src/test/rpc/AccountTx_test.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include #include +#include +#include +#include #include diff --git a/src/test/rpc/AmendmentBlocked_test.cpp b/src/test/rpc/AmendmentBlocked_test.cpp index a90bcdcd0c4..196ce0e463d 100644 --- a/src/test/rpc/AmendmentBlocked_test.cpp +++ b/src/test/rpc/AmendmentBlocked_test.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include -#include -#include -#include #include #include +#include +#include +#include +#include namespace ripple { diff --git a/src/test/rpc/Book_test.cpp b/src/test/rpc/Book_test.cpp index fcc0017f539..6bcc0c20809 100644 --- a/src/test/rpc/Book_test.cpp +++ b/src/test/rpc/Book_test.cpp @@ -15,12 +15,12 @@ */ //============================================================================== -#include -#include -#include -#include #include #include +#include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/rpc/DeliveredAmount_test.cpp b/src/test/rpc/DeliveredAmount_test.cpp index c17bd0c025d..9ed858e2a33 100644 --- a/src/test/rpc/DeliveredAmount_test.cpp +++ b/src/test/rpc/DeliveredAmount_test.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include -#include -#include #include #include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/rpc/DepositAuthorized_test.cpp b/src/test/rpc/DepositAuthorized_test.cpp index 128d91f739d..ebabe1fbe3f 100644 --- a/src/test/rpc/DepositAuthorized_test.cpp +++ b/src/test/rpc/DepositAuthorized_test.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/rpc/Feature_test.cpp b/src/test/rpc/Feature_test.cpp index 010a61fbfcc..488255542f2 100644 --- a/src/test/rpc/Feature_test.cpp +++ b/src/test/rpc/Feature_test.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include #include +#include +#include +#include namespace ripple { diff --git a/src/test/rpc/GRPCTestClientBase.h b/src/test/rpc/GRPCTestClientBase.h index a5c613f55e2..f8b74ed6d5c 100644 --- a/src/test/rpc/GRPCTestClientBase.h +++ b/src/test/rpc/GRPCTestClientBase.h @@ -20,9 +20,9 @@ #ifndef RIPPLED_GRPCTESTCLIENTBASE_H #define RIPPLED_GRPCTESTCLIENTBASE_H -#include -#include #include +#include +#include namespace ripple { namespace test { diff --git a/src/test/rpc/GatewayBalances_test.cpp b/src/test/rpc/GatewayBalances_test.cpp index 4c6ec9aaf1b..4e847c8dbdd 100644 --- a/src/test/rpc/GatewayBalances_test.cpp +++ b/src/test/rpc/GatewayBalances_test.cpp @@ -15,12 +15,12 @@ */ //============================================================================== -#include -#include -#include -#include #include #include +#include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/rpc/GetAggregatePrice_test.cpp b/src/test/rpc/GetAggregatePrice_test.cpp index 1fb263bbc55..aad3c9be99f 100644 --- a/src/test/rpc/GetAggregatePrice_test.cpp +++ b/src/test/rpc/GetAggregatePrice_test.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include #include #include +#include +#include namespace ripple { namespace test { diff --git a/src/test/rpc/GetCounts_test.cpp b/src/test/rpc/GetCounts_test.cpp index 52b645ed717..132ed93d7be 100644 --- a/src/test/rpc/GetCounts_test.cpp +++ b/src/test/rpc/GetCounts_test.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include -#include -#include -#include #include +#include +#include +#include +#include namespace ripple { diff --git a/src/test/rpc/Handler_test.cpp b/src/test/rpc/Handler_test.cpp index 5160a68aac2..2c3bfd30d4c 100644 --- a/src/test/rpc/Handler_test.cpp +++ b/src/test/rpc/Handler_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include #include +#include +#include #include #include diff --git a/src/test/rpc/JSONRPC_test.cpp b/src/test/rpc/JSONRPC_test.cpp index 8fd453ee9f6..b2b9e7a55b8 100644 --- a/src/test/rpc/JSONRPC_test.cpp +++ b/src/test/rpc/JSONRPC_test.cpp @@ -17,17 +17,17 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/test/rpc/KeyGeneration_test.cpp b/src/test/rpc/KeyGeneration_test.cpp index 28f9afd3b7f..e136bb04beb 100644 --- a/src/test/rpc/KeyGeneration_test.cpp +++ b/src/test/rpc/KeyGeneration_test.cpp @@ -16,13 +16,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ //============================================================================== -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/test/rpc/LedgerClosed_test.cpp b/src/test/rpc/LedgerClosed_test.cpp index 2f81031f85c..c3f7f900e3c 100644 --- a/src/test/rpc/LedgerClosed_test.cpp +++ b/src/test/rpc/LedgerClosed_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include #include +#include +#include namespace ripple { diff --git a/src/test/rpc/LedgerData_test.cpp b/src/test/rpc/LedgerData_test.cpp index f0811ba34c4..1e4f97a935f 100644 --- a/src/test/rpc/LedgerData_test.cpp +++ b/src/test/rpc/LedgerData_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include #include +#include +#include namespace ripple { @@ -300,201 +300,214 @@ class LedgerData_test : public beast::unit_test::suite { // Put a bunch of different LedgerEntryTypes into a ledger using namespace test::jtx; - using namespace std::chrono; - Env env{*this, envconfig(validator, "")}; - Account const gw{"gateway"}; - auto const USD = gw["USD"]; - env.fund(XRP(100000), gw); - - auto makeRequest = [&env](Json::StaticString const& type) { - Json::Value jvParams; - jvParams[jss::ledger_index] = "current"; - jvParams[jss::type] = type; - return env.rpc( - "json", - "ledger_data", - boost::lexical_cast(jvParams))[jss::result]; - }; - - // Assert that state is an empty array. - for (auto const& type : - {jss::amendments, - jss::check, - jss::directory, - jss::offer, - jss::signer_list, - jss::state, - jss::ticket, - jss::escrow, - jss::payment_channel, - jss::deposit_preauth}) + // Make sure fixInnerObjTemplate2 doesn't break amendments. + for (FeatureBitset const& features : + {supported_amendments() - fixInnerObjTemplate2, + supported_amendments() | fixInnerObjTemplate2}) { - auto const jrr = makeRequest(type); - BEAST_EXPECT(checkArraySize(jrr[jss::state], 0)); - } + using namespace std::chrono; + Env env{*this, envconfig(validator, ""), features}; + + Account const gw{"gateway"}; + auto const USD = gw["USD"]; + env.fund(XRP(100000), gw); + + auto makeRequest = [&env](Json::StaticString const& type) { + Json::Value jvParams; + jvParams[jss::ledger_index] = "current"; + jvParams[jss::type] = type; + return env.rpc( + "json", + "ledger_data", + boost::lexical_cast(jvParams))[jss::result]; + }; + + // Assert that state is an empty array. + for (auto const& type : + {jss::amendments, + jss::check, + jss::directory, + jss::offer, + jss::signer_list, + jss::state, + jss::ticket, + jss::escrow, + jss::payment_channel, + jss::deposit_preauth}) + { + auto const jrr = makeRequest(type); + BEAST_EXPECT(checkArraySize(jrr[jss::state], 0)); + } - int const num_accounts = 10; + int const num_accounts = 10; - for (auto i = 0; i < num_accounts; i++) - { - Account const bob{std::string("bob") + std::to_string(i)}; - env.fund(XRP(1000), bob); - } - env(offer(Account{"bob0"}, USD(100), XRP(100))); - env.trust(Account{"bob2"}["USD"](100), Account{"bob3"}); + for (auto i = 0; i < num_accounts; i++) + { + Account const bob{std::string("bob") + std::to_string(i)}; + env.fund(XRP(1000), bob); + } + env(offer(Account{"bob0"}, USD(100), XRP(100))); + env.trust(Account{"bob2"}["USD"](100), Account{"bob3"}); - auto majorities = getMajorityAmendments(*env.closed()); - for (int i = 0; i <= 256; ++i) - { - env.close(); - majorities = getMajorityAmendments(*env.closed()); - if (!majorities.empty()) - break; - } - env(signers( - Account{"bob0"}, 1, {{Account{"bob1"}, 1}, {Account{"bob2"}, 1}})); - env(ticket::create(env.master, 1)); + auto majorities = getMajorityAmendments(*env.closed()); + for (int i = 0; i <= 256; ++i) + { + env.close(); + majorities = getMajorityAmendments(*env.closed()); + if (!majorities.empty()) + break; + } - { - Json::Value jv; - jv[jss::TransactionType] = jss::EscrowCreate; - jv[jss::Flags] = tfUniversal; - jv[jss::Account] = Account{"bob5"}.human(); - jv[jss::Destination] = Account{"bob6"}.human(); - jv[jss::Amount] = XRP(50).value().getJson(JsonOptions::none); - jv[sfFinishAfter.fieldName] = NetClock::time_point{env.now() + 10s} - .time_since_epoch() - .count(); - env(jv); - } + env(signers( + Account{"bob0"}, + 1, + {{Account{"bob1"}, 1}, {Account{"bob2"}, 1}})); + env(ticket::create(env.master, 1)); - { - Json::Value jv; - jv[jss::TransactionType] = jss::PaymentChannelCreate; - jv[jss::Flags] = tfUniversal; - jv[jss::Account] = Account{"bob6"}.human(); - jv[jss::Destination] = Account{"bob7"}.human(); - jv[jss::Amount] = XRP(100).value().getJson(JsonOptions::none); - jv[jss::SettleDelay] = NetClock::duration{10s}.count(); - jv[sfPublicKey.fieldName] = strHex(Account{"bob6"}.pk().slice()); - jv[sfCancelAfter.fieldName] = NetClock::time_point{env.now() + 300s} - .time_since_epoch() - .count(); - env(jv); - } + { + Json::Value jv; + jv[jss::TransactionType] = jss::EscrowCreate; + jv[jss::Flags] = tfUniversal; + jv[jss::Account] = Account{"bob5"}.human(); + jv[jss::Destination] = Account{"bob6"}.human(); + jv[jss::Amount] = XRP(50).value().getJson(JsonOptions::none); + jv[sfFinishAfter.fieldName] = + NetClock::time_point{env.now() + 10s} + .time_since_epoch() + .count(); + env(jv); + } - env(check::create("bob6", "bob7", XRP(100))); + { + Json::Value jv; + jv[jss::TransactionType] = jss::PaymentChannelCreate; + jv[jss::Flags] = tfUniversal; + jv[jss::Account] = Account{"bob6"}.human(); + jv[jss::Destination] = Account{"bob7"}.human(); + jv[jss::Amount] = XRP(100).value().getJson(JsonOptions::none); + jv[jss::SettleDelay] = NetClock::duration{10s}.count(); + jv[sfPublicKey.fieldName] = + strHex(Account{"bob6"}.pk().slice()); + jv[sfCancelAfter.fieldName] = + NetClock::time_point{env.now() + 300s} + .time_since_epoch() + .count(); + env(jv); + } - // bob9 DepositPreauths bob4 and bob8. - env(deposit::auth(Account{"bob9"}, Account{"bob4"})); - env(deposit::auth(Account{"bob9"}, Account{"bob8"})); - env.close(); + env(check::create("bob6", "bob7", XRP(100))); - // Now fetch each type + // bob9 DepositPreauths bob4 and bob8. + env(deposit::auth(Account{"bob9"}, Account{"bob4"})); + env(deposit::auth(Account{"bob9"}, Account{"bob8"})); + env.close(); - { // jvParams[jss::type] = "account"; - auto const jrr = makeRequest(jss::account); - BEAST_EXPECT(checkArraySize(jrr[jss::state], 12)); - for (auto const& j : jrr[jss::state]) - BEAST_EXPECT(j["LedgerEntryType"] == jss::AccountRoot); - } + // Now fetch each type - { // jvParams[jss::type] = "amendments"; - auto const jrr = makeRequest(jss::amendments); - BEAST_EXPECT(checkArraySize(jrr[jss::state], 1)); - for (auto const& j : jrr[jss::state]) - BEAST_EXPECT(j["LedgerEntryType"] == jss::Amendments); - } + { // jvParams[jss::type] = "account"; + auto const jrr = makeRequest(jss::account); + BEAST_EXPECT(checkArraySize(jrr[jss::state], 12)); + for (auto const& j : jrr[jss::state]) + BEAST_EXPECT(j["LedgerEntryType"] == jss::AccountRoot); + } - { // jvParams[jss::type] = "check"; - auto const jrr = makeRequest(jss::check); - BEAST_EXPECT(checkArraySize(jrr[jss::state], 1)); - for (auto const& j : jrr[jss::state]) - BEAST_EXPECT(j["LedgerEntryType"] == jss::Check); - } + { // jvParams[jss::type] = "amendments"; + auto const jrr = makeRequest(jss::amendments); + BEAST_EXPECT(checkArraySize(jrr[jss::state], 1)); + for (auto const& j : jrr[jss::state]) + BEAST_EXPECT(j["LedgerEntryType"] == jss::Amendments); + } - { // jvParams[jss::type] = "directory"; - auto const jrr = makeRequest(jss::directory); - BEAST_EXPECT(checkArraySize(jrr[jss::state], 9)); - for (auto const& j : jrr[jss::state]) - BEAST_EXPECT(j["LedgerEntryType"] == jss::DirectoryNode); - } + { // jvParams[jss::type] = "check"; + auto const jrr = makeRequest(jss::check); + BEAST_EXPECT(checkArraySize(jrr[jss::state], 1)); + for (auto const& j : jrr[jss::state]) + BEAST_EXPECT(j["LedgerEntryType"] == jss::Check); + } - { // jvParams[jss::type] = "fee"; - auto const jrr = makeRequest(jss::fee); - BEAST_EXPECT(checkArraySize(jrr[jss::state], 1)); - for (auto const& j : jrr[jss::state]) - BEAST_EXPECT(j["LedgerEntryType"] == jss::FeeSettings); - } + { // jvParams[jss::type] = "directory"; + auto const jrr = makeRequest(jss::directory); + BEAST_EXPECT(checkArraySize(jrr[jss::state], 9)); + for (auto const& j : jrr[jss::state]) + BEAST_EXPECT(j["LedgerEntryType"] == jss::DirectoryNode); + } - { // jvParams[jss::type] = "hashes"; - auto const jrr = makeRequest(jss::hashes); - BEAST_EXPECT(checkArraySize(jrr[jss::state], 2)); - for (auto const& j : jrr[jss::state]) - BEAST_EXPECT(j["LedgerEntryType"] == jss::LedgerHashes); - } + { // jvParams[jss::type] = "fee"; + auto const jrr = makeRequest(jss::fee); + BEAST_EXPECT(checkArraySize(jrr[jss::state], 1)); + for (auto const& j : jrr[jss::state]) + BEAST_EXPECT(j["LedgerEntryType"] == jss::FeeSettings); + } - { // jvParams[jss::type] = "offer"; - auto const jrr = makeRequest(jss::offer); - BEAST_EXPECT(checkArraySize(jrr[jss::state], 1)); - for (auto const& j : jrr[jss::state]) - BEAST_EXPECT(j["LedgerEntryType"] == jss::Offer); - } + { // jvParams[jss::type] = "hashes"; + auto const jrr = makeRequest(jss::hashes); + BEAST_EXPECT(checkArraySize(jrr[jss::state], 2)); + for (auto const& j : jrr[jss::state]) + BEAST_EXPECT(j["LedgerEntryType"] == jss::LedgerHashes); + } - { // jvParams[jss::type] = "signer_list"; - auto const jrr = makeRequest(jss::signer_list); - BEAST_EXPECT(checkArraySize(jrr[jss::state], 1)); - for (auto const& j : jrr[jss::state]) - BEAST_EXPECT(j["LedgerEntryType"] == jss::SignerList); - } + { // jvParams[jss::type] = "offer"; + auto const jrr = makeRequest(jss::offer); + BEAST_EXPECT(checkArraySize(jrr[jss::state], 1)); + for (auto const& j : jrr[jss::state]) + BEAST_EXPECT(j["LedgerEntryType"] == jss::Offer); + } - { // jvParams[jss::type] = "state"; - auto const jrr = makeRequest(jss::state); - BEAST_EXPECT(checkArraySize(jrr[jss::state], 1)); - for (auto const& j : jrr[jss::state]) - BEAST_EXPECT(j["LedgerEntryType"] == jss::RippleState); - } + { // jvParams[jss::type] = "signer_list"; + auto const jrr = makeRequest(jss::signer_list); + BEAST_EXPECT(checkArraySize(jrr[jss::state], 1)); + for (auto const& j : jrr[jss::state]) + BEAST_EXPECT(j["LedgerEntryType"] == jss::SignerList); + } - { // jvParams[jss::type] = "ticket"; - auto const jrr = makeRequest(jss::ticket); - BEAST_EXPECT(checkArraySize(jrr[jss::state], 1)); - for (auto const& j : jrr[jss::state]) - BEAST_EXPECT(j["LedgerEntryType"] == jss::Ticket); - } + { // jvParams[jss::type] = "state"; + auto const jrr = makeRequest(jss::state); + BEAST_EXPECT(checkArraySize(jrr[jss::state], 1)); + for (auto const& j : jrr[jss::state]) + BEAST_EXPECT(j["LedgerEntryType"] == jss::RippleState); + } - { // jvParams[jss::type] = "escrow"; - auto const jrr = makeRequest(jss::escrow); - BEAST_EXPECT(checkArraySize(jrr[jss::state], 1)); - for (auto const& j : jrr[jss::state]) - BEAST_EXPECT(j["LedgerEntryType"] == jss::Escrow); - } + { // jvParams[jss::type] = "ticket"; + auto const jrr = makeRequest(jss::ticket); + BEAST_EXPECT(checkArraySize(jrr[jss::state], 1)); + for (auto const& j : jrr[jss::state]) + BEAST_EXPECT(j["LedgerEntryType"] == jss::Ticket); + } - { // jvParams[jss::type] = "payment_channel"; - auto const jrr = makeRequest(jss::payment_channel); - BEAST_EXPECT(checkArraySize(jrr[jss::state], 1)); - for (auto const& j : jrr[jss::state]) - BEAST_EXPECT(j["LedgerEntryType"] == jss::PayChannel); - } + { // jvParams[jss::type] = "escrow"; + auto const jrr = makeRequest(jss::escrow); + BEAST_EXPECT(checkArraySize(jrr[jss::state], 1)); + for (auto const& j : jrr[jss::state]) + BEAST_EXPECT(j["LedgerEntryType"] == jss::Escrow); + } - { // jvParams[jss::type] = "deposit_preauth"; - auto const jrr = makeRequest(jss::deposit_preauth); - BEAST_EXPECT(checkArraySize(jrr[jss::state], 2)); - for (auto const& j : jrr[jss::state]) - BEAST_EXPECT(j["LedgerEntryType"] == jss::DepositPreauth); - } + { // jvParams[jss::type] = "payment_channel"; + auto const jrr = makeRequest(jss::payment_channel); + BEAST_EXPECT(checkArraySize(jrr[jss::state], 1)); + for (auto const& j : jrr[jss::state]) + BEAST_EXPECT(j["LedgerEntryType"] == jss::PayChannel); + } - { // jvParams[jss::type] = "misspelling"; - Json::Value jvParams; - jvParams[jss::ledger_index] = "current"; - jvParams[jss::type] = "misspelling"; - auto const jrr = env.rpc( - "json", - "ledger_data", - boost::lexical_cast(jvParams))[jss::result]; - BEAST_EXPECT(jrr.isMember("error")); - BEAST_EXPECT(jrr["error"] == "invalidParams"); - BEAST_EXPECT(jrr["error_message"] == "Invalid field 'type'."); + { // jvParams[jss::type] = "deposit_preauth"; + auto const jrr = makeRequest(jss::deposit_preauth); + BEAST_EXPECT(checkArraySize(jrr[jss::state], 2)); + for (auto const& j : jrr[jss::state]) + BEAST_EXPECT(j["LedgerEntryType"] == jss::DepositPreauth); + } + + { // jvParams[jss::type] = "misspelling"; + Json::Value jvParams; + jvParams[jss::ledger_index] = "current"; + jvParams[jss::type] = "misspelling"; + auto const jrr = env.rpc( + "json", + "ledger_data", + boost::lexical_cast(jvParams))[jss::result]; + BEAST_EXPECT(jrr.isMember("error")); + BEAST_EXPECT(jrr["error"] == "invalidParams"); + BEAST_EXPECT(jrr["error_message"] == "Invalid field 'type'."); + } } } diff --git a/src/test/rpc/LedgerHeader_test.cpp b/src/test/rpc/LedgerHeader_test.cpp index d6c0652d5a2..d8fe738b888 100644 --- a/src/test/rpc/LedgerHeader_test.cpp +++ b/src/test/rpc/LedgerHeader_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include #include #include +#include namespace ripple { diff --git a/src/test/rpc/LedgerRPC_test.cpp b/src/test/rpc/LedgerRPC_test.cpp index 79f244c4711..70e4ffbe8dc 100644 --- a/src/test/rpc/LedgerRPC_test.cpp +++ b/src/test/rpc/LedgerRPC_test.cpp @@ -17,19 +17,19 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/test/rpc/LedgerRequestRPC_test.cpp b/src/test/rpc/LedgerRequestRPC_test.cpp index 6c59e72c4b8..8922cd38386 100644 --- a/src/test/rpc/LedgerRequestRPC_test.cpp +++ b/src/test/rpc/LedgerRequestRPC_test.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include #include diff --git a/src/test/rpc/ManifestRPC_test.cpp b/src/test/rpc/ManifestRPC_test.cpp index 3c32f4d7ba7..fcf47a5745d 100644 --- a/src/test/rpc/ManifestRPC_test.cpp +++ b/src/test/rpc/ManifestRPC_test.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include #include +#include +#include +#include #include diff --git a/src/test/rpc/NoRippleCheck_test.cpp b/src/test/rpc/NoRippleCheck_test.cpp index 3d34f55c90d..58f10c66dc1 100644 --- a/src/test/rpc/NoRippleCheck_test.cpp +++ b/src/test/rpc/NoRippleCheck_test.cpp @@ -17,17 +17,17 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/test/rpc/NoRipple_test.cpp b/src/test/rpc/NoRipple_test.cpp index 8da80e6483c..aa5e6e1efef 100644 --- a/src/test/rpc/NoRipple_test.cpp +++ b/src/test/rpc/NoRipple_test.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include #include +#include +#include +#include namespace ripple { diff --git a/src/test/rpc/NodeToShardRPC_test.cpp b/src/test/rpc/NodeToShardRPC_test.cpp index 7736d776995..ec1ff367c1e 100644 --- a/src/test/rpc/NodeToShardRPC_test.cpp +++ b/src/test/rpc/NodeToShardRPC_test.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/rpc/OwnerInfo_test.cpp b/src/test/rpc/OwnerInfo_test.cpp index c510c35afc8..606f2274b88 100644 --- a/src/test/rpc/OwnerInfo_test.cpp +++ b/src/test/rpc/OwnerInfo_test.cpp @@ -18,10 +18,10 @@ //============================================================================== #include -#include -#include -#include -#include +#include +#include +#include +#include namespace ripple { diff --git a/src/test/rpc/Peers_test.cpp b/src/test/rpc/Peers_test.cpp index 43fa601e1c0..ab9b17b2593 100644 --- a/src/test/rpc/Peers_test.cpp +++ b/src/test/rpc/Peers_test.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include -#include -#include #include #include +#include +#include +#include #include namespace ripple { diff --git a/src/test/rpc/RPCCall_test.cpp b/src/test/rpc/RPCCall_test.cpp index 09096ba76af..f3aaf468a9e 100644 --- a/src/test/rpc/RPCCall_test.cpp +++ b/src/test/rpc/RPCCall_test.cpp @@ -15,13 +15,13 @@ */ //============================================================================== -#include -#include -#include -#include -#include #include #include +#include +#include +#include +#include +#include #include diff --git a/src/test/rpc/RPCOverload_test.cpp b/src/test/rpc/RPCOverload_test.cpp index 088a8179043..c3328fb0b28 100644 --- a/src/test/rpc/RPCOverload_test.cpp +++ b/src/test/rpc/RPCOverload_test.cpp @@ -15,12 +15,12 @@ */ //============================================================================== -#include -#include -#include #include #include #include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/rpc/ReportingETL_test.cpp b/src/test/rpc/ReportingETL_test.cpp index 078a51d7bcd..8a030938832 100644 --- a/src/test/rpc/ReportingETL_test.cpp +++ b/src/test/rpc/ReportingETL_test.cpp @@ -18,15 +18,15 @@ */ //============================================================================== -#include -#include -#include +#include +#include +#include -#include #include #include #include #include +#include namespace ripple { namespace test { diff --git a/src/test/rpc/RobustTransaction_test.cpp b/src/test/rpc/RobustTransaction_test.cpp index 37b16c58d7f..b0506224f79 100644 --- a/src/test/rpc/RobustTransaction_test.cpp +++ b/src/test/rpc/RobustTransaction_test.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include -#include -#include #include #include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/rpc/Roles_test.cpp b/src/test/rpc/Roles_test.cpp index 079fd2f9f26..8cef5dcbc61 100644 --- a/src/test/rpc/Roles_test.cpp +++ b/src/test/rpc/Roles_test.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include -#include -#include #include #include +#include +#include +#include #include diff --git a/src/test/rpc/ServerInfo_test.cpp b/src/test/rpc/ServerInfo_test.cpp index ece98e99a7e..a2eaa63eb42 100644 --- a/src/test/rpc/ServerInfo_test.cpp +++ b/src/test/rpc/ServerInfo_test.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include -#include -#include -#include #include +#include +#include +#include +#include #include diff --git a/src/test/rpc/ShardArchiveHandler_test.cpp b/src/test/rpc/ShardArchiveHandler_test.cpp index ee0bec1eadf..82f12fe49a9 100644 --- a/src/test/rpc/ShardArchiveHandler_test.cpp +++ b/src/test/rpc/ShardArchiveHandler_test.cpp @@ -17,19 +17,19 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/rpc/Status_test.cpp b/src/test/rpc/Status_test.cpp index ab94191e1de..1ae8b23c66c 100644 --- a/src/test/rpc/Status_test.cpp +++ b/src/test/rpc/Status_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include -#include +#include +#include +#include #include namespace ripple { diff --git a/src/test/rpc/Subscribe_test.cpp b/src/test/rpc/Subscribe_test.cpp index 24ceb54bb94..f1cb2f9a135 100644 --- a/src/test/rpc/Subscribe_test.cpp +++ b/src/test/rpc/Subscribe_test.cpp @@ -15,17 +15,17 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/test/rpc/TransactionEntry_test.cpp b/src/test/rpc/TransactionEntry_test.cpp index 431c812d625..09423ed25d5 100644 --- a/src/test/rpc/TransactionEntry_test.cpp +++ b/src/test/rpc/TransactionEntry_test.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include -#include -#include -#include #include #include +#include +#include +#include +#include #include diff --git a/src/test/rpc/TransactionHistory_test.cpp b/src/test/rpc/TransactionHistory_test.cpp index 862eaaee507..63151bdaeb6 100644 --- a/src/test/rpc/TransactionHistory_test.cpp +++ b/src/test/rpc/TransactionHistory_test.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include -#include -#include #include #include #include +#include +#include +#include namespace ripple { diff --git a/src/test/rpc/Transaction_test.cpp b/src/test/rpc/Transaction_test.cpp index ac02dd11cda..2bd20eb3707 100644 --- a/src/test/rpc/Transaction_test.cpp +++ b/src/test/rpc/Transaction_test.cpp @@ -17,16 +17,17 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include #include #include #include - +#include +#include +#include +#include +#include +#include + +#include #include #include @@ -671,6 +672,47 @@ class Transaction_test : public beast::unit_test::suite BEAST_EXPECT(jrr[jss::hash]); } + // test querying with mixed case ctid + { + Env env{*this, makeNetworkConfig(11111)}; + std::uint32_t const netID = env.app().config().NETWORK_ID; + + Account const alice = Account("alice"); + Account const bob = Account("bob"); + + std::uint32_t const startLegSeq = env.current()->info().seq; + env.fund(XRP(10000), alice, bob); + env(pay(alice, bob, XRP(10))); + env.close(); + + std::string const ctid = *RPC::encodeCTID(startLegSeq, 0, netID); + auto isUpper = [](char c) { return std::isupper(c) != 0; }; + + // Verify that there are at least two upper case letters in ctid and + // test a mixed case + if (BEAST_EXPECT( + std::count_if(ctid.begin(), ctid.end(), isUpper) > 1)) + { + // Change the first upper case letter to lower case. + std::string mixedCase = ctid; + { + auto const iter = std::find_if( + mixedCase.begin(), mixedCase.end(), isUpper); + *iter = std::tolower(*iter); + } + BEAST_EXPECT(ctid != mixedCase); + + Json::Value jsonTx; + jsonTx[jss::binary] = false; + jsonTx[jss::ctid] = mixedCase; + jsonTx[jss::id] = 1; + Json::Value const jrr = + env.rpc("json", "tx", to_string(jsonTx))[jss::result]; + BEAST_EXPECT(jrr[jss::ctid] == ctid); + BEAST_EXPECT(jrr[jss::hash]); + } + } + // test that if the network is 65535 the ctid is not in the response { Env env{*this, makeNetworkConfig(65535)}; diff --git a/src/test/rpc/ValidatorInfo_test.cpp b/src/test/rpc/ValidatorInfo_test.cpp index f45d6867596..603a0ad9d23 100644 --- a/src/test/rpc/ValidatorInfo_test.cpp +++ b/src/test/rpc/ValidatorInfo_test.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include #include +#include +#include +#include #include #include diff --git a/src/test/rpc/ValidatorRPC_test.cpp b/src/test/rpc/ValidatorRPC_test.cpp index c9b11cdb992..2bd4b69c37b 100644 --- a/src/test/rpc/ValidatorRPC_test.cpp +++ b/src/test/rpc/ValidatorRPC_test.cpp @@ -17,16 +17,16 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include #include #include +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/test/rpc/Version_test.cpp b/src/test/rpc/Version_test.cpp index 34e55b2be93..b66e502b9f3 100644 --- a/src/test/rpc/Version_test.cpp +++ b/src/test/rpc/Version_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include #include +#include +#include namespace ripple { diff --git a/src/test/server/ServerStatus_test.cpp b/src/test/server/ServerStatus_test.cpp index 249b0fd4512..8aa7bf19f30 100644 --- a/src/test/server/ServerStatus_test.cpp +++ b/src/test/server/ServerStatus_test.cpp @@ -17,13 +17,17 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -33,10 +37,6 @@ #include #include #include -#include -#include -#include -#include namespace ripple { namespace test { diff --git a/src/test/server/Server_test.cpp b/src/test/server/Server_test.cpp index b5eb71f361c..c7d7dc3b911 100644 --- a/src/test/server/Server_test.cpp +++ b/src/test/server/Server_test.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/test/shamap/FetchPack_test.cpp b/src/test/shamap/FetchPack_test.cpp index f15f3163e55..ac2d16ecc99 100644 --- a/src/test/shamap/FetchPack_test.cpp +++ b/src/test/shamap/FetchPack_test.cpp @@ -17,19 +17,19 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { namespace tests { diff --git a/src/test/shamap/SHAMapSync_test.cpp b/src/test/shamap/SHAMapSync_test.cpp index 70e578b5fb5..627e97e152c 100644 --- a/src/test/shamap/SHAMapSync_test.cpp +++ b/src/test/shamap/SHAMapSync_test.cpp @@ -17,14 +17,14 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include #include #include +#include +#include +#include +#include +#include +#include namespace ripple { namespace tests { diff --git a/src/test/shamap/SHAMap_test.cpp b/src/test/shamap/SHAMap_test.cpp index 83bbc13253e..c8c877935f5 100644 --- a/src/test/shamap/SHAMap_test.cpp +++ b/src/test/shamap/SHAMap_test.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include -#include -#include -#include -#include #include #include +#include +#include +#include +#include +#include namespace ripple { namespace tests { diff --git a/src/test/shamap/common.h b/src/test/shamap/common.h index d89acb988d7..2280c77d4a1 100644 --- a/src/test/shamap/common.h +++ b/src/test/shamap/common.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_SHAMAP_TESTS_COMMON_H_INCLUDED #define RIPPLE_SHAMAP_TESTS_COMMON_H_INCLUDED -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace ripple { namespace tests { diff --git a/src/test/unit_test/FileDirGuard.h b/src/test/unit_test/FileDirGuard.h index 3c79fb11b8e..246ac262378 100644 --- a/src/test/unit_test/FileDirGuard.h +++ b/src/test/unit_test/FileDirGuard.h @@ -20,9 +20,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef TEST_UNIT_TEST_DIRGUARD_H #define TEST_UNIT_TEST_DIRGUARD_H -#include -#include #include +#include +#include namespace ripple { namespace test { diff --git a/src/test/unit_test/SuiteJournal.h b/src/test/unit_test/SuiteJournal.h index 0e80e83cd7e..211bec0e4d3 100644 --- a/src/test/unit_test/SuiteJournal.h +++ b/src/test/unit_test/SuiteJournal.h @@ -20,8 +20,8 @@ #ifndef TEST_UNIT_TEST_SUITE_JOURNAL_H #define TEST_UNIT_TEST_SUITE_JOURNAL_H -#include -#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/unit_test/multi_runner.cpp b/src/test/unit_test/multi_runner.cpp index cd84c3c999f..60487cadfb8 100644 --- a/src/test/unit_test/multi_runner.cpp +++ b/src/test/unit_test/multi_runner.cpp @@ -19,7 +19,7 @@ #include -#include +#include #include diff --git a/src/test/unit_test/multi_runner.h b/src/test/unit_test/multi_runner.h index c003a99f998..a4435dd1af7 100644 --- a/src/test/unit_test/multi_runner.h +++ b/src/test/unit_test/multi_runner.h @@ -20,8 +20,8 @@ #ifndef TEST_UNIT_TEST_MULTI_RUNNER_H #define TEST_UNIT_TEST_MULTI_RUNNER_H -#include -#include +#include +#include #include #include diff --git a/src/ripple/README.md b/src/xrpld/README.md similarity index 100% rename from src/ripple/README.md rename to src/xrpld/README.md diff --git a/src/ripple/app/consensus/RCLCensorshipDetector.h b/src/xrpld/app/consensus/RCLCensorshipDetector.h similarity index 98% rename from src/ripple/app/consensus/RCLCensorshipDetector.h rename to src/xrpld/app/consensus/RCLCensorshipDetector.h index f661a80362b..12a768ca4c8 100644 --- a/src/ripple/app/consensus/RCLCensorshipDetector.h +++ b/src/xrpld/app/consensus/RCLCensorshipDetector.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_APP_CONSENSUS_RCLCENSORSHIPDETECTOR_H_INCLUDED #define RIPPLE_APP_CONSENSUS_RCLCENSORSHIPDETECTOR_H_INCLUDED -#include -#include +#include +#include #include #include #include diff --git a/src/ripple/app/consensus/RCLConsensus.cpp b/src/xrpld/app/consensus/RCLConsensus.cpp similarity index 96% rename from src/ripple/app/consensus/RCLConsensus.cpp rename to src/xrpld/app/consensus/RCLConsensus.cpp index c0ebe06dd7e..7b061e10b31 100644 --- a/src/ripple/app/consensus/RCLConsensus.cpp +++ b/src/xrpld/app/consensus/RCLConsensus.cpp @@ -17,32 +17,32 @@ */ //============================================================================== -#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 +#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/app/consensus/RCLConsensus.h b/src/xrpld/app/consensus/RCLConsensus.h similarity index 96% rename from src/ripple/app/consensus/RCLConsensus.h rename to src/xrpld/app/consensus/RCLConsensus.h index f8c01e93caa..893e5cf0847 100644 --- a/src/ripple/app/consensus/RCLConsensus.h +++ b/src/xrpld/app/consensus/RCLConsensus.h @@ -20,21 +20,21 @@ #ifndef RIPPLE_APP_CONSENSUS_RCLCONSENSUS_H_INCLUDED #define RIPPLE_APP_CONSENSUS_RCLCONSENSUS_H_INCLUDED -#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 #include #include #include diff --git a/src/ripple/app/consensus/RCLCxLedger.h b/src/xrpld/app/consensus/RCLCxLedger.h similarity index 95% rename from src/ripple/app/consensus/RCLCxLedger.h rename to src/xrpld/app/consensus/RCLCxLedger.h index b30bef135c0..ed7ad9faeb7 100644 --- a/src/ripple/app/consensus/RCLCxLedger.h +++ b/src/xrpld/app/consensus/RCLCxLedger.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_APP_CONSENSUS_RCLCXLEDGER_H_INCLUDED #define RIPPLE_APP_CONSENSUS_RCLCXLEDGER_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/app/consensus/RCLCxPeerPos.cpp b/src/xrpld/app/consensus/RCLCxPeerPos.cpp similarity index 91% rename from src/ripple/app/consensus/RCLCxPeerPos.cpp rename to src/xrpld/app/consensus/RCLCxPeerPos.cpp index ee5a45b943f..74747853a2d 100644 --- a/src/ripple/app/consensus/RCLCxPeerPos.cpp +++ b/src/xrpld/app/consensus/RCLCxPeerPos.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/consensus/RCLCxPeerPos.h b/src/xrpld/app/consensus/RCLCxPeerPos.h similarity index 93% rename from src/ripple/app/consensus/RCLCxPeerPos.h rename to src/xrpld/app/consensus/RCLCxPeerPos.h index e82a85d422b..4236e2ab128 100644 --- a/src/ripple/app/consensus/RCLCxPeerPos.h +++ b/src/xrpld/app/consensus/RCLCxPeerPos.h @@ -20,14 +20,14 @@ #ifndef RIPPLE_APP_CONSENSUS_RCLCXPEERPOS_H_INCLUDED #define RIPPLE_APP_CONSENSUS_RCLCXPEERPOS_H_INCLUDED -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/app/consensus/RCLCxTx.h b/src/xrpld/app/consensus/RCLCxTx.h similarity index 97% rename from src/ripple/app/consensus/RCLCxTx.h rename to src/xrpld/app/consensus/RCLCxTx.h index c6abfdfee94..58e58ac3b7d 100644 --- a/src/ripple/app/consensus/RCLCxTx.h +++ b/src/xrpld/app/consensus/RCLCxTx.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_APP_CONSENSUS_RCLCXTX_H_INCLUDED #define RIPPLE_APP_CONSENSUS_RCLCXTX_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/consensus/RCLValidations.cpp b/src/xrpld/app/consensus/RCLValidations.cpp similarity index 92% rename from src/ripple/app/consensus/RCLValidations.cpp rename to src/xrpld/app/consensus/RCLValidations.cpp index ab9391385dd..88e8d6c4e71 100644 --- a/src/ripple/app/consensus/RCLValidations.cpp +++ b/src/xrpld/app/consensus/RCLValidations.cpp @@ -17,19 +17,19 @@ */ //============================================================================== -#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/app/consensus/RCLValidations.h b/src/xrpld/app/consensus/RCLValidations.h similarity index 96% rename from src/ripple/app/consensus/RCLValidations.h rename to src/xrpld/app/consensus/RCLValidations.h index 93628fe1695..c0d08280fed 100644 --- a/src/ripple/app/consensus/RCLValidations.h +++ b/src/xrpld/app/consensus/RCLValidations.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_APP_CONSENSUSS_VALIDATIONS_H_INCLUDED #define RIPPLE_APP_CONSENSUSS_VALIDATIONS_H_INCLUDED -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/app/consensus/README.md b/src/xrpld/app/consensus/README.md similarity index 100% rename from src/ripple/app/consensus/README.md rename to src/xrpld/app/consensus/README.md diff --git a/src/ripple/app/ledger/AbstractFetchPackContainer.h b/src/xrpld/app/ledger/AbstractFetchPackContainer.h similarity index 96% rename from src/ripple/app/ledger/AbstractFetchPackContainer.h rename to src/xrpld/app/ledger/AbstractFetchPackContainer.h index 43552a757b5..2b27471c64a 100644 --- a/src/ripple/app/ledger/AbstractFetchPackContainer.h +++ b/src/xrpld/app/ledger/AbstractFetchPackContainer.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_APP_LEDGER_ABSTRACTFETCHPACKCONTAINER_H_INCLUDED #define RIPPLE_APP_LEDGER_ABSTRACTFETCHPACKCONTAINER_H_INCLUDED -#include -#include +#include +#include #include namespace ripple { diff --git a/src/ripple/app/ledger/AcceptedLedger.cpp b/src/xrpld/app/ledger/AcceptedLedger.cpp similarity index 95% rename from src/ripple/app/ledger/AcceptedLedger.cpp rename to src/xrpld/app/ledger/AcceptedLedger.cpp index 4f308653dcf..37c943679da 100644 --- a/src/ripple/app/ledger/AcceptedLedger.cpp +++ b/src/xrpld/app/ledger/AcceptedLedger.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include #include namespace ripple { diff --git a/src/ripple/app/ledger/AcceptedLedger.h b/src/xrpld/app/ledger/AcceptedLedger.h similarity index 96% rename from src/ripple/app/ledger/AcceptedLedger.h rename to src/xrpld/app/ledger/AcceptedLedger.h index 0187fdfb679..65a782aef70 100644 --- a/src/ripple/app/ledger/AcceptedLedger.h +++ b/src/xrpld/app/ledger/AcceptedLedger.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_APP_LEDGER_ACCEPTEDLEDGER_H_INCLUDED #define RIPPLE_APP_LEDGER_ACCEPTEDLEDGER_H_INCLUDED -#include -#include +#include +#include namespace ripple { diff --git a/src/ripple/app/ledger/AcceptedLedgerTx.cpp b/src/xrpld/app/ledger/AcceptedLedgerTx.cpp similarity index 93% rename from src/ripple/app/ledger/AcceptedLedgerTx.cpp rename to src/xrpld/app/ledger/AcceptedLedgerTx.cpp index 613a91e437a..e1ad68dff37 100644 --- a/src/ripple/app/ledger/AcceptedLedgerTx.cpp +++ b/src/xrpld/app/ledger/AcceptedLedgerTx.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/ledger/AcceptedLedgerTx.h b/src/xrpld/app/ledger/AcceptedLedgerTx.h similarity index 97% rename from src/ripple/app/ledger/AcceptedLedgerTx.h rename to src/xrpld/app/ledger/AcceptedLedgerTx.h index 2995d447bba..725057aa02c 100644 --- a/src/ripple/app/ledger/AcceptedLedgerTx.h +++ b/src/xrpld/app/ledger/AcceptedLedgerTx.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_APP_LEDGER_ACCEPTEDLEDGERTX_H_INCLUDED #define RIPPLE_APP_LEDGER_ACCEPTEDLEDGERTX_H_INCLUDED -#include -#include +#include +#include #include namespace ripple { diff --git a/src/ripple/app/ledger/AccountStateSF.cpp b/src/xrpld/app/ledger/AccountStateSF.cpp similarity index 96% rename from src/ripple/app/ledger/AccountStateSF.cpp rename to src/xrpld/app/ledger/AccountStateSF.cpp index 5c66469d5ab..c1f2ca26fc5 100644 --- a/src/ripple/app/ledger/AccountStateSF.cpp +++ b/src/xrpld/app/ledger/AccountStateSF.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { diff --git a/src/ripple/app/ledger/AccountStateSF.h b/src/xrpld/app/ledger/AccountStateSF.h similarity index 92% rename from src/ripple/app/ledger/AccountStateSF.h rename to src/xrpld/app/ledger/AccountStateSF.h index 43822add593..16cc686e3de 100644 --- a/src/ripple/app/ledger/AccountStateSF.h +++ b/src/xrpld/app/ledger/AccountStateSF.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_APP_LEDGER_ACCOUNTSTATESF_H_INCLUDED #define RIPPLE_APP_LEDGER_ACCOUNTSTATESF_H_INCLUDED -#include -#include -#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/ledger/BookListeners.cpp b/src/xrpld/app/ledger/BookListeners.cpp similarity index 94% rename from src/ripple/app/ledger/BookListeners.cpp rename to src/xrpld/app/ledger/BookListeners.cpp index 3c7e013e1dd..2379807a91a 100644 --- a/src/ripple/app/ledger/BookListeners.cpp +++ b/src/xrpld/app/ledger/BookListeners.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include -#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/ledger/BookListeners.h b/src/xrpld/app/ledger/BookListeners.h similarity index 96% rename from src/ripple/app/ledger/BookListeners.h rename to src/xrpld/app/ledger/BookListeners.h index 605cf6dc6af..6ac52de28ee 100644 --- a/src/ripple/app/ledger/BookListeners.h +++ b/src/xrpld/app/ledger/BookListeners.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_APP_LEDGER_BOOKLISTENERS_H_INCLUDED #define RIPPLE_APP_LEDGER_BOOKLISTENERS_H_INCLUDED -#include -#include +#include +#include #include #include diff --git a/src/ripple/app/ledger/BuildLedger.h b/src/xrpld/app/ledger/BuildLedger.h similarity index 96% rename from src/ripple/app/ledger/BuildLedger.h rename to src/xrpld/app/ledger/BuildLedger.h index acefee24e70..409fa3529c4 100644 --- a/src/ripple/app/ledger/BuildLedger.h +++ b/src/xrpld/app/ledger/BuildLedger.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_APP_LEDGER_BUILD_LEDGER_H_INCLUDED #define RIPPLE_APP_LEDGER_BUILD_LEDGER_H_INCLUDED -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/ripple/app/ledger/ConsensusTransSetSF.cpp b/src/xrpld/app/ledger/ConsensusTransSetSF.cpp similarity index 88% rename from src/ripple/app/ledger/ConsensusTransSetSF.cpp rename to src/xrpld/app/ledger/ConsensusTransSetSF.cpp index 476c757515f..4aed7d94bf3 100644 --- a/src/ripple/app/ledger/ConsensusTransSetSF.cpp +++ b/src/xrpld/app/ledger/ConsensusTransSetSF.cpp @@ -17,16 +17,16 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/ledger/ConsensusTransSetSF.h b/src/xrpld/app/ledger/ConsensusTransSetSF.h similarity index 94% rename from src/ripple/app/ledger/ConsensusTransSetSF.h rename to src/xrpld/app/ledger/ConsensusTransSetSF.h index ad5b2a23a48..857f2b8eae2 100644 --- a/src/ripple/app/ledger/ConsensusTransSetSF.h +++ b/src/xrpld/app/ledger/ConsensusTransSetSF.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_APP_LEDGER_CONSENSUSTRANSSETSF_H_INCLUDED #define RIPPLE_APP_LEDGER_CONSENSUSTRANSSETSF_H_INCLUDED -#include -#include -#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/ledger/InboundLedger.h b/src/xrpld/app/ledger/InboundLedger.h similarity index 95% rename from src/ripple/app/ledger/InboundLedger.h rename to src/xrpld/app/ledger/InboundLedger.h index 357a6fcad1e..62b6925d59c 100644 --- a/src/ripple/app/ledger/InboundLedger.h +++ b/src/xrpld/app/ledger/InboundLedger.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_APP_LEDGER_INBOUNDLEDGER_H_INCLUDED #define RIPPLE_APP_LEDGER_INBOUNDLEDGER_H_INCLUDED -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/app/ledger/InboundLedgers.h b/src/xrpld/app/ledger/InboundLedgers.h similarity index 96% rename from src/ripple/app/ledger/InboundLedgers.h rename to src/xrpld/app/ledger/InboundLedgers.h index b12760153e2..8d3deb9c2df 100644 --- a/src/ripple/app/ledger/InboundLedgers.h +++ b/src/xrpld/app/ledger/InboundLedgers.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_APP_LEDGER_INBOUNDLEDGERS_H_INCLUDED #define RIPPLE_APP_LEDGER_INBOUNDLEDGERS_H_INCLUDED -#include -#include +#include +#include #include namespace ripple { diff --git a/src/ripple/app/ledger/InboundTransactions.h b/src/xrpld/app/ledger/InboundTransactions.h similarity index 96% rename from src/ripple/app/ledger/InboundTransactions.h rename to src/xrpld/app/ledger/InboundTransactions.h index f5b44f38616..368375c07c5 100644 --- a/src/ripple/app/ledger/InboundTransactions.h +++ b/src/xrpld/app/ledger/InboundTransactions.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_APP_LEDGER_INBOUNDTRANSACTIONS_H_INCLUDED #define RIPPLE_APP_LEDGER_INBOUNDTRANSACTIONS_H_INCLUDED -#include -#include -#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/app/ledger/InboundTransactions.uml b/src/xrpld/app/ledger/InboundTransactions.uml similarity index 100% rename from src/ripple/app/ledger/InboundTransactions.uml rename to src/xrpld/app/ledger/InboundTransactions.uml diff --git a/src/ripple/app/ledger/Ledger.cpp b/src/xrpld/app/ledger/Ledger.cpp similarity index 95% rename from src/ripple/app/ledger/Ledger.cpp rename to src/xrpld/app/ledger/Ledger.cpp index 7cd6f89cad3..bcd3b6d4ba7 100644 --- a/src/ripple/app/ledger/Ledger.cpp +++ b/src/xrpld/app/ledger/Ledger.cpp @@ -17,45 +17,45 @@ */ //============================================================================== -#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 -#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 +#include +#include +#include +#include +#include +#include #include #include #include #include -#include +#include namespace ripple { @@ -793,7 +793,7 @@ Ledger::updateNegativeUNL() if (hasToDisable) { - newNUnl.emplace_back(sfDisabledValidator); + newNUnl.push_back(STObject::makeInnerObject(sfDisabledValidator)); newNUnl.back().setFieldVL( sfPublicKey, sle->getFieldVL(sfValidatorToDisable)); newNUnl.back().setFieldU32(sfFirstLedgerSequence, seq()); diff --git a/src/ripple/app/ledger/Ledger.h b/src/xrpld/app/ledger/Ledger.h similarity index 96% rename from src/ripple/app/ledger/Ledger.h rename to src/xrpld/app/ledger/Ledger.h index 051b322e27a..1591fae1472 100644 --- a/src/ripple/app/ledger/Ledger.h +++ b/src/xrpld/app/ledger/Ledger.h @@ -20,17 +20,17 @@ #ifndef RIPPLE_APP_LEDGER_LEDGER_H_INCLUDED #define RIPPLE_APP_LEDGER_LEDGER_H_INCLUDED -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/app/ledger/LedgerCleaner.h b/src/xrpld/app/ledger/LedgerCleaner.h similarity index 92% rename from src/ripple/app/ledger/LedgerCleaner.h rename to src/xrpld/app/ledger/LedgerCleaner.h index 9f82a851f21..251e8d51281 100644 --- a/src/ripple/app/ledger/LedgerCleaner.h +++ b/src/xrpld/app/ledger/LedgerCleaner.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_APP_LEDGER_LEDGERCLEANER_H_INCLUDED #define RIPPLE_APP_LEDGER_LEDGERCLEANER_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/app/ledger/LedgerHistory.cpp b/src/xrpld/app/ledger/LedgerHistory.cpp similarity index 98% rename from src/ripple/app/ledger/LedgerHistory.cpp rename to src/xrpld/app/ledger/LedgerHistory.cpp index ed2ccd07434..30139e2155f 100644 --- a/src/ripple/app/ledger/LedgerHistory.cpp +++ b/src/xrpld/app/ledger/LedgerHistory.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/ledger/LedgerHistory.h b/src/xrpld/app/ledger/LedgerHistory.h similarity index 96% rename from src/ripple/app/ledger/LedgerHistory.h rename to src/xrpld/app/ledger/LedgerHistory.h index 092ad7d8371..9d414e4aad3 100644 --- a/src/ripple/app/ledger/LedgerHistory.h +++ b/src/xrpld/app/ledger/LedgerHistory.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_APP_LEDGER_LEDGERHISTORY_H_INCLUDED #define RIPPLE_APP_LEDGER_LEDGERHISTORY_H_INCLUDED -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include diff --git a/src/ripple/app/ledger/LedgerHolder.h b/src/xrpld/app/ledger/LedgerHolder.h similarity index 96% rename from src/ripple/app/ledger/LedgerHolder.h rename to src/xrpld/app/ledger/LedgerHolder.h index 93d67400e05..5636a8ca20d 100644 --- a/src/ripple/app/ledger/LedgerHolder.h +++ b/src/xrpld/app/ledger/LedgerHolder.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_APP_LEDGER_LEDGERHOLDER_H_INCLUDED #define RIPPLE_APP_LEDGER_LEDGERHOLDER_H_INCLUDED -#include -#include +#include +#include #include namespace ripple { diff --git a/src/ripple/app/ledger/LedgerMaster.h b/src/xrpld/app/ledger/LedgerMaster.h similarity index 94% rename from src/ripple/app/ledger/LedgerMaster.h rename to src/xrpld/app/ledger/LedgerMaster.h index 980506c2267..7921773e3f0 100644 --- a/src/ripple/app/ledger/LedgerMaster.h +++ b/src/xrpld/app/ledger/LedgerMaster.h @@ -20,23 +20,23 @@ #ifndef RIPPLE_APP_LEDGER_LEDGERMASTER_H_INCLUDED #define RIPPLE_APP_LEDGER_LEDGERMASTER_H_INCLUDED -#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 +#include +#include +#include +#include #include #include diff --git a/src/ripple/app/ledger/LedgerReplay.h b/src/xrpld/app/ledger/LedgerReplay.h similarity index 98% rename from src/ripple/app/ledger/LedgerReplay.h rename to src/xrpld/app/ledger/LedgerReplay.h index 0365dea1b7e..8e52c8d5d5d 100644 --- a/src/ripple/app/ledger/LedgerReplay.h +++ b/src/xrpld/app/ledger/LedgerReplay.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_APP_LEDGER_LEDGERREPLAY_H_INCLUDED #define RIPPLE_APP_LEDGER_LEDGERREPLAY_H_INCLUDED -#include +#include #include #include #include diff --git a/src/ripple/app/ledger/LedgerReplayTask.h b/src/xrpld/app/ledger/LedgerReplayTask.h similarity index 97% rename from src/ripple/app/ledger/LedgerReplayTask.h rename to src/xrpld/app/ledger/LedgerReplayTask.h index 4330f0b6247..54863e70956 100644 --- a/src/ripple/app/ledger/LedgerReplayTask.h +++ b/src/xrpld/app/ledger/LedgerReplayTask.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_APP_LEDGER_LEDGERREPLAYTASK_H_INCLUDED #define RIPPLE_APP_LEDGER_LEDGERREPLAYTASK_H_INCLUDED -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/ripple/app/ledger/LedgerReplayer.h b/src/xrpld/app/ledger/LedgerReplayer.h similarity index 96% rename from src/ripple/app/ledger/LedgerReplayer.h rename to src/xrpld/app/ledger/LedgerReplayer.h index b06dd2cc858..4ce4b20b221 100644 --- a/src/ripple/app/ledger/LedgerReplayer.h +++ b/src/xrpld/app/ledger/LedgerReplayer.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_APP_LEDGER_LEDGERREPLAYER_H_INCLUDED #define RIPPLE_APP_LEDGER_LEDGERREPLAYER_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/app/ledger/LedgerToJson.h b/src/xrpld/app/ledger/LedgerToJson.h similarity index 85% rename from src/ripple/app/ledger/LedgerToJson.h rename to src/xrpld/app/ledger/LedgerToJson.h index 78947ca91d1..8f9316cbc66 100644 --- a/src/ripple/app/ledger/LedgerToJson.h +++ b/src/xrpld/app/ledger/LedgerToJson.h @@ -20,16 +20,16 @@ #ifndef RIPPLE_APP_LEDGER_LEDGERTOJSON_H_INCLUDED #define RIPPLE_APP_LEDGER_LEDGERTOJSON_H_INCLUDED -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/ledger/LocalTxs.h b/src/xrpld/app/ledger/LocalTxs.h similarity index 95% rename from src/ripple/app/ledger/LocalTxs.h rename to src/xrpld/app/ledger/LocalTxs.h index f427a5e0477..638e070f444 100644 --- a/src/ripple/app/ledger/LocalTxs.h +++ b/src/xrpld/app/ledger/LocalTxs.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_APP_LEDGER_LOCALTXS_H_INCLUDED #define RIPPLE_APP_LEDGER_LOCALTXS_H_INCLUDED -#include -#include +#include +#include #include namespace ripple { diff --git a/src/ripple/app/ledger/OpenLedger.h b/src/xrpld/app/ledger/OpenLedger.h similarity index 96% rename from src/ripple/app/ledger/OpenLedger.h rename to src/xrpld/app/ledger/OpenLedger.h index e3cb2b10028..b218b1d6e11 100644 --- a/src/ripple/app/ledger/OpenLedger.h +++ b/src/xrpld/app/ledger/OpenLedger.h @@ -20,14 +20,14 @@ #ifndef RIPPLE_APP_LEDGER_OPENLEDGER_H_INCLUDED #define RIPPLE_APP_LEDGER_OPENLEDGER_H_INCLUDED -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/app/ledger/OrderBookDB.cpp b/src/xrpld/app/ledger/OrderBookDB.cpp similarity index 96% rename from src/ripple/app/ledger/OrderBookDB.cpp rename to src/xrpld/app/ledger/OrderBookDB.cpp index e1fc8a248f0..d0eddadbacb 100644 --- a/src/ripple/app/ledger/OrderBookDB.cpp +++ b/src/xrpld/app/ledger/OrderBookDB.cpp @@ -17,15 +17,15 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/ledger/OrderBookDB.h b/src/xrpld/app/ledger/OrderBookDB.h similarity index 93% rename from src/ripple/app/ledger/OrderBookDB.h rename to src/xrpld/app/ledger/OrderBookDB.h index 45705a61572..ce0d9f0fafe 100644 --- a/src/ripple/app/ledger/OrderBookDB.h +++ b/src/xrpld/app/ledger/OrderBookDB.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_APP_LEDGER_ORDERBOOKDB_H_INCLUDED #define RIPPLE_APP_LEDGER_ORDERBOOKDB_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/src/ripple/app/ledger/PendingSaves.h b/src/xrpld/app/ledger/PendingSaves.h similarity index 99% rename from src/ripple/app/ledger/PendingSaves.h rename to src/xrpld/app/ledger/PendingSaves.h index f031baf4a93..d296fcacc96 100644 --- a/src/ripple/app/ledger/PendingSaves.h +++ b/src/xrpld/app/ledger/PendingSaves.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_APP_PENDINGSAVES_H_INCLUDED #define RIPPLE_APP_PENDINGSAVES_H_INCLUDED -#include +#include #include #include #include diff --git a/src/ripple/app/ledger/README.md b/src/xrpld/app/ledger/README.md similarity index 100% rename from src/ripple/app/ledger/README.md rename to src/xrpld/app/ledger/README.md diff --git a/src/ripple/app/ledger/TransactionMaster.h b/src/xrpld/app/ledger/TransactionMaster.h similarity index 93% rename from src/ripple/app/ledger/TransactionMaster.h rename to src/xrpld/app/ledger/TransactionMaster.h index 9bebac37d73..65f27af6021 100644 --- a/src/ripple/app/ledger/TransactionMaster.h +++ b/src/xrpld/app/ledger/TransactionMaster.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_APP_LEDGER_TRANSACTIONMASTER_H_INCLUDED #define RIPPLE_APP_LEDGER_TRANSACTIONMASTER_H_INCLUDED -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/ledger/TransactionStateSF.cpp b/src/xrpld/app/ledger/TransactionStateSF.cpp similarity index 96% rename from src/ripple/app/ledger/TransactionStateSF.cpp rename to src/xrpld/app/ledger/TransactionStateSF.cpp index f65de5f9997..fac28cd2aa8 100644 --- a/src/ripple/app/ledger/TransactionStateSF.cpp +++ b/src/xrpld/app/ledger/TransactionStateSF.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { diff --git a/src/ripple/app/ledger/TransactionStateSF.h b/src/xrpld/app/ledger/TransactionStateSF.h similarity index 92% rename from src/ripple/app/ledger/TransactionStateSF.h rename to src/xrpld/app/ledger/TransactionStateSF.h index 6a5fa69ebd1..721f1870621 100644 --- a/src/ripple/app/ledger/TransactionStateSF.h +++ b/src/xrpld/app/ledger/TransactionStateSF.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_APP_LEDGER_TRANSACTIONSTATESF_H_INCLUDED #define RIPPLE_APP_LEDGER_TRANSACTIONSTATESF_H_INCLUDED -#include -#include -#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/ledger/impl/BuildLedger.cpp b/src/xrpld/app/ledger/detail/BuildLedger.cpp similarity index 95% rename from src/ripple/app/ledger/impl/BuildLedger.cpp rename to src/xrpld/app/ledger/detail/BuildLedger.cpp index 363c110cd18..8c4a7a3f41d 100644 --- a/src/ripple/app/ledger/impl/BuildLedger.cpp +++ b/src/xrpld/app/ledger/detail/BuildLedger.cpp @@ -17,14 +17,14 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/ledger/impl/InboundLedger.cpp b/src/xrpld/app/ledger/detail/InboundLedger.cpp similarity index 98% rename from src/ripple/app/ledger/impl/InboundLedger.cpp rename to src/xrpld/app/ledger/detail/InboundLedger.cpp index 53475988cbf..b98f24aed43 100644 --- a/src/ripple/app/ledger/impl/InboundLedger.cpp +++ b/src/xrpld/app/ledger/detail/InboundLedger.cpp @@ -17,21 +17,21 @@ */ //============================================================================== -#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 #include diff --git a/src/ripple/app/ledger/impl/InboundLedgers.cpp b/src/xrpld/app/ledger/detail/InboundLedgers.cpp similarity index 96% rename from src/ripple/app/ledger/impl/InboundLedgers.cpp rename to src/xrpld/app/ledger/detail/InboundLedgers.cpp index 0bff434edbc..04964d2a921 100644 --- a/src/ripple/app/ledger/impl/InboundLedgers.cpp +++ b/src/xrpld/app/ledger/detail/InboundLedgers.cpp @@ -17,17 +17,17 @@ */ //============================================================================== -#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/app/ledger/impl/InboundTransactions.cpp b/src/xrpld/app/ledger/detail/InboundTransactions.cpp similarity index 95% rename from src/ripple/app/ledger/impl/InboundTransactions.cpp rename to src/xrpld/app/ledger/detail/InboundTransactions.cpp index 7a863bce16b..83b074f317a 100644 --- a/src/ripple/app/ledger/impl/InboundTransactions.cpp +++ b/src/xrpld/app/ledger/detail/InboundTransactions.cpp @@ -17,15 +17,15 @@ */ //============================================================================== -#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/app/ledger/impl/LedgerCleaner.cpp b/src/xrpld/app/ledger/detail/LedgerCleaner.cpp similarity index 98% rename from src/ripple/app/ledger/impl/LedgerCleaner.cpp rename to src/xrpld/app/ledger/detail/LedgerCleaner.cpp index e5ee6409d34..3021c691c53 100644 --- a/src/ripple/app/ledger/impl/LedgerCleaner.cpp +++ b/src/xrpld/app/ledger/detail/LedgerCleaner.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/ledger/impl/LedgerDeltaAcquire.cpp b/src/xrpld/app/ledger/detail/LedgerDeltaAcquire.cpp similarity index 95% rename from src/ripple/app/ledger/impl/LedgerDeltaAcquire.cpp rename to src/xrpld/app/ledger/detail/LedgerDeltaAcquire.cpp index 3c19c6ee156..e079fb3ee27 100644 --- a/src/ripple/app/ledger/impl/LedgerDeltaAcquire.cpp +++ b/src/xrpld/app/ledger/detail/LedgerDeltaAcquire.cpp @@ -17,14 +17,14 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/ledger/impl/LedgerDeltaAcquire.h b/src/xrpld/app/ledger/detail/LedgerDeltaAcquire.h similarity index 96% rename from src/ripple/app/ledger/impl/LedgerDeltaAcquire.h rename to src/xrpld/app/ledger/detail/LedgerDeltaAcquire.h index 2f767cf27be..b0b2c76c245 100644 --- a/src/ripple/app/ledger/impl/LedgerDeltaAcquire.h +++ b/src/xrpld/app/ledger/detail/LedgerDeltaAcquire.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_APP_LEDGER_LEDGERDELTAACQUIRE_H_INCLUDED #define RIPPLE_APP_LEDGER_LEDGERDELTAACQUIRE_H_INCLUDED -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/app/ledger/impl/LedgerMaster.cpp b/src/xrpld/app/ledger/detail/LedgerMaster.cpp similarity index 98% rename from src/ripple/app/ledger/impl/LedgerMaster.cpp rename to src/xrpld/app/ledger/detail/LedgerMaster.cpp index 9388a3005ba..f03004fd14c 100644 --- a/src/ripple/app/ledger/impl/LedgerMaster.cpp +++ b/src/xrpld/app/ledger/detail/LedgerMaster.cpp @@ -17,41 +17,41 @@ */ //============================================================================== -#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 -#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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/app/ledger/impl/LedgerReplay.cpp b/src/xrpld/app/ledger/detail/LedgerReplay.cpp similarity index 95% rename from src/ripple/app/ledger/impl/LedgerReplay.cpp rename to src/xrpld/app/ledger/detail/LedgerReplay.cpp index 4a917cedf4a..40b4f9e412b 100644 --- a/src/ripple/app/ledger/impl/LedgerReplay.cpp +++ b/src/xrpld/app/ledger/detail/LedgerReplay.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include namespace ripple { diff --git a/src/ripple/app/ledger/impl/LedgerReplayMsgHandler.cpp b/src/xrpld/app/ledger/detail/LedgerReplayMsgHandler.cpp similarity index 97% rename from src/ripple/app/ledger/impl/LedgerReplayMsgHandler.cpp rename to src/xrpld/app/ledger/detail/LedgerReplayMsgHandler.cpp index c5301be7ea2..7b9d881d544 100644 --- a/src/ripple/app/ledger/impl/LedgerReplayMsgHandler.cpp +++ b/src/xrpld/app/ledger/detail/LedgerReplayMsgHandler.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include diff --git a/src/ripple/app/ledger/impl/LedgerReplayMsgHandler.h b/src/xrpld/app/ledger/detail/LedgerReplayMsgHandler.h similarity index 97% rename from src/ripple/app/ledger/impl/LedgerReplayMsgHandler.h rename to src/xrpld/app/ledger/detail/LedgerReplayMsgHandler.h index 169bedea057..151a21b9563 100644 --- a/src/ripple/app/ledger/impl/LedgerReplayMsgHandler.h +++ b/src/xrpld/app/ledger/detail/LedgerReplayMsgHandler.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_APP_LEDGER_LEDGERREPLAYMSGHANDLER_H_INCLUDED #define RIPPLE_APP_LEDGER_LEDGERREPLAYMSGHANDLER_H_INCLUDED -#include -#include +#include +#include namespace ripple { class Application; diff --git a/src/ripple/app/ledger/impl/LedgerReplayTask.cpp b/src/xrpld/app/ledger/detail/LedgerReplayTask.cpp similarity index 96% rename from src/ripple/app/ledger/impl/LedgerReplayTask.cpp rename to src/xrpld/app/ledger/detail/LedgerReplayTask.cpp index 46ce9815a6e..d7f29e33b3b 100644 --- a/src/ripple/app/ledger/impl/LedgerReplayTask.cpp +++ b/src/xrpld/app/ledger/detail/LedgerReplayTask.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/ledger/impl/LedgerReplayer.cpp b/src/xrpld/app/ledger/detail/LedgerReplayer.cpp similarity index 97% rename from src/ripple/app/ledger/impl/LedgerReplayer.cpp rename to src/xrpld/app/ledger/detail/LedgerReplayer.cpp index 903f72dd117..4aa0e4beb79 100644 --- a/src/ripple/app/ledger/impl/LedgerReplayer.cpp +++ b/src/xrpld/app/ledger/detail/LedgerReplayer.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include -#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/ledger/impl/LedgerToJson.cpp b/src/xrpld/app/ledger/detail/LedgerToJson.cpp similarity index 96% rename from src/ripple/app/ledger/impl/LedgerToJson.cpp rename to src/xrpld/app/ledger/detail/LedgerToJson.cpp index 1310dd13a65..95b572e9736 100644 --- a/src/ripple/app/ledger/impl/LedgerToJson.cpp +++ b/src/xrpld/app/ledger/detail/LedgerToJson.cpp @@ -17,17 +17,17 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/ledger/impl/LocalTxs.cpp b/src/xrpld/app/ledger/detail/LocalTxs.cpp similarity index 97% rename from src/ripple/app/ledger/impl/LocalTxs.cpp rename to src/xrpld/app/ledger/detail/LocalTxs.cpp index afee5e2d4d0..a6eb7721a3e 100644 --- a/src/ripple/app/ledger/impl/LocalTxs.cpp +++ b/src/xrpld/app/ledger/detail/LocalTxs.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include -#include +#include +#include +#include +#include /* This code prevents scenarios like the following: diff --git a/src/ripple/app/ledger/impl/OpenLedger.cpp b/src/xrpld/app/ledger/detail/OpenLedger.cpp similarity index 94% rename from src/ripple/app/ledger/impl/OpenLedger.cpp rename to src/xrpld/app/ledger/detail/OpenLedger.cpp index 7eef84fc554..461d98ae4ac 100644 --- a/src/ripple/app/ledger/impl/OpenLedger.cpp +++ b/src/xrpld/app/ledger/detail/OpenLedger.cpp @@ -17,16 +17,16 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/app/ledger/impl/SkipListAcquire.cpp b/src/xrpld/app/ledger/detail/SkipListAcquire.cpp similarity index 96% rename from src/ripple/app/ledger/impl/SkipListAcquire.cpp rename to src/xrpld/app/ledger/detail/SkipListAcquire.cpp index aa9b8564eb3..1d1de62b61b 100644 --- a/src/ripple/app/ledger/impl/SkipListAcquire.cpp +++ b/src/xrpld/app/ledger/detail/SkipListAcquire.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/ledger/impl/SkipListAcquire.h b/src/xrpld/app/ledger/detail/SkipListAcquire.h similarity index 96% rename from src/ripple/app/ledger/impl/SkipListAcquire.h rename to src/xrpld/app/ledger/detail/SkipListAcquire.h index df24d68312c..03c8181df68 100644 --- a/src/ripple/app/ledger/impl/SkipListAcquire.h +++ b/src/xrpld/app/ledger/detail/SkipListAcquire.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_APP_LEDGER_SKIPLISTACQUIRE_H_INCLUDED #define RIPPLE_APP_LEDGER_SKIPLISTACQUIRE_H_INCLUDED -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/app/ledger/impl/TimeoutCounter.cpp b/src/xrpld/app/ledger/detail/TimeoutCounter.cpp similarity index 95% rename from src/ripple/app/ledger/impl/TimeoutCounter.cpp rename to src/xrpld/app/ledger/detail/TimeoutCounter.cpp index 9ea20c06384..9d677dbe5a1 100644 --- a/src/ripple/app/ledger/impl/TimeoutCounter.cpp +++ b/src/xrpld/app/ledger/detail/TimeoutCounter.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include -#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/ledger/impl/TimeoutCounter.h b/src/xrpld/app/ledger/detail/TimeoutCounter.h similarity index 96% rename from src/ripple/app/ledger/impl/TimeoutCounter.h rename to src/xrpld/app/ledger/detail/TimeoutCounter.h index 88eda551acc..228e879d4de 100644 --- a/src/ripple/app/ledger/impl/TimeoutCounter.h +++ b/src/xrpld/app/ledger/detail/TimeoutCounter.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_APP_LEDGER_TIMEOUTCOUNTER_H_INCLUDED #define RIPPLE_APP_LEDGER_TIMEOUTCOUNTER_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/app/ledger/impl/TransactionAcquire.cpp b/src/xrpld/app/ledger/detail/TransactionAcquire.cpp similarity index 94% rename from src/ripple/app/ledger/impl/TransactionAcquire.cpp rename to src/xrpld/app/ledger/detail/TransactionAcquire.cpp index 24a03a16ffb..b3561875e96 100644 --- a/src/ripple/app/ledger/impl/TransactionAcquire.cpp +++ b/src/xrpld/app/ledger/detail/TransactionAcquire.cpp @@ -17,14 +17,14 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/ripple/app/ledger/impl/TransactionAcquire.h b/src/xrpld/app/ledger/detail/TransactionAcquire.h similarity index 95% rename from src/ripple/app/ledger/impl/TransactionAcquire.h rename to src/xrpld/app/ledger/detail/TransactionAcquire.h index 3863868fae0..230bce2fc94 100644 --- a/src/ripple/app/ledger/impl/TransactionAcquire.h +++ b/src/xrpld/app/ledger/detail/TransactionAcquire.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_APP_LEDGER_TRANSACTIONACQUIRE_H_INCLUDED #define RIPPLE_APP_LEDGER_TRANSACTIONACQUIRE_H_INCLUDED -#include -#include -#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/ledger/impl/TransactionMaster.cpp b/src/xrpld/app/ledger/detail/TransactionMaster.cpp similarity index 95% rename from src/ripple/app/ledger/impl/TransactionMaster.cpp rename to src/xrpld/app/ledger/detail/TransactionMaster.cpp index c4205887740..e2e1213a37e 100644 --- a/src/ripple/app/ledger/impl/TransactionMaster.cpp +++ b/src/xrpld/app/ledger/detail/TransactionMaster.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/main/Application.cpp b/src/xrpld/app/main/Application.cpp similarity index 96% rename from src/ripple/app/main/Application.cpp rename to src/xrpld/app/main/Application.cpp index 4f994cfe5ac..ff6cc0584ca 100644 --- a/src/ripple/app/main/Application.cpp +++ b/src/xrpld/app/main/Application.cpp @@ -17,63 +17,63 @@ */ //============================================================================== -#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 -#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 +#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 +#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/app/main/Application.h b/src/xrpld/app/main/Application.h similarity index 96% rename from src/ripple/app/main/Application.h rename to src/xrpld/app/main/Application.h index 4a7d72aec25..57e6f1730e5 100644 --- a/src/ripple/app/main/Application.h +++ b/src/xrpld/app/main/Application.h @@ -20,13 +20,13 @@ #ifndef RIPPLE_APP_MAIN_APPLICATION_H_INCLUDED #define RIPPLE_APP_MAIN_APPLICATION_H_INCLUDED -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/app/main/BasicApp.cpp b/src/xrpld/app/main/BasicApp.cpp similarity index 94% rename from src/ripple/app/main/BasicApp.cpp rename to src/xrpld/app/main/BasicApp.cpp index 5993df62fa7..504309d0838 100644 --- a/src/ripple/app/main/BasicApp.cpp +++ b/src/xrpld/app/main/BasicApp.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include BasicApp::BasicApp(std::size_t numberOfThreads) { diff --git a/src/ripple/app/main/BasicApp.h b/src/xrpld/app/main/BasicApp.h similarity index 100% rename from src/ripple/app/main/BasicApp.h rename to src/xrpld/app/main/BasicApp.h diff --git a/src/ripple/app/main/CollectorManager.cpp b/src/xrpld/app/main/CollectorManager.cpp similarity index 98% rename from src/ripple/app/main/CollectorManager.cpp rename to src/xrpld/app/main/CollectorManager.cpp index 6e6d0f47f24..ae7ff965f5c 100644 --- a/src/ripple/app/main/CollectorManager.cpp +++ b/src/xrpld/app/main/CollectorManager.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include namespace ripple { diff --git a/src/ripple/app/main/CollectorManager.h b/src/xrpld/app/main/CollectorManager.h similarity index 95% rename from src/ripple/app/main/CollectorManager.h rename to src/xrpld/app/main/CollectorManager.h index 46e113082d4..0bb3ae65c47 100644 --- a/src/ripple/app/main/CollectorManager.h +++ b/src/xrpld/app/main/CollectorManager.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_APP_MAIN_COLLECTORMANAGER_H_INCLUDED #define RIPPLE_APP_MAIN_COLLECTORMANAGER_H_INCLUDED -#include -#include +#include +#include namespace ripple { diff --git a/src/ripple/app/main/DBInit.h b/src/xrpld/app/main/DBInit.h similarity index 100% rename from src/ripple/app/main/DBInit.h rename to src/xrpld/app/main/DBInit.h diff --git a/src/ripple/app/main/GRPCServer.cpp b/src/xrpld/app/main/GRPCServer.cpp similarity index 98% rename from src/ripple/app/main/GRPCServer.cpp rename to src/xrpld/app/main/GRPCServer.cpp index a535a4a1a53..5d5a79db393 100644 --- a/src/ripple/app/main/GRPCServer.cpp +++ b/src/xrpld/app/main/GRPCServer.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include -#include -#include -#include +#include +#include +#include +#include -#include -#include +#include +#include namespace ripple { diff --git a/src/ripple/app/main/GRPCServer.h b/src/xrpld/app/main/GRPCServer.h similarity index 95% rename from src/ripple/app/main/GRPCServer.h rename to src/xrpld/app/main/GRPCServer.h index 79780e10137..39bfc0c9760 100644 --- a/src/ripple/app/main/GRPCServer.h +++ b/src/xrpld/app/main/GRPCServer.h @@ -20,19 +20,19 @@ #ifndef RIPPLE_CORE_GRPCSERVER_H_INCLUDED #define RIPPLE_CORE_GRPCSERVER_H_INCLUDED -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "org/xrpl/rpc/v1/xrp_ledger.grpc.pb.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include #include namespace ripple { diff --git a/src/ripple/app/main/LoadManager.cpp b/src/xrpld/app/main/LoadManager.cpp similarity index 95% rename from src/ripple/app/main/LoadManager.cpp rename to src/xrpld/app/main/LoadManager.cpp index 5e87063f000..f5dd8719470 100644 --- a/src/ripple/app/main/LoadManager.cpp +++ b/src/xrpld/app/main/LoadManager.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/app/main/LoadManager.h b/src/xrpld/app/main/LoadManager.h similarity index 98% rename from src/ripple/app/main/LoadManager.h rename to src/xrpld/app/main/LoadManager.h index 905006f5e41..f818068dcfa 100644 --- a/src/ripple/app/main/LoadManager.h +++ b/src/xrpld/app/main/LoadManager.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_APP_MAIN_LOADMANAGER_H_INCLUDED #define RIPPLE_APP_MAIN_LOADMANAGER_H_INCLUDED -#include +#include #include #include #include diff --git a/src/ripple/app/main/Main.cpp b/src/xrpld/app/main/Main.cpp similarity index 97% rename from src/ripple/app/main/Main.cpp rename to src/xrpld/app/main/Main.cpp index be4e354b6aa..059d9758d39 100644 --- a/src/ripple/app/main/Main.cpp +++ b/src/xrpld/app/main/Main.cpp @@ -17,26 +17,26 @@ */ //============================================================================== -#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 +#include +#include #ifdef ENABLE_TESTS -#include #include +#include #endif // ENABLE_TESTS #include diff --git a/src/ripple/app/main/NodeIdentity.cpp b/src/xrpld/app/main/NodeIdentity.cpp similarity index 92% rename from src/ripple/app/main/NodeIdentity.cpp rename to src/xrpld/app/main/NodeIdentity.cpp index e66b9e8400f..e0b83d54c8d 100644 --- a/src/ripple/app/main/NodeIdentity.cpp +++ b/src/xrpld/app/main/NodeIdentity.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/app/main/NodeIdentity.h b/src/xrpld/app/main/NodeIdentity.h similarity index 92% rename from src/ripple/app/main/NodeIdentity.h rename to src/xrpld/app/main/NodeIdentity.h index b82b3657aeb..b4da8651949 100644 --- a/src/ripple/app/main/NodeIdentity.h +++ b/src/xrpld/app/main/NodeIdentity.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_APP_MAIN_NODEIDENTITY_H_INCLUDED #define RIPPLE_APP_MAIN_NODEIDENTITY_H_INCLUDED -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/ripple/app/main/NodeStoreScheduler.cpp b/src/xrpld/app/main/NodeStoreScheduler.cpp similarity index 97% rename from src/ripple/app/main/NodeStoreScheduler.cpp rename to src/xrpld/app/main/NodeStoreScheduler.cpp index 0ac89096410..bf07e559fd3 100644 --- a/src/ripple/app/main/NodeStoreScheduler.cpp +++ b/src/xrpld/app/main/NodeStoreScheduler.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include namespace ripple { diff --git a/src/ripple/app/main/NodeStoreScheduler.h b/src/xrpld/app/main/NodeStoreScheduler.h similarity index 95% rename from src/ripple/app/main/NodeStoreScheduler.h rename to src/xrpld/app/main/NodeStoreScheduler.h index 5c68dc24f8d..b16142b2613 100644 --- a/src/ripple/app/main/NodeStoreScheduler.h +++ b/src/xrpld/app/main/NodeStoreScheduler.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_APP_MAIN_NODESTORESCHEDULER_H_INCLUDED #define RIPPLE_APP_MAIN_NODESTORESCHEDULER_H_INCLUDED -#include -#include +#include +#include #include namespace ripple { diff --git a/src/ripple/app/main/Tuning.h b/src/xrpld/app/main/Tuning.h similarity index 100% rename from src/ripple/app/main/Tuning.h rename to src/xrpld/app/main/Tuning.h diff --git a/src/ripple/app/misc/AMMHelpers.h b/src/xrpld/app/misc/AMMHelpers.h similarity index 98% rename from src/ripple/app/misc/AMMHelpers.h rename to src/xrpld/app/misc/AMMHelpers.h index 787bb2300a3..8bf5a5c5f12 100644 --- a/src/ripple/app/misc/AMMHelpers.h +++ b/src/xrpld/app/misc/AMMHelpers.h @@ -20,18 +20,18 @@ #ifndef RIPPLE_APP_MISC_AMMHELPERS_H_INCLUDED #define RIPPLE_APP_MISC_AMMHELPERS_H_INCLUDED -#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/app/misc/AMMUtils.h b/src/xrpld/app/misc/AMMUtils.h similarity index 94% rename from src/ripple/app/misc/AMMUtils.h rename to src/xrpld/app/misc/AMMUtils.h index 9cd4b7d6fec..52fe819a28e 100644 --- a/src/ripple/app/misc/AMMUtils.h +++ b/src/xrpld/app/misc/AMMUtils.h @@ -19,12 +19,12 @@ #ifndef RIPPLE_APP_MISC_AMMUTILS_H_INLCUDED #define RIPPLE_APP_MISC_AMMUTILS_H_INLCUDED -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/misc/AmendmentTable.h b/src/xrpld/app/misc/AmendmentTable.h similarity index 97% rename from src/ripple/app/misc/AmendmentTable.h rename to src/xrpld/app/misc/AmendmentTable.h index fef13d50ddb..538d7299f3b 100644 --- a/src/ripple/app/misc/AmendmentTable.h +++ b/src/xrpld/app/misc/AmendmentTable.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_APP_MISC_AMENDMENTTABLE_H_INCLUDED #define RIPPLE_APP_MISC_AMENDMENTTABLE_H_INCLUDED -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include diff --git a/src/ripple/app/misc/CanonicalTXSet.cpp b/src/xrpld/app/misc/CanonicalTXSet.cpp similarity index 98% rename from src/ripple/app/misc/CanonicalTXSet.cpp rename to src/xrpld/app/misc/CanonicalTXSet.cpp index a9fcd17f056..bb89b598962 100644 --- a/src/ripple/app/misc/CanonicalTXSet.cpp +++ b/src/xrpld/app/misc/CanonicalTXSet.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { diff --git a/src/ripple/app/misc/CanonicalTXSet.h b/src/xrpld/app/misc/CanonicalTXSet.h similarity index 96% rename from src/ripple/app/misc/CanonicalTXSet.h rename to src/xrpld/app/misc/CanonicalTXSet.h index 3ca2179448f..b061ff10dd6 100644 --- a/src/ripple/app/misc/CanonicalTXSet.h +++ b/src/xrpld/app/misc/CanonicalTXSet.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_APP_MISC_CANONICALTXSET_H_INCLUDED #define RIPPLE_APP_MISC_CANONICALTXSET_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/misc/DeliverMax.h b/src/xrpld/app/misc/DeliverMax.h similarity index 97% rename from src/ripple/app/misc/DeliverMax.h rename to src/xrpld/app/misc/DeliverMax.h index ddc20bdd7b4..3bc875ee4ba 100644 --- a/src/ripple/app/misc/DeliverMax.h +++ b/src/xrpld/app/misc/DeliverMax.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_APP_MISC_DELIVERMAX_H_INCLUDED #define RIPPLE_APP_MISC_DELIVERMAX_H_INCLUDED -#include +#include #include #include diff --git a/src/ripple/app/misc/FeeEscalation.md b/src/xrpld/app/misc/FeeEscalation.md similarity index 100% rename from src/ripple/app/misc/FeeEscalation.md rename to src/xrpld/app/misc/FeeEscalation.md diff --git a/src/ripple/app/misc/FeeVote.h b/src/xrpld/app/misc/FeeVote.h similarity index 91% rename from src/ripple/app/misc/FeeVote.h rename to src/xrpld/app/misc/FeeVote.h index a90f82efb35..47769e21e4d 100644 --- a/src/ripple/app/misc/FeeVote.h +++ b/src/xrpld/app/misc/FeeVote.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_APP_MISC_FEEVOTE_H_INCLUDED #define RIPPLE_APP_MISC_FEEVOTE_H_INCLUDED -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/misc/FeeVoteImpl.cpp b/src/xrpld/app/misc/FeeVoteImpl.cpp similarity index 95% rename from src/ripple/app/misc/FeeVoteImpl.cpp rename to src/xrpld/app/misc/FeeVoteImpl.cpp index 0d60dc6b78e..cb4e57b0f73 100644 --- a/src/ripple/app/misc/FeeVoteImpl.cpp +++ b/src/xrpld/app/misc/FeeVoteImpl.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { @@ -277,9 +277,9 @@ FeeVoteImpl::doVoting( } // choose our positions - // TODO: Use structured binding once LLVM issue - // https://github.com/llvm/llvm-project/issues/48582 - // is fixed. + // TODO: Use structured binding once LLVM 16 is the minimum supported + // version. See also: https://github.com/llvm/llvm-project/issues/48582 + // https://github.com/llvm/llvm-project/commit/127bf44385424891eb04cff8e52d3f157fc2cb7c auto const baseFee = baseFeeVote.getVotes(); auto const baseReserve = baseReserveVote.getVotes(); auto const incReserve = incReserveVote.getVotes(); diff --git a/src/ripple/app/misc/HashRouter.cpp b/src/xrpld/app/misc/HashRouter.cpp similarity index 98% rename from src/ripple/app/misc/HashRouter.cpp rename to src/xrpld/app/misc/HashRouter.cpp index 8085d6892ab..c117d20fe2b 100644 --- a/src/ripple/app/misc/HashRouter.cpp +++ b/src/xrpld/app/misc/HashRouter.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { diff --git a/src/ripple/app/misc/HashRouter.h b/src/xrpld/app/misc/HashRouter.h similarity index 96% rename from src/ripple/app/misc/HashRouter.h rename to src/xrpld/app/misc/HashRouter.h index 8c546b2c51d..e9d040fc8bf 100644 --- a/src/ripple/app/misc/HashRouter.h +++ b/src/xrpld/app/misc/HashRouter.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_APP_MISC_HASHROUTER_H_INCLUDED #define RIPPLE_APP_MISC_HASHROUTER_H_INCLUDED -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include diff --git a/src/ripple/app/misc/LoadFeeTrack.h b/src/xrpld/app/misc/LoadFeeTrack.h similarity index 96% rename from src/ripple/app/misc/LoadFeeTrack.h rename to src/xrpld/app/misc/LoadFeeTrack.h index d670c0b7e11..6c37864e2fd 100644 --- a/src/ripple/app/misc/LoadFeeTrack.h +++ b/src/xrpld/app/misc/LoadFeeTrack.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_CORE_LOADFEETRACK_H_INCLUDED #define RIPPLE_CORE_LOADFEETRACK_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/app/misc/Manifest.h b/src/xrpld/app/misc/Manifest.h similarity index 98% rename from src/ripple/app/misc/Manifest.h rename to src/xrpld/app/misc/Manifest.h index b1cb5d2f325..1b53fda77b5 100644 --- a/src/ripple/app/misc/Manifest.h +++ b/src/xrpld/app/misc/Manifest.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_APP_MISC_MANIFEST_H_INCLUDED #define RIPPLE_APP_MISC_MANIFEST_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/app/misc/NegativeUNLVote.cpp b/src/xrpld/app/misc/NegativeUNLVote.cpp similarity index 98% rename from src/ripple/app/misc/NegativeUNLVote.cpp rename to src/xrpld/app/misc/NegativeUNLVote.cpp index 9b616be6ce1..45d72bcd2b3 100644 --- a/src/ripple/app/misc/NegativeUNLVote.cpp +++ b/src/xrpld/app/misc/NegativeUNLVote.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include -#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/misc/NegativeUNLVote.h b/src/xrpld/app/misc/NegativeUNLVote.h similarity index 97% rename from src/ripple/app/misc/NegativeUNLVote.h rename to src/xrpld/app/misc/NegativeUNLVote.h index 6ba8b3bf26e..f0284f267a8 100644 --- a/src/ripple/app/misc/NegativeUNLVote.h +++ b/src/xrpld/app/misc/NegativeUNLVote.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_APP_MISC_NEGATIVEUNLVOTE_H_INCLUDED #define RIPPLE_APP_MISC_NEGATIVEUNLVOTE_H_INCLUDED -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include diff --git a/src/ripple/app/misc/NetworkOPs.cpp b/src/xrpld/app/misc/NetworkOPs.cpp similarity index 98% rename from src/ripple/app/misc/NetworkOPs.cpp rename to src/xrpld/app/misc/NetworkOPs.cpp index cd85bc9e4e1..9cf5d097099 100644 --- a/src/ripple/app/misc/NetworkOPs.cpp +++ b/src/xrpld/app/misc/NetworkOPs.cpp @@ -17,57 +17,57 @@ */ //============================================================================== -#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 -#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 +#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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/app/misc/NetworkOPs.h b/src/xrpld/app/misc/NetworkOPs.h similarity index 97% rename from src/ripple/app/misc/NetworkOPs.h rename to src/xrpld/app/misc/NetworkOPs.h index d53127ed3b6..d5f43a42972 100644 --- a/src/ripple/app/misc/NetworkOPs.h +++ b/src/xrpld/app/misc/NetworkOPs.h @@ -20,13 +20,13 @@ #ifndef RIPPLE_APP_MISC_NETWORKOPS_H_INCLUDED #define RIPPLE_APP_MISC_NETWORKOPS_H_INCLUDED -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/app/misc/README.md b/src/xrpld/app/misc/README.md similarity index 100% rename from src/ripple/app/misc/README.md rename to src/xrpld/app/misc/README.md diff --git a/src/ripple/app/misc/SHAMapStore.h b/src/xrpld/app/misc/SHAMapStore.h similarity index 96% rename from src/ripple/app/misc/SHAMapStore.h rename to src/xrpld/app/misc/SHAMapStore.h index c42e5f5a52a..d8415713a76 100644 --- a/src/ripple/app/misc/SHAMapStore.h +++ b/src/xrpld/app/misc/SHAMapStore.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_APP_MISC_SHAMAPSTORE_H_INCLUDED #define RIPPLE_APP_MISC_SHAMAPSTORE_H_INCLUDED -#include -#include -#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/app/misc/SHAMapStoreImp.cpp b/src/xrpld/app/misc/SHAMapStoreImp.cpp similarity index 97% rename from src/ripple/app/misc/SHAMapStoreImp.cpp rename to src/xrpld/app/misc/SHAMapStoreImp.cpp index d5cb07792dc..d32556a4b29 100644 --- a/src/ripple/app/misc/SHAMapStoreImp.cpp +++ b/src/xrpld/app/misc/SHAMapStoreImp.cpp @@ -17,18 +17,18 @@ */ //============================================================================== -#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/app/misc/SHAMapStoreImp.h b/src/xrpld/app/misc/SHAMapStoreImp.h similarity index 96% rename from src/ripple/app/misc/SHAMapStoreImp.h rename to src/xrpld/app/misc/SHAMapStoreImp.h index 995ee0267bb..7d36f092be8 100644 --- a/src/ripple/app/misc/SHAMapStoreImp.h +++ b/src/xrpld/app/misc/SHAMapStoreImp.h @@ -20,14 +20,14 @@ #ifndef RIPPLE_APP_MISC_SHAMAPSTOREIMP_H_INCLUDED #define RIPPLE_APP_MISC_SHAMAPSTOREIMP_H_INCLUDED -#include -#include -#include -#include -#include -#include - -#include +#include +#include +#include +#include +#include +#include + +#include #include #include #include diff --git a/src/ripple/app/misc/Transaction.h b/src/xrpld/app/misc/Transaction.h similarity index 97% rename from src/ripple/app/misc/Transaction.h rename to src/xrpld/app/misc/Transaction.h index 36815ba0aa0..a2ef496dffd 100644 --- a/src/ripple/app/misc/Transaction.h +++ b/src/xrpld/app/misc/Transaction.h @@ -20,14 +20,14 @@ #ifndef RIPPLE_APP_MISC_TRANSACTION_H_INCLUDED #define RIPPLE_APP_MISC_TRANSACTION_H_INCLUDED -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/app/misc/TxQ.h b/src/xrpld/app/misc/TxQ.h similarity index 99% rename from src/ripple/app/misc/TxQ.h rename to src/xrpld/app/misc/TxQ.h index 7be29b49021..b962d96d50f 100644 --- a/src/ripple/app/misc/TxQ.h +++ b/src/xrpld/app/misc/TxQ.h @@ -20,13 +20,13 @@ #ifndef RIPPLE_TXQ_H_INCLUDED #define RIPPLE_TXQ_H_INCLUDED -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/app/misc/ValidatorKeys.h b/src/xrpld/app/misc/ValidatorKeys.h similarity index 94% rename from src/ripple/app/misc/ValidatorKeys.h rename to src/xrpld/app/misc/ValidatorKeys.h index a6b53841739..f5b9e5735a6 100644 --- a/src/ripple/app/misc/ValidatorKeys.h +++ b/src/xrpld/app/misc/ValidatorKeys.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_APP_MISC_VALIDATOR_KEYS_H_INCLUDED #define RIPPLE_APP_MISC_VALIDATOR_KEYS_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/app/misc/ValidatorList.h b/src/xrpld/app/misc/ValidatorList.h similarity index 98% rename from src/ripple/app/misc/ValidatorList.h rename to src/xrpld/app/misc/ValidatorList.h index 4d792b36b0f..543eba2f6b7 100644 --- a/src/ripple/app/misc/ValidatorList.h +++ b/src/xrpld/app/misc/ValidatorList.h @@ -20,14 +20,14 @@ #ifndef RIPPLE_APP_MISC_VALIDATORLIST_H_INCLUDED #define RIPPLE_APP_MISC_VALIDATORLIST_H_INCLUDED -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/app/misc/ValidatorSite.h b/src/xrpld/app/misc/ValidatorSite.h similarity index 96% rename from src/ripple/app/misc/ValidatorSite.h rename to src/xrpld/app/misc/ValidatorSite.h index 57606066bf0..39bf895807f 100644 --- a/src/ripple/app/misc/ValidatorSite.h +++ b/src/xrpld/app/misc/ValidatorSite.h @@ -20,13 +20,13 @@ #ifndef RIPPLE_APP_MISC_VALIDATORSITE_H_INCLUDED #define RIPPLE_APP_MISC_VALIDATORSITE_H_INCLUDED -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/ripple/app/misc/impl/AMMHelpers.cpp b/src/xrpld/app/misc/detail/AMMHelpers.cpp similarity index 99% rename from src/ripple/app/misc/impl/AMMHelpers.cpp rename to src/xrpld/app/misc/detail/AMMHelpers.cpp index 5ad59ea1c28..f10b4c15eb0 100644 --- a/src/ripple/app/misc/impl/AMMHelpers.cpp +++ b/src/xrpld/app/misc/detail/AMMHelpers.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { diff --git a/src/ripple/app/misc/impl/AMMUtils.cpp b/src/xrpld/app/misc/detail/AMMUtils.cpp similarity index 97% rename from src/ripple/app/misc/impl/AMMUtils.cpp rename to src/xrpld/app/misc/detail/AMMUtils.cpp index 4f6f0fbd3b5..efc80cf17b6 100644 --- a/src/ripple/app/misc/impl/AMMUtils.cpp +++ b/src/xrpld/app/misc/detail/AMMUtils.cpp @@ -16,12 +16,12 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ //============================================================================== -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace ripple { @@ -312,7 +312,7 @@ initializeFeeAuctionVote( auto const& rules = view.rules(); // AMM creator gets the voting slot. STArray voteSlots; - STObject voteEntry = STObject::makeInnerObject(sfVoteEntry, rules); + STObject voteEntry = STObject::makeInnerObject(sfVoteEntry); if (tfee != 0) voteEntry.setFieldU16(sfTradingFee, tfee); voteEntry.setFieldU32(sfVoteWeight, VOTE_WEIGHT_SCALE_FACTOR); @@ -325,7 +325,7 @@ initializeFeeAuctionVote( if (rules.enabled(fixInnerObjTemplate) && !ammSle->isFieldPresent(sfAuctionSlot)) { - STObject auctionSlot = STObject::makeInnerObject(sfAuctionSlot, rules); + STObject auctionSlot = STObject::makeInnerObject(sfAuctionSlot); ammSle->set(std::move(auctionSlot)); } STObject& auctionSlot = ammSle->peekFieldObject(sfAuctionSlot); diff --git a/src/ripple/app/misc/impl/AccountTxPaging.cpp b/src/xrpld/app/misc/detail/AccountTxPaging.cpp similarity index 86% rename from src/ripple/app/misc/impl/AccountTxPaging.cpp rename to src/xrpld/app/misc/detail/AccountTxPaging.cpp index 433463e2826..898c41b40c4 100644 --- a/src/ripple/app/misc/impl/AccountTxPaging.cpp +++ b/src/xrpld/app/misc/detail/AccountTxPaging.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include -#include -#include -#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/xrpld/app/misc/detail/AccountTxPaging.h similarity index 97% rename from src/ripple/app/misc/impl/AccountTxPaging.h rename to src/xrpld/app/misc/detail/AccountTxPaging.h index 6b8f235b5a8..23a5cbd9c23 100644 --- a/src/ripple/app/misc/impl/AccountTxPaging.h +++ b/src/xrpld/app/misc/detail/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/impl/AmendmentTable.cpp b/src/xrpld/app/misc/detail/AmendmentTable.cpp similarity index 99% rename from src/ripple/app/misc/impl/AmendmentTable.cpp rename to src/xrpld/app/misc/detail/AmendmentTable.cpp index 8f9556e0714..62b80890821 100644 --- a/src/ripple/app/misc/impl/AmendmentTable.cpp +++ b/src/xrpld/app/misc/detail/AmendmentTable.cpp @@ -17,14 +17,14 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/app/misc/impl/DeliverMax.cpp b/src/xrpld/app/misc/detail/DeliverMax.cpp similarity index 95% rename from src/ripple/app/misc/impl/DeliverMax.cpp rename to src/xrpld/app/misc/detail/DeliverMax.cpp index 810b750a355..58a23599728 100644 --- a/src/ripple/app/misc/impl/DeliverMax.cpp +++ b/src/xrpld/app/misc/detail/DeliverMax.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include +#include -#include +#include namespace ripple { namespace RPC { diff --git a/src/ripple/app/misc/impl/LoadFeeTrack.cpp b/src/xrpld/app/misc/detail/LoadFeeTrack.cpp similarity index 90% rename from src/ripple/app/misc/impl/LoadFeeTrack.cpp rename to src/xrpld/app/misc/detail/LoadFeeTrack.cpp index 86d145c856c..1267af594d0 100644 --- a/src/ripple/app/misc/impl/LoadFeeTrack.cpp +++ b/src/xrpld/app/misc/detail/LoadFeeTrack.cpp @@ -17,15 +17,15 @@ */ //============================================================================== -#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/app/misc/impl/Manifest.cpp b/src/xrpld/app/misc/detail/Manifest.cpp similarity index 98% rename from src/ripple/app/misc/impl/Manifest.cpp rename to src/xrpld/app/misc/detail/Manifest.cpp index 2916d6d2f32..a17858ceb39 100644 --- a/src/ripple/app/misc/impl/Manifest.cpp +++ b/src/xrpld/app/misc/detail/Manifest.cpp @@ -17,15 +17,15 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/ripple/app/misc/impl/Transaction.cpp b/src/xrpld/app/misc/detail/Transaction.cpp similarity index 89% rename from src/ripple/app/misc/impl/Transaction.cpp rename to src/xrpld/app/misc/detail/Transaction.cpp index e3ec41a25d4..e0c3f260fe5 100644 --- a/src/ripple/app/misc/impl/Transaction.cpp +++ b/src/xrpld/app/misc/detail/Transaction.cpp @@ -17,21 +17,21 @@ */ //============================================================================== -#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 namespace ripple { diff --git a/src/ripple/app/misc/impl/TxQ.cpp b/src/xrpld/app/misc/detail/TxQ.cpp similarity index 99% rename from src/ripple/app/misc/impl/TxQ.cpp rename to src/xrpld/app/misc/detail/TxQ.cpp index faaca0655cf..159a700cc3f 100644 --- a/src/ripple/app/misc/impl/TxQ.cpp +++ b/src/xrpld/app/misc/detail/TxQ.cpp @@ -17,15 +17,15 @@ */ //============================================================================== -#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/app/misc/impl/ValidatorKeys.cpp b/src/xrpld/app/misc/detail/ValidatorKeys.cpp similarity index 93% rename from src/ripple/app/misc/impl/ValidatorKeys.cpp rename to src/xrpld/app/misc/detail/ValidatorKeys.cpp index 8da1992a2ef..2b36848c882 100644 --- a/src/ripple/app/misc/impl/ValidatorKeys.cpp +++ b/src/xrpld/app/misc/detail/ValidatorKeys.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace ripple { ValidatorKeys::ValidatorKeys(Config const& config, beast::Journal j) diff --git a/src/ripple/app/misc/impl/ValidatorList.cpp b/src/xrpld/app/misc/detail/ValidatorList.cpp similarity index 99% rename from src/ripple/app/misc/impl/ValidatorList.cpp rename to src/xrpld/app/misc/detail/ValidatorList.cpp index 13dcd7873db..a3854106a1c 100644 --- a/src/ripple/app/misc/impl/ValidatorList.cpp +++ b/src/xrpld/app/misc/detail/ValidatorList.cpp @@ -17,20 +17,20 @@ */ //============================================================================== -#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/app/misc/impl/ValidatorSite.cpp b/src/xrpld/app/misc/detail/ValidatorSite.cpp similarity index 98% rename from src/ripple/app/misc/impl/ValidatorSite.cpp rename to src/xrpld/app/misc/detail/ValidatorSite.cpp index 013d7e96ffd..0c12816c1b8 100644 --- a/src/ripple/app/misc/impl/ValidatorSite.cpp +++ b/src/xrpld/app/misc/detail/ValidatorSite.cpp @@ -17,16 +17,16 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/app/misc/detail/Work.h b/src/xrpld/app/misc/detail/Work.h similarity index 100% rename from src/ripple/app/misc/detail/Work.h rename to src/xrpld/app/misc/detail/Work.h diff --git a/src/ripple/app/misc/detail/WorkBase.h b/src/xrpld/app/misc/detail/WorkBase.h similarity index 98% rename from src/ripple/app/misc/detail/WorkBase.h rename to src/xrpld/app/misc/detail/WorkBase.h index 4b2c88f71a1..d7795af8bf0 100644 --- a/src/ripple/app/misc/detail/WorkBase.h +++ b/src/xrpld/app/misc/detail/WorkBase.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_APP_MISC_DETAIL_WORKBASE_H_INCLUDED #define RIPPLE_APP_MISC_DETAIL_WORKBASE_H_INCLUDED -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/ripple/app/misc/detail/WorkFile.h b/src/xrpld/app/misc/detail/WorkFile.h similarity index 95% rename from src/ripple/app/misc/detail/WorkFile.h rename to src/xrpld/app/misc/detail/WorkFile.h index 2dc451feaca..266e5098cb6 100644 --- a/src/ripple/app/misc/detail/WorkFile.h +++ b/src/xrpld/app/misc/detail/WorkFile.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_APP_MISC_DETAIL_WORKFILE_H_INCLUDED #define RIPPLE_APP_MISC_DETAIL_WORKFILE_H_INCLUDED -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/ripple/app/misc/detail/WorkPlain.h b/src/xrpld/app/misc/detail/WorkPlain.h similarity index 98% rename from src/ripple/app/misc/detail/WorkPlain.h rename to src/xrpld/app/misc/detail/WorkPlain.h index e70d327c223..16bf424131f 100644 --- a/src/ripple/app/misc/detail/WorkPlain.h +++ b/src/xrpld/app/misc/detail/WorkPlain.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_APP_MISC_DETAIL_WORKPLAIN_H_INCLUDED #define RIPPLE_APP_MISC_DETAIL_WORKPLAIN_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/app/misc/detail/WorkSSL.h b/src/xrpld/app/misc/detail/WorkSSL.h similarity index 93% rename from src/ripple/app/misc/detail/WorkSSL.h rename to src/xrpld/app/misc/detail/WorkSSL.h index c7e3de614c2..d48f0b5fdff 100644 --- a/src/ripple/app/misc/detail/WorkSSL.h +++ b/src/xrpld/app/misc/detail/WorkSSL.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_APP_MISC_DETAIL_WORKSSL_H_INCLUDED #define RIPPLE_APP_MISC_DETAIL_WORKSSL_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/app/misc/detail/impl/WorkSSL.cpp b/src/xrpld/app/misc/detail/detail/WorkSSL.cpp similarity index 98% rename from src/ripple/app/misc/detail/impl/WorkSSL.cpp rename to src/xrpld/app/misc/detail/detail/WorkSSL.cpp index 78a269e67cc..0285f435026 100644 --- a/src/ripple/app/misc/detail/impl/WorkSSL.cpp +++ b/src/xrpld/app/misc/detail/detail/WorkSSL.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { namespace detail { diff --git a/src/ripple/app/paths/AMMContext.h b/src/xrpld/app/paths/AMMContext.h similarity index 98% rename from src/ripple/app/paths/AMMContext.h rename to src/xrpld/app/paths/AMMContext.h index 06835189bb7..f744b8a6c91 100644 --- a/src/ripple/app/paths/AMMContext.h +++ b/src/xrpld/app/paths/AMMContext.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_APP_PATHS_AMMCONTEXT_H_INCLUDED #define RIPPLE_APP_PATHS_AMMCONTEXT_H_INCLUDED -#include +#include #include diff --git a/src/ripple/app/paths/AMMLiquidity.h b/src/xrpld/app/paths/AMMLiquidity.h similarity index 94% rename from src/ripple/app/paths/AMMLiquidity.h rename to src/xrpld/app/paths/AMMLiquidity.h index 60155dbf13f..fe60d39262f 100644 --- a/src/ripple/app/paths/AMMLiquidity.h +++ b/src/xrpld/app/paths/AMMLiquidity.h @@ -20,14 +20,14 @@ #ifndef RIPPLE_APP_TX_AMMLIQUIDITY_H_INCLUDED #define RIPPLE_APP_TX_AMMLIQUIDITY_H_INCLUDED -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/paths/AMMOffer.h b/src/xrpld/app/paths/AMMOffer.h similarity index 97% rename from src/ripple/app/paths/AMMOffer.h rename to src/xrpld/app/paths/AMMOffer.h index e47a5613b09..e90a5b8611f 100644 --- a/src/ripple/app/paths/AMMOffer.h +++ b/src/xrpld/app/paths/AMMOffer.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_APP_AMMOFFER_H_INCLUDED #define RIPPLE_APP_AMMOFFER_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/paths/AccountCurrencies.cpp b/src/xrpld/app/paths/AccountCurrencies.cpp similarity index 98% rename from src/ripple/app/paths/AccountCurrencies.cpp rename to src/xrpld/app/paths/AccountCurrencies.cpp index 18452725b67..8646b46939a 100644 --- a/src/ripple/app/paths/AccountCurrencies.cpp +++ b/src/xrpld/app/paths/AccountCurrencies.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { diff --git a/src/ripple/app/paths/AccountCurrencies.h b/src/xrpld/app/paths/AccountCurrencies.h similarity index 94% rename from src/ripple/app/paths/AccountCurrencies.h rename to src/xrpld/app/paths/AccountCurrencies.h index fa70ec2a081..26282e742c3 100644 --- a/src/ripple/app/paths/AccountCurrencies.h +++ b/src/xrpld/app/paths/AccountCurrencies.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_APP_PATHS_ACCOUNTCURRENCIES_H_INCLUDED #define RIPPLE_APP_PATHS_ACCOUNTCURRENCIES_H_INCLUDED -#include -#include +#include +#include namespace ripple { diff --git a/src/ripple/app/paths/Credit.cpp b/src/xrpld/app/paths/Credit.cpp similarity index 93% rename from src/ripple/app/paths/Credit.cpp rename to src/xrpld/app/paths/Credit.cpp index b9b19d29f90..c11f628a11d 100644 --- a/src/ripple/app/paths/Credit.cpp +++ b/src/xrpld/app/paths/Credit.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include -#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/paths/Credit.h b/src/xrpld/app/paths/Credit.h similarity index 95% rename from src/ripple/app/paths/Credit.h rename to src/xrpld/app/paths/Credit.h index dea9cbcde3e..1f9d5b04fe9 100644 --- a/src/ripple/app/paths/Credit.h +++ b/src/xrpld/app/paths/Credit.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_APP_PATHS_CREDIT_H_INCLUDED #define RIPPLE_APP_PATHS_CREDIT_H_INCLUDED -#include -#include -#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/paths/Flow.cpp b/src/xrpld/app/paths/Flow.cpp similarity index 94% rename from src/ripple/app/paths/Flow.cpp rename to src/xrpld/app/paths/Flow.cpp index 83379d34e79..c21d40c33b5 100644 --- a/src/ripple/app/paths/Flow.cpp +++ b/src/xrpld/app/paths/Flow.cpp @@ -17,15 +17,15 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/ripple/app/paths/Flow.h b/src/xrpld/app/paths/Flow.h similarity index 95% rename from src/ripple/app/paths/Flow.h rename to src/xrpld/app/paths/Flow.h index deafd1c7716..5390394b7f0 100644 --- a/src/ripple/app/paths/Flow.h +++ b/src/xrpld/app/paths/Flow.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_APP_PATHS_FLOW_H_INCLUDED #define RIPPLE_APP_PATHS_FLOW_H_INCLUDED -#include -#include -#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/paths/PathRequest.cpp b/src/xrpld/app/paths/PathRequest.cpp similarity index 97% rename from src/ripple/app/paths/PathRequest.cpp rename to src/xrpld/app/paths/PathRequest.cpp index 948c6698ad1..4cd9f7d71f7 100644 --- a/src/ripple/app/paths/PathRequest.cpp +++ b/src/xrpld/app/paths/PathRequest.cpp @@ -17,22 +17,22 @@ */ //============================================================================== -#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 #include #include diff --git a/src/ripple/app/paths/PathRequest.h b/src/xrpld/app/paths/PathRequest.h similarity index 95% rename from src/ripple/app/paths/PathRequest.h rename to src/xrpld/app/paths/PathRequest.h index 70c286d6e1f..21f10d066ba 100644 --- a/src/ripple/app/paths/PathRequest.h +++ b/src/xrpld/app/paths/PathRequest.h @@ -20,12 +20,12 @@ #ifndef RIPPLE_APP_PATHS_PATHREQUEST_H_INCLUDED #define RIPPLE_APP_PATHS_PATHREQUEST_H_INCLUDED -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/app/paths/PathRequests.cpp b/src/xrpld/app/paths/PathRequests.cpp similarity index 96% rename from src/ripple/app/paths/PathRequests.cpp rename to src/xrpld/app/paths/PathRequests.cpp index 700cf137209..86560445ec7 100644 --- a/src/ripple/app/paths/PathRequests.cpp +++ b/src/xrpld/app/paths/PathRequests.cpp @@ -17,15 +17,15 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/app/paths/PathRequests.h b/src/xrpld/app/paths/PathRequests.h similarity index 95% rename from src/ripple/app/paths/PathRequests.h rename to src/xrpld/app/paths/PathRequests.h index db683ee4c13..670790518a1 100644 --- a/src/ripple/app/paths/PathRequests.h +++ b/src/xrpld/app/paths/PathRequests.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_APP_PATHS_PATHREQUESTS_H_INCLUDED #define RIPPLE_APP_PATHS_PATHREQUESTS_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/app/paths/Pathfinder.cpp b/src/xrpld/app/paths/Pathfinder.cpp similarity index 98% rename from src/ripple/app/paths/Pathfinder.cpp rename to src/xrpld/app/paths/Pathfinder.cpp index 556622ee7bf..885a8ae9b47 100644 --- a/src/ripple/app/paths/Pathfinder.cpp +++ b/src/xrpld/app/paths/Pathfinder.cpp @@ -17,18 +17,18 @@ */ //============================================================================== -#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/app/paths/Pathfinder.h b/src/xrpld/app/paths/Pathfinder.h similarity index 96% rename from src/ripple/app/paths/Pathfinder.h rename to src/xrpld/app/paths/Pathfinder.h index 375e5e24677..01556a3c63f 100644 --- a/src/ripple/app/paths/Pathfinder.h +++ b/src/xrpld/app/paths/Pathfinder.h @@ -20,12 +20,12 @@ #ifndef RIPPLE_APP_PATHS_PATHFINDER_H_INCLUDED #define RIPPLE_APP_PATHS_PATHFINDER_H_INCLUDED -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/paths/RippleCalc.cpp b/src/xrpld/app/paths/RippleCalc.cpp similarity index 95% rename from src/ripple/app/paths/RippleCalc.cpp rename to src/xrpld/app/paths/RippleCalc.cpp index 87ef694fa58..c7b2e1f01e0 100644 --- a/src/ripple/app/paths/RippleCalc.cpp +++ b/src/xrpld/app/paths/RippleCalc.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace ripple { namespace path { diff --git a/src/ripple/app/paths/RippleCalc.h b/src/xrpld/app/paths/RippleCalc.h similarity index 96% rename from src/ripple/app/paths/RippleCalc.h rename to src/xrpld/app/paths/RippleCalc.h index fd9ff598114..9e03da9c906 100644 --- a/src/ripple/app/paths/RippleCalc.h +++ b/src/xrpld/app/paths/RippleCalc.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_APP_PATHS_RIPPLECALC_H_INCLUDED #define RIPPLE_APP_PATHS_RIPPLECALC_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/src/ripple/app/paths/RippleLineCache.cpp b/src/xrpld/app/paths/RippleLineCache.cpp similarity index 97% rename from src/ripple/app/paths/RippleLineCache.cpp rename to src/xrpld/app/paths/RippleLineCache.cpp index 2487924ff0e..0ff967c0821 100644 --- a/src/ripple/app/paths/RippleLineCache.cpp +++ b/src/xrpld/app/paths/RippleLineCache.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include -#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/paths/RippleLineCache.h b/src/xrpld/app/paths/RippleLineCache.h similarity index 96% rename from src/ripple/app/paths/RippleLineCache.h rename to src/xrpld/app/paths/RippleLineCache.h index 590c50082f7..cde1d589f92 100644 --- a/src/ripple/app/paths/RippleLineCache.h +++ b/src/xrpld/app/paths/RippleLineCache.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_APP_PATHS_RIPPLELINECACHE_H_INCLUDED #define RIPPLE_APP_PATHS_RIPPLELINECACHE_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/app/paths/TrustLine.cpp b/src/xrpld/app/paths/TrustLine.cpp similarity index 96% rename from src/ripple/app/paths/TrustLine.cpp rename to src/xrpld/app/paths/TrustLine.cpp index 14a5d6f8823..6390c8d2117 100644 --- a/src/ripple/app/paths/TrustLine.cpp +++ b/src/xrpld/app/paths/TrustLine.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/ripple/app/paths/TrustLine.h b/src/xrpld/app/paths/TrustLine.h similarity index 97% rename from src/ripple/app/paths/TrustLine.h rename to src/xrpld/app/paths/TrustLine.h index 6b27dca3669..381ef471875 100644 --- a/src/ripple/app/paths/TrustLine.h +++ b/src/xrpld/app/paths/TrustLine.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_APP_PATHS_RIPPLESTATE_H_INCLUDED #define RIPPLE_APP_PATHS_RIPPLESTATE_H_INCLUDED -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/app/paths/impl/AMMLiquidity.cpp b/src/xrpld/app/paths/detail/AMMLiquidity.cpp similarity index 99% rename from src/ripple/app/paths/impl/AMMLiquidity.cpp rename to src/xrpld/app/paths/detail/AMMLiquidity.cpp index 9ec23d08a1a..8215cdee593 100644 --- a/src/ripple/app/paths/impl/AMMLiquidity.cpp +++ b/src/xrpld/app/paths/detail/AMMLiquidity.cpp @@ -16,9 +16,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ //============================================================================== -#include +#include -#include +#include namespace ripple { diff --git a/src/ripple/app/paths/impl/AMMOffer.cpp b/src/xrpld/app/paths/detail/AMMOffer.cpp similarity index 98% rename from src/ripple/app/paths/impl/AMMOffer.cpp rename to src/xrpld/app/paths/detail/AMMOffer.cpp index bf85ead6194..16ea8628f3b 100644 --- a/src/ripple/app/paths/impl/AMMOffer.cpp +++ b/src/xrpld/app/paths/detail/AMMOffer.cpp @@ -16,10 +16,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ //==============================================================================/ -#include +#include -#include -#include +#include +#include namespace ripple { diff --git a/src/ripple/app/paths/impl/AmountSpec.h b/src/xrpld/app/paths/detail/AmountSpec.h similarity index 97% rename from src/ripple/app/paths/impl/AmountSpec.h rename to src/xrpld/app/paths/detail/AmountSpec.h index ca814c7b3ac..8a1117f9920 100644 --- a/src/ripple/app/paths/impl/AmountSpec.h +++ b/src/xrpld/app/paths/detail/AmountSpec.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_PATH_IMPL_AMOUNTSPEC_H_INCLUDED #define RIPPLE_PATH_IMPL_AMOUNTSPEC_H_INCLUDED -#include -#include -#include +#include +#include +#include #include diff --git a/src/ripple/app/paths/impl/BookStep.cpp b/src/xrpld/app/paths/detail/BookStep.cpp similarity index 98% rename from src/ripple/app/paths/impl/BookStep.cpp rename to src/xrpld/app/paths/detail/BookStep.cpp index af0c40b1925..96971a516fc 100644 --- a/src/ripple/app/paths/impl/BookStep.cpp +++ b/src/xrpld/app/paths/detail/BookStep.cpp @@ -17,21 +17,20 @@ */ //============================================================================== -#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/app/paths/impl/DirectStep.cpp b/src/xrpld/app/paths/detail/DirectStep.cpp similarity index 99% rename from src/ripple/app/paths/impl/DirectStep.cpp rename to src/xrpld/app/paths/detail/DirectStep.cpp index 00647121b74..25e78e9c47e 100644 --- a/src/ripple/app/paths/impl/DirectStep.cpp +++ b/src/xrpld/app/paths/detail/DirectStep.cpp @@ -17,14 +17,14 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/ripple/app/paths/impl/FlatSets.h b/src/xrpld/app/paths/detail/FlatSets.h similarity index 100% rename from src/ripple/app/paths/impl/FlatSets.h rename to src/xrpld/app/paths/detail/FlatSets.h diff --git a/src/ripple/app/paths/impl/FlowDebugInfo.h b/src/xrpld/app/paths/detail/FlowDebugInfo.h similarity index 98% rename from src/ripple/app/paths/impl/FlowDebugInfo.h rename to src/xrpld/app/paths/detail/FlowDebugInfo.h index 2d1728b5f88..000db4e5714 100644 --- a/src/ripple/app/paths/impl/FlowDebugInfo.h +++ b/src/xrpld/app/paths/detail/FlowDebugInfo.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_PATH_IMPL_FLOWDEBUGINFO_H_INCLUDED #define RIPPLE_PATH_IMPL_FLOWDEBUGINFO_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/src/ripple/app/paths/impl/PathfinderUtils.h b/src/xrpld/app/paths/detail/PathfinderUtils.h similarity index 97% rename from src/ripple/app/paths/impl/PathfinderUtils.h rename to src/xrpld/app/paths/detail/PathfinderUtils.h index 066d905a1cd..b06dded75bd 100644 --- a/src/ripple/app/paths/impl/PathfinderUtils.h +++ b/src/xrpld/app/paths/detail/PathfinderUtils.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_PATH_IMPL_PATHFINDERUTILS_H_INCLUDED #define RIPPLE_PATH_IMPL_PATHFINDERUTILS_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/app/paths/impl/PaySteps.cpp b/src/xrpld/app/paths/detail/PaySteps.cpp similarity index 98% rename from src/ripple/app/paths/impl/PaySteps.cpp rename to src/xrpld/app/paths/detail/PaySteps.cpp index b96d6ee57b2..f28c1b96a7c 100644 --- a/src/ripple/app/paths/impl/PaySteps.cpp +++ b/src/xrpld/app/paths/detail/PaySteps.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/app/paths/impl/StepChecks.h b/src/xrpld/app/paths/detail/StepChecks.h similarity index 93% rename from src/ripple/app/paths/impl/StepChecks.h rename to src/xrpld/app/paths/detail/StepChecks.h index 9d8664a8dc1..140c9d1fe46 100644 --- a/src/ripple/app/paths/impl/StepChecks.h +++ b/src/xrpld/app/paths/detail/StepChecks.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_APP_PATHS_IMPL_STEP_CHECKS_H_INCLUDED #define RIPPLE_APP_PATHS_IMPL_STEP_CHECKS_H_INCLUDED -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/paths/impl/Steps.h b/src/xrpld/app/paths/detail/Steps.h similarity index 98% rename from src/ripple/app/paths/impl/Steps.h rename to src/xrpld/app/paths/detail/Steps.h index 2a4bfe310dd..dee90f617a5 100644 --- a/src/ripple/app/paths/impl/Steps.h +++ b/src/xrpld/app/paths/detail/Steps.h @@ -20,12 +20,12 @@ #ifndef RIPPLE_APP_PATHS_IMPL_PAYSTEPS_H_INCLUDED #define RIPPLE_APP_PATHS_IMPL_PAYSTEPS_H_INCLUDED -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/app/paths/impl/StrandFlow.h b/src/xrpld/app/paths/detail/StrandFlow.h similarity index 98% rename from src/ripple/app/paths/impl/StrandFlow.h rename to src/xrpld/app/paths/detail/StrandFlow.h index 2df496d8311..329a4cc643f 100644 --- a/src/ripple/app/paths/impl/StrandFlow.h +++ b/src/xrpld/app/paths/detail/StrandFlow.h @@ -20,18 +20,18 @@ #ifndef RIPPLE_APP_PATHS_IMPL_STRANDFLOW_H_INCLUDED #define RIPPLE_APP_PATHS_IMPL_STRANDFLOW_H_INCLUDED -#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/app/paths/impl/XRPEndpointStep.cpp b/src/xrpld/app/paths/detail/XRPEndpointStep.cpp similarity index 96% rename from src/ripple/app/paths/impl/XRPEndpointStep.cpp rename to src/xrpld/app/paths/detail/XRPEndpointStep.cpp index 4878463801c..ac88152c9dd 100644 --- a/src/ripple/app/paths/impl/XRPEndpointStep.cpp +++ b/src/xrpld/app/paths/detail/XRPEndpointStep.cpp @@ -17,16 +17,16 @@ */ //============================================================================== -#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/app/rdb/Download.h b/src/xrpld/app/rdb/Download.h similarity index 92% rename from src/ripple/app/rdb/Download.h rename to src/xrpld/app/rdb/Download.h index b72b5ec57e7..6ee02d4c100 100644 --- a/src/ripple/app/rdb/Download.h +++ b/src/xrpld/app/rdb/Download.h @@ -20,12 +20,12 @@ #ifndef RIPPLE_APP_RDB_DOWNLOAD_H_INCLUDED #define RIPPLE_APP_RDB_DOWNLOAD_H_INCLUDED -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/app/rdb/PeerFinder.h b/src/xrpld/app/rdb/PeerFinder.h similarity index 95% rename from src/ripple/app/rdb/PeerFinder.h rename to src/xrpld/app/rdb/PeerFinder.h index 06cd80f670b..8becd053fbe 100644 --- a/src/ripple/app/rdb/PeerFinder.h +++ b/src/xrpld/app/rdb/PeerFinder.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_APP_RDB_PEERFINDER_H_INCLUDED #define RIPPLE_APP_RDB_PEERFINDER_H_INCLUDED -#include -#include -#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/rdb/README.md b/src/xrpld/app/rdb/README.md similarity index 100% rename from src/ripple/app/rdb/README.md rename to src/xrpld/app/rdb/README.md diff --git a/src/ripple/app/rdb/RelationalDatabase.h b/src/xrpld/app/rdb/RelationalDatabase.h similarity index 96% rename from src/ripple/app/rdb/RelationalDatabase.h rename to src/xrpld/app/rdb/RelationalDatabase.h index a269bf256c8..b30c94153f7 100644 --- a/src/ripple/app/rdb/RelationalDatabase.h +++ b/src/xrpld/app/rdb/RelationalDatabase.h @@ -20,13 +20,13 @@ #ifndef RIPPLE_APP_RDB_RELATIONALDATABASE_H_INCLUDED #define RIPPLE_APP_RDB_RELATIONALDATABASE_H_INCLUDED -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/app/rdb/ShardArchive.h b/src/xrpld/app/rdb/ShardArchive.h similarity index 98% rename from src/ripple/app/rdb/ShardArchive.h rename to src/xrpld/app/rdb/ShardArchive.h index 20c4382b056..44f990ab5f5 100644 --- a/src/ripple/app/rdb/ShardArchive.h +++ b/src/xrpld/app/rdb/ShardArchive.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_APP_RDB_SHARDARCHIVE_H_INCLUDED #define RIPPLE_APP_RDB_SHARDARCHIVE_H_INCLUDED -#include +#include #include namespace ripple { diff --git a/src/ripple/app/rdb/State.h b/src/xrpld/app/rdb/State.h similarity index 92% rename from src/ripple/app/rdb/State.h rename to src/xrpld/app/rdb/State.h index fe74d5f19d3..b245270cda2 100644 --- a/src/ripple/app/rdb/State.h +++ b/src/xrpld/app/rdb/State.h @@ -20,12 +20,12 @@ #ifndef RIPPLE_APP_RDB_STATE_H_INCLUDED #define RIPPLE_APP_RDB_STATE_H_INCLUDED -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/app/rdb/UnitaryShard.h b/src/xrpld/app/rdb/UnitaryShard.h similarity index 97% rename from src/ripple/app/rdb/UnitaryShard.h rename to src/xrpld/app/rdb/UnitaryShard.h index d2ac773dbd3..e848000221d 100644 --- a/src/ripple/app/rdb/UnitaryShard.h +++ b/src/xrpld/app/rdb/UnitaryShard.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_APP_RDB_UNITARYSHARD_H_INCLUDED #define RIPPLE_APP_RDB_UNITARYSHARD_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/app/rdb/Vacuum.h b/src/xrpld/app/rdb/Vacuum.h similarity index 97% rename from src/ripple/app/rdb/Vacuum.h rename to src/xrpld/app/rdb/Vacuum.h index 3db18da045a..5ac796d43be 100644 --- a/src/ripple/app/rdb/Vacuum.h +++ b/src/xrpld/app/rdb/Vacuum.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_APP_RDB_VACUUM_H_INCLUDED #define RIPPLE_APP_RDB_VACUUM_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/app/rdb/Wallet.h b/src/xrpld/app/rdb/Wallet.h similarity index 96% rename from src/ripple/app/rdb/Wallet.h rename to src/xrpld/app/rdb/Wallet.h index e9846714ece..b79bf9f1377 100644 --- a/src/ripple/app/rdb/Wallet.h +++ b/src/xrpld/app/rdb/Wallet.h @@ -20,12 +20,12 @@ #ifndef RIPPLE_APP_RDB_WALLET_H_INCLUDED #define RIPPLE_APP_RDB_WALLET_H_INCLUDED -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/rdb/backend/PostgresDatabase.h b/src/xrpld/app/rdb/backend/PostgresDatabase.h similarity index 98% rename from src/ripple/app/rdb/backend/PostgresDatabase.h rename to src/xrpld/app/rdb/backend/PostgresDatabase.h index e8673611279..c2841cefd8c 100644 --- a/src/ripple/app/rdb/backend/PostgresDatabase.h +++ b/src/xrpld/app/rdb/backend/PostgresDatabase.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_APP_RDB_BACKEND_POSTGRESDATABASE_H_INCLUDED #define RIPPLE_APP_RDB_BACKEND_POSTGRESDATABASE_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/app/rdb/backend/SQLiteDatabase.h b/src/xrpld/app/rdb/backend/SQLiteDatabase.h similarity index 99% rename from src/ripple/app/rdb/backend/SQLiteDatabase.h rename to src/xrpld/app/rdb/backend/SQLiteDatabase.h index 07f9be3e228..27c01c1b83d 100644 --- a/src/ripple/app/rdb/backend/SQLiteDatabase.h +++ b/src/xrpld/app/rdb/backend/SQLiteDatabase.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_APP_RDB_BACKEND_SQLITEDATABASE_H_INCLUDED #define RIPPLE_APP_RDB_BACKEND_SQLITEDATABASE_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/app/rdb/backend/detail/Node.h b/src/xrpld/app/rdb/backend/detail/Node.h similarity index 98% rename from src/ripple/app/rdb/backend/detail/Node.h rename to src/xrpld/app/rdb/backend/detail/Node.h index ab3a99f5f95..d7c170663a5 100644 --- a/src/ripple/app/rdb/backend/detail/Node.h +++ b/src/xrpld/app/rdb/backend/detail/Node.h @@ -20,12 +20,12 @@ #ifndef RIPPLE_APP_RDB_BACKEND_DETAIL_NODE_H_INCLUDED #define RIPPLE_APP_RDB_BACKEND_DETAIL_NODE_H_INCLUDED -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/app/rdb/backend/impl/PostgresDatabase.cpp b/src/xrpld/app/rdb/backend/detail/PostgresDatabase.cpp similarity index 97% rename from src/ripple/app/rdb/backend/impl/PostgresDatabase.cpp rename to src/xrpld/app/rdb/backend/detail/PostgresDatabase.cpp index c57dee30610..ac998991a6d 100644 --- a/src/ripple/app/rdb/backend/impl/PostgresDatabase.cpp +++ b/src/xrpld/app/rdb/backend/detail/PostgresDatabase.cpp @@ -17,23 +17,23 @@ */ //============================================================================== -#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 +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/app/rdb/backend/impl/SQLiteDatabase.cpp b/src/xrpld/app/rdb/backend/detail/SQLiteDatabase.cpp similarity index 98% rename from src/ripple/app/rdb/backend/impl/SQLiteDatabase.cpp rename to src/xrpld/app/rdb/backend/detail/SQLiteDatabase.cpp index 547ab843b36..3edc5d163d8 100644 --- a/src/ripple/app/rdb/backend/impl/SQLiteDatabase.cpp +++ b/src/xrpld/app/rdb/backend/detail/SQLiteDatabase.cpp @@ -17,21 +17,21 @@ */ //============================================================================== -#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 #include namespace ripple { diff --git a/src/ripple/app/rdb/backend/detail/Shard.h b/src/xrpld/app/rdb/backend/detail/Shard.h similarity index 94% rename from src/ripple/app/rdb/backend/detail/Shard.h rename to src/xrpld/app/rdb/backend/detail/Shard.h index ac88c24bd78..870b6b82fe4 100644 --- a/src/ripple/app/rdb/backend/detail/Shard.h +++ b/src/xrpld/app/rdb/backend/detail/Shard.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_APP_RDB_BACKEND_DETAIL_SHARD_H_INCLUDED #define RIPPLE_APP_RDB_BACKEND_DETAIL_SHARD_H_INCLUDED -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/app/rdb/backend/detail/impl/Node.cpp b/src/xrpld/app/rdb/backend/detail/detail/Node.cpp similarity index 98% rename from src/ripple/app/rdb/backend/detail/impl/Node.cpp rename to src/xrpld/app/rdb/backend/detail/detail/Node.cpp index 0905d6121ae..67a80b43cf3 100644 --- a/src/ripple/app/rdb/backend/detail/impl/Node.cpp +++ b/src/xrpld/app/rdb/backend/detail/detail/Node.cpp @@ -17,19 +17,19 @@ */ //============================================================================== -#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/app/rdb/backend/detail/impl/Shard.cpp b/src/xrpld/app/rdb/backend/detail/detail/Shard.cpp similarity index 93% rename from src/ripple/app/rdb/backend/detail/impl/Shard.cpp rename to src/xrpld/app/rdb/backend/detail/detail/Shard.cpp index f7a0ce4571b..6db64b1249b 100644 --- a/src/ripple/app/rdb/backend/detail/impl/Shard.cpp +++ b/src/xrpld/app/rdb/backend/detail/detail/Shard.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { namespace detail { diff --git a/src/ripple/app/rdb/impl/Download.cpp b/src/xrpld/app/rdb/detail/Download.cpp similarity index 99% rename from src/ripple/app/rdb/impl/Download.cpp rename to src/xrpld/app/rdb/detail/Download.cpp index 0905ee577b1..012d60b3734 100644 --- a/src/ripple/app/rdb/impl/Download.cpp +++ b/src/xrpld/app/rdb/detail/Download.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include namespace ripple { diff --git a/src/ripple/app/rdb/impl/PeerFinder.cpp b/src/xrpld/app/rdb/detail/PeerFinder.cpp similarity index 99% rename from src/ripple/app/rdb/impl/PeerFinder.cpp rename to src/xrpld/app/rdb/detail/PeerFinder.cpp index 46dca3760c7..b2eaf3dfe11 100644 --- a/src/ripple/app/rdb/impl/PeerFinder.cpp +++ b/src/xrpld/app/rdb/detail/PeerFinder.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { diff --git a/src/ripple/app/rdb/impl/RelationalDatabase.cpp b/src/xrpld/app/rdb/detail/RelationalDatabase.cpp similarity index 93% rename from src/ripple/app/rdb/impl/RelationalDatabase.cpp rename to src/xrpld/app/rdb/detail/RelationalDatabase.cpp index 8a3ce5b016d..874550abd97 100644 --- a/src/ripple/app/rdb/impl/RelationalDatabase.cpp +++ b/src/xrpld/app/rdb/detail/RelationalDatabase.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include -#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/rdb/impl/ShardArchive.cpp b/src/xrpld/app/rdb/detail/ShardArchive.cpp similarity index 98% rename from src/ripple/app/rdb/impl/ShardArchive.cpp rename to src/xrpld/app/rdb/detail/ShardArchive.cpp index 6880aa00136..81b99348cb4 100644 --- a/src/ripple/app/rdb/impl/ShardArchive.cpp +++ b/src/xrpld/app/rdb/detail/ShardArchive.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { diff --git a/src/ripple/app/rdb/impl/State.cpp b/src/xrpld/app/rdb/detail/State.cpp similarity index 99% rename from src/ripple/app/rdb/impl/State.cpp rename to src/xrpld/app/rdb/detail/State.cpp index 8f8beb0c7e1..c3de860689c 100644 --- a/src/ripple/app/rdb/impl/State.cpp +++ b/src/xrpld/app/rdb/detail/State.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { diff --git a/src/ripple/app/rdb/impl/UnitaryShard.cpp b/src/xrpld/app/rdb/detail/UnitaryShard.cpp similarity index 99% rename from src/ripple/app/rdb/impl/UnitaryShard.cpp rename to src/xrpld/app/rdb/detail/UnitaryShard.cpp index ab1758b4852..dd64759f4a8 100644 --- a/src/ripple/app/rdb/impl/UnitaryShard.cpp +++ b/src/xrpld/app/rdb/detail/UnitaryShard.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include #include #include diff --git a/src/ripple/app/rdb/impl/Vacuum.cpp b/src/xrpld/app/rdb/detail/Vacuum.cpp similarity index 98% rename from src/ripple/app/rdb/impl/Vacuum.cpp rename to src/xrpld/app/rdb/detail/Vacuum.cpp index aad456cc5a8..71129c5b5df 100644 --- a/src/ripple/app/rdb/impl/Vacuum.cpp +++ b/src/xrpld/app/rdb/detail/Vacuum.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include namespace ripple { diff --git a/src/ripple/app/rdb/impl/Wallet.cpp b/src/xrpld/app/rdb/detail/Wallet.cpp similarity index 99% rename from src/ripple/app/rdb/impl/Wallet.cpp rename to src/xrpld/app/rdb/detail/Wallet.cpp index 3715c4c7458..bec727506db 100644 --- a/src/ripple/app/rdb/impl/Wallet.cpp +++ b/src/xrpld/app/rdb/detail/Wallet.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include namespace ripple { diff --git a/src/ripple/app/reporting/ETLHelpers.h b/src/xrpld/app/reporting/ETLHelpers.h similarity index 98% rename from src/ripple/app/reporting/ETLHelpers.h rename to src/xrpld/app/reporting/ETLHelpers.h index 04f282ca53e..b11d2c4aa18 100644 --- a/src/ripple/app/reporting/ETLHelpers.h +++ b/src/xrpld/app/reporting/ETLHelpers.h @@ -19,8 +19,8 @@ #ifndef RIPPLE_APP_REPORTING_ETLHELPERS_H_INCLUDED #define RIPPLE_APP_REPORTING_ETLHELPERS_H_INCLUDED -#include -#include +#include +#include #include #include #include diff --git a/src/ripple/app/reporting/ETLSource.cpp b/src/xrpld/app/reporting/ETLSource.cpp similarity index 99% rename from src/ripple/app/reporting/ETLSource.cpp rename to src/xrpld/app/reporting/ETLSource.cpp index 73ba9816950..8a181c62b1d 100644 --- a/src/ripple/app/reporting/ETLSource.cpp +++ b/src/xrpld/app/reporting/ETLSource.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/reporting/ETLSource.h b/src/xrpld/app/reporting/ETLSource.h similarity index 98% rename from src/ripple/app/reporting/ETLSource.h rename to src/xrpld/app/reporting/ETLSource.h index b9f27a1bf1f..633b72afac1 100644 --- a/src/ripple/app/reporting/ETLSource.h +++ b/src/xrpld/app/reporting/ETLSource.h @@ -19,11 +19,11 @@ #ifndef RIPPLE_APP_REPORTING_ETLSOURCE_H_INCLUDED #define RIPPLE_APP_REPORTING_ETLSOURCE_H_INCLUDED -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/app/reporting/P2pProxy.cpp b/src/xrpld/app/reporting/P2pProxy.cpp similarity index 94% rename from src/ripple/app/reporting/P2pProxy.cpp rename to src/xrpld/app/reporting/P2pProxy.cpp index ee04b68e6b5..df699f4faf0 100644 --- a/src/ripple/app/reporting/P2pProxy.cpp +++ b/src/xrpld/app/reporting/P2pProxy.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include -#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/reporting/P2pProxy.h b/src/xrpld/app/reporting/P2pProxy.h similarity index 96% rename from src/ripple/app/reporting/P2pProxy.h rename to src/xrpld/app/reporting/P2pProxy.h index 55ebc726726..d49389f42d3 100644 --- a/src/ripple/app/reporting/P2pProxy.h +++ b/src/xrpld/app/reporting/P2pProxy.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_APP_REPORTING_P2PPROXY_H_INCLUDED #define RIPPLE_APP_REPORTING_P2PPROXY_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/app/reporting/README.md b/src/xrpld/app/reporting/README.md similarity index 100% rename from src/ripple/app/reporting/README.md rename to src/xrpld/app/reporting/README.md diff --git a/src/ripple/app/reporting/ReportingETL.cpp b/src/xrpld/app/reporting/ReportingETL.cpp similarity index 99% rename from src/ripple/app/reporting/ReportingETL.cpp rename to src/xrpld/app/reporting/ReportingETL.cpp index d8d6af36881..2f6411b0808 100644 --- a/src/ripple/app/reporting/ReportingETL.cpp +++ b/src/xrpld/app/reporting/ReportingETL.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include -#include +#include +#include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/ripple/app/reporting/ReportingETL.h b/src/xrpld/app/reporting/ReportingETL.h similarity index 96% rename from src/ripple/app/reporting/ReportingETL.h rename to src/xrpld/app/reporting/ReportingETL.h index 71e08adf1f3..fc15f90b43b 100644 --- a/src/ripple/app/reporting/ReportingETL.h +++ b/src/xrpld/app/reporting/ReportingETL.h @@ -20,27 +20,27 @@ #ifndef RIPPLE_APP_REPORTING_REPORTINGETL_H_INCLUDED #define RIPPLE_APP_REPORTING_REPORTINGETL_H_INCLUDED -#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 #include #include -#include "org/xrpl/rpc/v1/xrp_ledger.grpc.pb.h" +#include #include #include diff --git a/src/ripple/app/tx/apply.h b/src/xrpld/app/tx/apply.h similarity index 96% rename from src/ripple/app/tx/apply.h rename to src/xrpld/app/tx/apply.h index b71e7ed4a9d..6a0401e2b55 100644 --- a/src/ripple/app/tx/apply.h +++ b/src/xrpld/app/tx/apply.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_TX_APPLY_H_INCLUDED #define RIPPLE_TX_APPLY_H_INCLUDED -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/app/tx/applySteps.h b/src/xrpld/app/tx/applySteps.h similarity index 99% rename from src/ripple/app/tx/applySteps.h rename to src/xrpld/app/tx/applySteps.h index ede7bd8cc09..1df537515e9 100644 --- a/src/ripple/app/tx/applySteps.h +++ b/src/xrpld/app/tx/applySteps.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_TX_APPLYSTEPS_H_INCLUDED #define RIPPLE_TX_APPLYSTEPS_H_INCLUDED -#include -#include +#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/AMMBid.cpp b/src/xrpld/app/tx/detail/AMMBid.cpp similarity index 97% rename from src/ripple/app/tx/impl/AMMBid.cpp rename to src/xrpld/app/tx/detail/AMMBid.cpp index e49c378ceeb..9de3762d2e3 100644 --- a/src/ripple/app/tx/impl/AMMBid.cpp +++ b/src/xrpld/app/tx/detail/AMMBid.cpp @@ -17,17 +17,17 @@ */ //============================================================================== -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/AMMBid.h b/src/xrpld/app/tx/detail/AMMBid.h similarity index 98% rename from src/ripple/app/tx/impl/AMMBid.h rename to src/xrpld/app/tx/detail/AMMBid.h index db3d8d9b016..4bb3a2adfd2 100644 --- a/src/ripple/app/tx/impl/AMMBid.h +++ b/src/xrpld/app/tx/detail/AMMBid.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TX_AMMBID_H_INCLUDED #define RIPPLE_TX_AMMBID_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/AMMCreate.cpp b/src/xrpld/app/tx/detail/AMMCreate.cpp similarity index 96% rename from src/ripple/app/tx/impl/AMMCreate.cpp rename to src/xrpld/app/tx/detail/AMMCreate.cpp index cab99f1669e..237e1afa240 100644 --- a/src/ripple/app/tx/impl/AMMCreate.cpp +++ b/src/xrpld/app/tx/detail/AMMCreate.cpp @@ -17,18 +17,18 @@ */ //============================================================================== -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/AMMCreate.h b/src/xrpld/app/tx/detail/AMMCreate.h similarity index 98% rename from src/ripple/app/tx/impl/AMMCreate.h rename to src/xrpld/app/tx/detail/AMMCreate.h index f521f5870b4..189d66a55ac 100644 --- a/src/ripple/app/tx/impl/AMMCreate.h +++ b/src/xrpld/app/tx/detail/AMMCreate.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TX_AMMCREATE_H_INCLUDED #define RIPPLE_TX_AMMCREATE_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/AMMDelete.cpp b/src/xrpld/app/tx/detail/AMMDelete.cpp similarity index 88% rename from src/ripple/app/tx/impl/AMMDelete.cpp rename to src/xrpld/app/tx/detail/AMMDelete.cpp index 25502be4f44..89ce34052d2 100644 --- a/src/ripple/app/tx/impl/AMMDelete.cpp +++ b/src/xrpld/app/tx/detail/AMMDelete.cpp @@ -17,15 +17,15 @@ */ //============================================================================== -#include - -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/AMMDelete.h b/src/xrpld/app/tx/detail/AMMDelete.h similarity index 97% rename from src/ripple/app/tx/impl/AMMDelete.h rename to src/xrpld/app/tx/detail/AMMDelete.h index cf7f55cb715..19885b1dad6 100644 --- a/src/ripple/app/tx/impl/AMMDelete.h +++ b/src/xrpld/app/tx/detail/AMMDelete.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TX_AMMDELETE_H_INCLUDED #define RIPPLE_TX_AMMDELETE_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/AMMDeposit.cpp b/src/xrpld/app/tx/detail/AMMDeposit.cpp similarity index 98% rename from src/ripple/app/tx/impl/AMMDeposit.cpp rename to src/xrpld/app/tx/detail/AMMDeposit.cpp index 74cba160edc..9bbf5b4a60a 100644 --- a/src/ripple/app/tx/impl/AMMDeposit.cpp +++ b/src/xrpld/app/tx/detail/AMMDeposit.cpp @@ -17,16 +17,16 @@ */ //============================================================================== -#include - -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/ripple/app/tx/impl/AMMDeposit.h b/src/xrpld/app/tx/detail/AMMDeposit.h similarity index 99% rename from src/ripple/app/tx/impl/AMMDeposit.h rename to src/xrpld/app/tx/detail/AMMDeposit.h index 385ce7c24e5..0acb1dd9ab3 100644 --- a/src/ripple/app/tx/impl/AMMDeposit.h +++ b/src/xrpld/app/tx/detail/AMMDeposit.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TX_AMMDEPOSIT_H_INCLUDED #define RIPPLE_TX_AMMDEPOSIT_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/AMMVote.cpp b/src/xrpld/app/tx/detail/AMMVote.cpp similarity index 95% rename from src/ripple/app/tx/impl/AMMVote.cpp rename to src/xrpld/app/tx/detail/AMMVote.cpp index d908a93c383..c4b6c612c63 100644 --- a/src/ripple/app/tx/impl/AMMVote.cpp +++ b/src/xrpld/app/tx/detail/AMMVote.cpp @@ -17,15 +17,15 @@ */ //============================================================================== -#include +#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { @@ -104,7 +104,7 @@ applyVote( Number den{0}; // Account already has vote entry bool foundAccount = false; - auto const& rules = ctx_.view().rules(); + // Iterate over the current vote entries and update each entry // per current total tokens balance and each LP tokens balance. // Find the entry with the least tokens and whether the account @@ -120,7 +120,7 @@ applyVote( continue; } auto feeVal = entry[sfTradingFee]; - STObject newEntry = STObject::makeInnerObject(sfVoteEntry, rules); + STObject newEntry = STObject::makeInnerObject(sfVoteEntry); // The account already has the vote entry. if (account == account_) { @@ -159,7 +159,7 @@ applyVote( { auto update = [&](std::optional const& minPos = std::nullopt) { - STObject newEntry = STObject::makeInnerObject(sfVoteEntry, rules); + STObject newEntry = STObject::makeInnerObject(sfVoteEntry); if (feeNew != 0) newEntry.setFieldU16(sfTradingFee, feeNew); newEntry.setFieldU32( diff --git a/src/ripple/app/tx/impl/AMMVote.h b/src/xrpld/app/tx/detail/AMMVote.h similarity index 98% rename from src/ripple/app/tx/impl/AMMVote.h rename to src/xrpld/app/tx/detail/AMMVote.h index 97d257d0513..2bee01aff53 100644 --- a/src/ripple/app/tx/impl/AMMVote.h +++ b/src/xrpld/app/tx/detail/AMMVote.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TX_AMMVOTE_H_INCLUDED #define RIPPLE_TX_AMMVOTE_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/AMMWithdraw.cpp b/src/xrpld/app/tx/detail/AMMWithdraw.cpp similarity index 98% rename from src/ripple/app/tx/impl/AMMWithdraw.cpp rename to src/xrpld/app/tx/detail/AMMWithdraw.cpp index c8d0d67dc97..51b512aba0a 100644 --- a/src/ripple/app/tx/impl/AMMWithdraw.cpp +++ b/src/xrpld/app/tx/detail/AMMWithdraw.cpp @@ -17,16 +17,16 @@ */ //============================================================================== -#include - -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/ripple/app/tx/impl/AMMWithdraw.h b/src/xrpld/app/tx/detail/AMMWithdraw.h similarity index 99% rename from src/ripple/app/tx/impl/AMMWithdraw.h rename to src/xrpld/app/tx/detail/AMMWithdraw.h index 40686266315..9e9920aa5f6 100644 --- a/src/ripple/app/tx/impl/AMMWithdraw.h +++ b/src/xrpld/app/tx/detail/AMMWithdraw.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TX_AMMWITHDRAW_H_INCLUDED #define RIPPLE_TX_AMMWITHDRAW_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/ApplyContext.cpp b/src/xrpld/app/tx/detail/ApplyContext.cpp similarity index 94% rename from src/ripple/app/tx/impl/ApplyContext.cpp rename to src/xrpld/app/tx/detail/ApplyContext.cpp index 27287241637..969af7960eb 100644 --- a/src/ripple/app/tx/impl/ApplyContext.cpp +++ b/src/xrpld/app/tx/detail/ApplyContext.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/app/tx/impl/ApplyContext.h b/src/xrpld/app/tx/detail/ApplyContext.h similarity index 93% rename from src/ripple/app/tx/impl/ApplyContext.h rename to src/xrpld/app/tx/detail/ApplyContext.h index 415054ef4bb..45de05a73db 100644 --- a/src/ripple/app/tx/impl/ApplyContext.h +++ b/src/xrpld/app/tx/detail/ApplyContext.h @@ -20,12 +20,12 @@ #ifndef RIPPLE_TX_APPLYCONTEXT_H_INCLUDED #define RIPPLE_TX_APPLYCONTEXT_H_INCLUDED -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/app/tx/impl/BookTip.cpp b/src/xrpld/app/tx/detail/BookTip.cpp similarity index 97% rename from src/ripple/app/tx/impl/BookTip.cpp rename to src/xrpld/app/tx/detail/BookTip.cpp index 88bfd1d516c..011d992dd72 100644 --- a/src/ripple/app/tx/impl/BookTip.cpp +++ b/src/xrpld/app/tx/detail/BookTip.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/BookTip.h b/src/xrpld/app/tx/detail/BookTip.h similarity index 95% rename from src/ripple/app/tx/impl/BookTip.h rename to src/xrpld/app/tx/detail/BookTip.h index d57700ad4f8..4de6b785b90 100644 --- a/src/ripple/app/tx/impl/BookTip.h +++ b/src/xrpld/app/tx/detail/BookTip.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_APP_BOOK_BOOKTIP_H_INCLUDED #define RIPPLE_APP_BOOK_BOOKTIP_H_INCLUDED -#include -#include -#include +#include +#include +#include #include diff --git a/src/ripple/app/tx/impl/CancelCheck.cpp b/src/xrpld/app/tx/detail/CancelCheck.cpp similarity index 92% rename from src/ripple/app/tx/impl/CancelCheck.cpp rename to src/xrpld/app/tx/detail/CancelCheck.cpp index 5e7050d86a3..7954e86cf3b 100644 --- a/src/ripple/app/tx/impl/CancelCheck.cpp +++ b/src/xrpld/app/tx/detail/CancelCheck.cpp @@ -17,16 +17,16 @@ */ //============================================================================== -#include - -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/CancelCheck.h b/src/xrpld/app/tx/detail/CancelCheck.h similarity index 97% rename from src/ripple/app/tx/impl/CancelCheck.h rename to src/xrpld/app/tx/detail/CancelCheck.h index a7e0f6e5d93..582d8559e50 100644 --- a/src/ripple/app/tx/impl/CancelCheck.h +++ b/src/xrpld/app/tx/detail/CancelCheck.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TX_CANCELCHECK_H_INCLUDED #define RIPPLE_TX_CANCELCHECK_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/CancelOffer.cpp b/src/xrpld/app/tx/detail/CancelOffer.cpp similarity index 95% rename from src/ripple/app/tx/impl/CancelOffer.cpp rename to src/xrpld/app/tx/detail/CancelOffer.cpp index 95d51501cb9..11b07f06df3 100644 --- a/src/ripple/app/tx/impl/CancelOffer.cpp +++ b/src/xrpld/app/tx/detail/CancelOffer.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include -#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/CancelOffer.h b/src/xrpld/app/tx/detail/CancelOffer.h similarity index 91% rename from src/ripple/app/tx/impl/CancelOffer.h rename to src/xrpld/app/tx/detail/CancelOffer.h index 32aee335375..1e3b4a5c983 100644 --- a/src/ripple/app/tx/impl/CancelOffer.h +++ b/src/xrpld/app/tx/detail/CancelOffer.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_TX_CANCELOFFER_H_INCLUDED #define RIPPLE_TX_CANCELOFFER_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/CashCheck.cpp b/src/xrpld/app/tx/detail/CashCheck.cpp similarity index 98% rename from src/ripple/app/tx/impl/CashCheck.cpp rename to src/xrpld/app/tx/detail/CashCheck.cpp index bc3d838540b..8b5ef79b6d4 100644 --- a/src/ripple/app/tx/impl/CashCheck.cpp +++ b/src/xrpld/app/tx/detail/CashCheck.cpp @@ -17,16 +17,16 @@ */ //============================================================================== -#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/app/tx/impl/CashCheck.h b/src/xrpld/app/tx/detail/CashCheck.h similarity index 97% rename from src/ripple/app/tx/impl/CashCheck.h rename to src/xrpld/app/tx/detail/CashCheck.h index 3acc3204a3d..c90cd93a9f8 100644 --- a/src/ripple/app/tx/impl/CashCheck.h +++ b/src/xrpld/app/tx/detail/CashCheck.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TX_CASHCHECK_H_INCLUDED #define RIPPLE_TX_CASHCHECK_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/Change.cpp b/src/xrpld/app/tx/detail/Change.cpp similarity index 96% rename from src/ripple/app/tx/impl/Change.cpp rename to src/xrpld/app/tx/detail/Change.cpp index b36ae88a75e..909f35fc799 100644 --- a/src/ripple/app/tx/impl/Change.cpp +++ b/src/xrpld/app/tx/detail/Change.cpp @@ -17,16 +17,16 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include namespace ripple { @@ -300,11 +300,11 @@ Change::applyAmendment() if (gotMajority) { // This amendment now has a majority - newMajorities.push_back(STObject(sfMajority)); + newMajorities.push_back(STObject::makeInnerObject(sfMajority)); auto& entry = newMajorities.back(); - entry.emplace_back(STUInt256(sfAmendment, amendment)); - entry.emplace_back(STUInt32( - sfCloseTime, view().parentCloseTime().time_since_epoch().count())); + entry[sfAmendment] = amendment; + entry[sfCloseTime] = + view().parentCloseTime().time_since_epoch().count(); if (!ctx_.app.getAmendmentTable().isSupported(amendment)) { diff --git a/src/ripple/app/tx/impl/Change.h b/src/xrpld/app/tx/detail/Change.h similarity index 88% rename from src/ripple/app/tx/impl/Change.h rename to src/xrpld/app/tx/detail/Change.h index f366a5754ce..7a569bc920e 100644 --- a/src/ripple/app/tx/impl/Change.h +++ b/src/xrpld/app/tx/detail/Change.h @@ -20,12 +20,12 @@ #ifndef RIPPLE_TX_CHANGE_H_INCLUDED #define RIPPLE_TX_CHANGE_H_INCLUDED -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/Clawback.cpp b/src/xrpld/app/tx/detail/Clawback.cpp similarity index 94% rename from src/ripple/app/tx/impl/Clawback.cpp rename to src/xrpld/app/tx/detail/Clawback.cpp index 58546db5ca7..15d76526094 100644 --- a/src/ripple/app/tx/impl/Clawback.cpp +++ b/src/xrpld/app/tx/detail/Clawback.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/Clawback.h b/src/xrpld/app/tx/detail/Clawback.h similarity index 97% rename from src/ripple/app/tx/impl/Clawback.h rename to src/xrpld/app/tx/detail/Clawback.h index c5f072c8463..d908a2e4ef2 100644 --- a/src/ripple/app/tx/impl/Clawback.h +++ b/src/xrpld/app/tx/detail/Clawback.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TX_CLAWBACK_H_INCLUDED #define RIPPLE_TX_CLAWBACK_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/CreateCheck.cpp b/src/xrpld/app/tx/detail/CreateCheck.cpp similarity index 96% rename from src/ripple/app/tx/impl/CreateCheck.cpp rename to src/xrpld/app/tx/detail/CreateCheck.cpp index 77ce4d017a1..3a278eed738 100644 --- a/src/ripple/app/tx/impl/CreateCheck.cpp +++ b/src/xrpld/app/tx/detail/CreateCheck.cpp @@ -17,14 +17,14 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/CreateCheck.h b/src/xrpld/app/tx/detail/CreateCheck.h similarity index 97% rename from src/ripple/app/tx/impl/CreateCheck.h rename to src/xrpld/app/tx/detail/CreateCheck.h index 537b230eb46..86daad07061 100644 --- a/src/ripple/app/tx/impl/CreateCheck.h +++ b/src/xrpld/app/tx/detail/CreateCheck.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TX_CREATECHECK_H_INCLUDED #define RIPPLE_TX_CREATECHECK_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/CreateOffer.cpp b/src/xrpld/app/tx/detail/CreateOffer.cpp similarity index 99% rename from src/ripple/app/tx/impl/CreateOffer.cpp rename to src/xrpld/app/tx/detail/CreateOffer.cpp index 17f7e2853db..2a5145594a1 100644 --- a/src/ripple/app/tx/impl/CreateOffer.cpp +++ b/src/xrpld/app/tx/detail/CreateOffer.cpp @@ -17,14 +17,14 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/CreateOffer.h b/src/xrpld/app/tx/detail/CreateOffer.h similarity index 97% rename from src/ripple/app/tx/impl/CreateOffer.h rename to src/xrpld/app/tx/detail/CreateOffer.h index 597ee22c0d9..47129df5b04 100644 --- a/src/ripple/app/tx/impl/CreateOffer.h +++ b/src/xrpld/app/tx/detail/CreateOffer.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_TX_CREATEOFFER_H_INCLUDED #define RIPPLE_TX_CREATEOFFER_H_INCLUDED -#include -#include -#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/app/tx/impl/CreateTicket.cpp b/src/xrpld/app/tx/detail/CreateTicket.cpp similarity index 95% rename from src/ripple/app/tx/impl/CreateTicket.cpp rename to src/xrpld/app/tx/detail/CreateTicket.cpp index a901231822c..b04f4af1d30 100644 --- a/src/ripple/app/tx/impl/CreateTicket.cpp +++ b/src/xrpld/app/tx/detail/CreateTicket.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/CreateTicket.h b/src/xrpld/app/tx/detail/CreateTicket.h similarity index 95% rename from src/ripple/app/tx/impl/CreateTicket.h rename to src/xrpld/app/tx/detail/CreateTicket.h index c1909ddf724..edfcaa787c9 100644 --- a/src/ripple/app/tx/impl/CreateTicket.h +++ b/src/xrpld/app/tx/detail/CreateTicket.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_TX_CREATETICKET_H_INCLUDED #define RIPPLE_TX_CREATETICKET_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/DID.cpp b/src/xrpld/app/tx/detail/DID.cpp similarity index 95% rename from src/ripple/app/tx/impl/DID.cpp rename to src/xrpld/app/tx/detail/DID.cpp index 1cad8992ad9..6e5a3108c72 100644 --- a/src/ripple/app/tx/impl/DID.cpp +++ b/src/xrpld/app/tx/detail/DID.cpp @@ -17,15 +17,15 @@ */ //============================================================================== -#include - -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/DID.h b/src/xrpld/app/tx/detail/DID.h similarity index 97% rename from src/ripple/app/tx/impl/DID.h rename to src/xrpld/app/tx/detail/DID.h index 13d5a261542..54ae6630f2e 100644 --- a/src/ripple/app/tx/impl/DID.h +++ b/src/xrpld/app/tx/detail/DID.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TX_DID_H_INCLUDED #define RIPPLE_TX_DID_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/DeleteAccount.cpp b/src/xrpld/app/tx/detail/DeleteAccount.cpp similarity index 95% rename from src/ripple/app/tx/impl/DeleteAccount.cpp rename to src/xrpld/app/tx/detail/DeleteAccount.cpp index efa38a4b74e..fb2f3fc507f 100644 --- a/src/ripple/app/tx/impl/DeleteAccount.cpp +++ b/src/xrpld/app/tx/detail/DeleteAccount.cpp @@ -17,21 +17,21 @@ */ //============================================================================== -#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 namespace ripple { diff --git a/src/ripple/app/tx/impl/DeleteAccount.h b/src/xrpld/app/tx/detail/DeleteAccount.h similarity index 93% rename from src/ripple/app/tx/impl/DeleteAccount.h rename to src/xrpld/app/tx/detail/DeleteAccount.h index 0f298bb8596..e1da2f45964 100644 --- a/src/ripple/app/tx/impl/DeleteAccount.h +++ b/src/xrpld/app/tx/detail/DeleteAccount.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_TX_DELETEACCOUNT_H_INCLUDED #define RIPPLE_TX_DELETEACCOUNT_H_INCLUDED -#include -#include -#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/DeleteOracle.cpp b/src/xrpld/app/tx/detail/DeleteOracle.cpp similarity index 93% rename from src/ripple/app/tx/impl/DeleteOracle.cpp rename to src/xrpld/app/tx/detail/DeleteOracle.cpp index 9331daee97d..807e52ee6b4 100644 --- a/src/ripple/app/tx/impl/DeleteOracle.cpp +++ b/src/xrpld/app/tx/detail/DeleteOracle.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/DeleteOracle.h b/src/xrpld/app/tx/detail/DeleteOracle.h similarity index 97% rename from src/ripple/app/tx/impl/DeleteOracle.h rename to src/xrpld/app/tx/detail/DeleteOracle.h index e578adaaaf0..8f1402563a2 100644 --- a/src/ripple/app/tx/impl/DeleteOracle.h +++ b/src/xrpld/app/tx/detail/DeleteOracle.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TX_DELETEORACLE_H_INCLUDED #define RIPPLE_TX_DELETEORACLE_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/DepositPreauth.cpp b/src/xrpld/app/tx/detail/DepositPreauth.cpp similarity index 96% rename from src/ripple/app/tx/impl/DepositPreauth.cpp rename to src/xrpld/app/tx/detail/DepositPreauth.cpp index 7d99e63017a..b60fd3e0eae 100644 --- a/src/ripple/app/tx/impl/DepositPreauth.cpp +++ b/src/xrpld/app/tx/detail/DepositPreauth.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/DepositPreauth.h b/src/xrpld/app/tx/detail/DepositPreauth.h similarity index 97% rename from src/ripple/app/tx/impl/DepositPreauth.h rename to src/xrpld/app/tx/detail/DepositPreauth.h index 8111c215602..5edcee104d0 100644 --- a/src/ripple/app/tx/impl/DepositPreauth.h +++ b/src/xrpld/app/tx/detail/DepositPreauth.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TX_DEPOSIT_PREAUTH_H_INCLUDED #define RIPPLE_TX_DEPOSIT_PREAUTH_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/Escrow.cpp b/src/xrpld/app/tx/detail/Escrow.cpp similarity index 97% rename from src/ripple/app/tx/impl/Escrow.cpp rename to src/xrpld/app/tx/detail/Escrow.cpp index 9d8aa6a2289..e34b675998d 100644 --- a/src/ripple/app/tx/impl/Escrow.cpp +++ b/src/xrpld/app/tx/detail/Escrow.cpp @@ -17,22 +17,22 @@ */ //============================================================================== -#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 // During an EscrowFinish, the transaction must specify both // a condition and a fulfillment. We track whether that diff --git a/src/ripple/app/tx/impl/Escrow.h b/src/xrpld/app/tx/detail/Escrow.h similarity index 98% rename from src/ripple/app/tx/impl/Escrow.h rename to src/xrpld/app/tx/detail/Escrow.h index 0f5fd940144..9e30da76175 100644 --- a/src/ripple/app/tx/impl/Escrow.h +++ b/src/xrpld/app/tx/detail/Escrow.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TX_ESCROW_H_INCLUDED #define RIPPLE_TX_ESCROW_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/InvariantCheck.cpp b/src/xrpld/app/tx/detail/InvariantCheck.cpp similarity index 87% rename from src/ripple/app/tx/impl/InvariantCheck.cpp rename to src/xrpld/app/tx/detail/InvariantCheck.cpp index c0ef5bbf0c5..70210b90d75 100644 --- a/src/ripple/app/tx/impl/InvariantCheck.cpp +++ b/src/xrpld/app/tx/detail/InvariantCheck.cpp @@ -17,18 +17,18 @@ */ //============================================================================== -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { @@ -358,6 +358,91 @@ AccountRootsNotDeleted::finalize( //------------------------------------------------------------------------------ +void +AccountRootsDeletedClean::visitEntry( + bool isDelete, + std::shared_ptr const& before, + std::shared_ptr const&) +{ + if (isDelete && before && before->getType() == ltACCOUNT_ROOT) + accountsDeleted_.emplace_back(before); +} + +bool +AccountRootsDeletedClean::finalize( + STTx const& tx, + TER const result, + XRPAmount const, + ReadView const& view, + beast::Journal const& j) +{ + // Always check for objects in the ledger, but to prevent differing + // transaction processing results, however unlikely, only fail if the + // feature is enabled. Enabled, or not, though, a fatal-level message will + // be logged + bool const enforce = view.rules().enabled(featureInvariantsV1_1); + + auto const objectExists = [&view, enforce, &j](auto const& keylet) { + if (auto const sle = view.read(keylet)) + { + // Finding the object is bad + auto const typeName = [&sle]() { + auto item = + LedgerFormats::getInstance().findByType(sle->getType()); + + if (item != nullptr) + return item->getName(); + return std::to_string(sle->getType()); + }(); + + JLOG(j.fatal()) + << "Invariant failed: account deletion left behind a " + << typeName << " object"; + (void)enforce; + assert(enforce); + return true; + } + return false; + }; + + for (auto const& accountSLE : accountsDeleted_) + { + auto const accountID = accountSLE->getAccountID(sfAccount); + // Simple types + for (auto const& [keyletfunc, _, __] : directAccountKeylets) + { + if (objectExists(std::invoke(keyletfunc, accountID)) && enforce) + return false; + } + + { + // NFT pages. ntfpage_min and nftpage_max were already explicitly + // checked above as entries in directAccountKeylets. This uses + // view.succ() to check for any NFT pages in between the two + // endpoints. + Keylet const first = keylet::nftpage_min(accountID); + Keylet const last = keylet::nftpage_max(accountID); + + std::optional key = view.succ(first.key, last.key.next()); + + // current page + if (key && objectExists(Keylet{ltNFTOKEN_PAGE, *key}) && enforce) + return false; + } + + // Keys directly stored in the AccountRoot object + if (auto const ammKey = accountSLE->at(~sfAMMID)) + { + if (objectExists(keylet::amm(*ammKey)) && enforce) + return false; + } + } + + return true; +} + +//------------------------------------------------------------------------------ + void LedgerEntryTypesMatch::visitEntry( bool, diff --git a/src/ripple/app/tx/impl/InvariantCheck.h b/src/xrpld/app/tx/detail/InvariantCheck.h similarity index 91% rename from src/ripple/app/tx/impl/InvariantCheck.h rename to src/xrpld/app/tx/detail/InvariantCheck.h index eb606c2ed3b..6a83f5c9b7b 100644 --- a/src/ripple/app/tx/impl/InvariantCheck.h +++ b/src/xrpld/app/tx/detail/InvariantCheck.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_APP_TX_INVARIANTCHECK_H_INCLUDED #define RIPPLE_APP_TX_INVARIANTCHECK_H_INCLUDED -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -164,6 +164,36 @@ class AccountRootsNotDeleted beast::Journal const&); }; +/** + * @brief Invariant: a deleted account must not have any objects left + * + * We iterate all deleted account roots, and ensure that there are no + * objects left that are directly accessible with that account's ID. + * + * There should only be one deleted account, but that's checked by + * AccountRootsNotDeleted. This invariant will handle multiple deleted account + * roots without a problem. + */ +class AccountRootsDeletedClean +{ + std::vector> accountsDeleted_; + +public: + void + visitEntry( + bool, + std::shared_ptr const&, + std::shared_ptr const&); + + bool + finalize( + STTx const&, + TER const, + XRPAmount const, + ReadView const&, + beast::Journal const&); +}; + /** * @brief Invariant: An account XRP balance must be in XRP and take a value * between 0 and INITIAL_XRP drops, inclusive. @@ -423,6 +453,7 @@ class ValidClawback using InvariantChecks = std::tuple< TransactionFeeCheck, AccountRootsNotDeleted, + AccountRootsDeletedClean, LedgerEntryTypesMatch, XRPBalanceChecks, XRPNotCreated, diff --git a/src/ripple/app/tx/impl/NFTokenAcceptOffer.cpp b/src/xrpld/app/tx/detail/NFTokenAcceptOffer.cpp similarity index 98% rename from src/ripple/app/tx/impl/NFTokenAcceptOffer.cpp rename to src/xrpld/app/tx/detail/NFTokenAcceptOffer.cpp index 0b61799ac35..b884a791e78 100644 --- a/src/ripple/app/tx/impl/NFTokenAcceptOffer.cpp +++ b/src/xrpld/app/tx/detail/NFTokenAcceptOffer.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/NFTokenAcceptOffer.h b/src/xrpld/app/tx/detail/NFTokenAcceptOffer.h similarity index 97% rename from src/ripple/app/tx/impl/NFTokenAcceptOffer.h rename to src/xrpld/app/tx/detail/NFTokenAcceptOffer.h index e1b26cbecea..dff3febbb21 100644 --- a/src/ripple/app/tx/impl/NFTokenAcceptOffer.h +++ b/src/xrpld/app/tx/detail/NFTokenAcceptOffer.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TX_NFTOKENACCEPTOFFER_H_INCLUDED #define RIPPLE_TX_NFTOKENACCEPTOFFER_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/NFTokenBurn.cpp b/src/xrpld/app/tx/detail/NFTokenBurn.cpp similarity index 93% rename from src/ripple/app/tx/impl/NFTokenBurn.cpp rename to src/xrpld/app/tx/detail/NFTokenBurn.cpp index 99acfd61dca..725e35791f9 100644 --- a/src/ripple/app/tx/impl/NFTokenBurn.cpp +++ b/src/xrpld/app/tx/detail/NFTokenBurn.cpp @@ -17,14 +17,13 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/app/tx/impl/NFTokenBurn.h b/src/xrpld/app/tx/detail/NFTokenBurn.h similarity index 97% rename from src/ripple/app/tx/impl/NFTokenBurn.h rename to src/xrpld/app/tx/detail/NFTokenBurn.h index 61079c4a49a..3f5296c217b 100644 --- a/src/ripple/app/tx/impl/NFTokenBurn.h +++ b/src/xrpld/app/tx/detail/NFTokenBurn.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TX_BURNNFT_H_INCLUDED #define RIPPLE_TX_BURNNFT_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/NFTokenCancelOffer.cpp b/src/xrpld/app/tx/detail/NFTokenCancelOffer.cpp similarity index 93% rename from src/ripple/app/tx/impl/NFTokenCancelOffer.cpp rename to src/xrpld/app/tx/detail/NFTokenCancelOffer.cpp index 50199ace88b..ef66ceecd0c 100644 --- a/src/ripple/app/tx/impl/NFTokenCancelOffer.cpp +++ b/src/xrpld/app/tx/detail/NFTokenCancelOffer.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/app/tx/impl/NFTokenCancelOffer.h b/src/xrpld/app/tx/detail/NFTokenCancelOffer.h similarity index 97% rename from src/ripple/app/tx/impl/NFTokenCancelOffer.h rename to src/xrpld/app/tx/detail/NFTokenCancelOffer.h index 752d33ac818..d460675711e 100644 --- a/src/ripple/app/tx/impl/NFTokenCancelOffer.h +++ b/src/xrpld/app/tx/detail/NFTokenCancelOffer.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TX_NFTOKENCANCELOFFER_H_INCLUDED #define RIPPLE_TX_NFTOKENCANCELOFFER_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/NFTokenCreateOffer.cpp b/src/xrpld/app/tx/detail/NFTokenCreateOffer.cpp similarity index 92% rename from src/ripple/app/tx/impl/NFTokenCreateOffer.cpp rename to src/xrpld/app/tx/detail/NFTokenCreateOffer.cpp index e1a0e04aa52..43178d31b4a 100644 --- a/src/ripple/app/tx/impl/NFTokenCreateOffer.cpp +++ b/src/xrpld/app/tx/detail/NFTokenCreateOffer.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/app/tx/impl/NFTokenCreateOffer.h b/src/xrpld/app/tx/detail/NFTokenCreateOffer.h similarity index 97% rename from src/ripple/app/tx/impl/NFTokenCreateOffer.h rename to src/xrpld/app/tx/detail/NFTokenCreateOffer.h index 676b546f4b9..075a5a712fd 100644 --- a/src/ripple/app/tx/impl/NFTokenCreateOffer.h +++ b/src/xrpld/app/tx/detail/NFTokenCreateOffer.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TX_NFTOKENOFFERCREATE_H_INCLUDED #define RIPPLE_TX_NFTOKENOFFERCREATE_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/NFTokenMint.cpp b/src/xrpld/app/tx/detail/NFTokenMint.cpp similarity index 97% rename from src/ripple/app/tx/impl/NFTokenMint.cpp rename to src/xrpld/app/tx/detail/NFTokenMint.cpp index daffd29ed31..d5c3a8707c2 100644 --- a/src/ripple/app/tx/impl/NFTokenMint.cpp +++ b/src/xrpld/app/tx/detail/NFTokenMint.cpp @@ -17,15 +17,15 @@ */ //============================================================================== -#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/app/tx/impl/NFTokenMint.h b/src/xrpld/app/tx/detail/NFTokenMint.h similarity index 93% rename from src/ripple/app/tx/impl/NFTokenMint.h rename to src/xrpld/app/tx/detail/NFTokenMint.h index 690843c19ce..c95fd5944e4 100644 --- a/src/ripple/app/tx/impl/NFTokenMint.h +++ b/src/xrpld/app/tx/detail/NFTokenMint.h @@ -20,8 +20,9 @@ #ifndef RIPPLE_TX_NFTTOKENMINT_H_INCLUDED #define RIPPLE_TX_NFTTOKENMINT_H_INCLUDED -#include -#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/details/NFTokenUtils.cpp b/src/xrpld/app/tx/detail/NFTokenUtils.cpp similarity index 98% rename from src/ripple/app/tx/impl/details/NFTokenUtils.cpp rename to src/xrpld/app/tx/detail/NFTokenUtils.cpp index 4acc00f956e..279bf6b9816 100644 --- a/src/ripple/app/tx/impl/details/NFTokenUtils.cpp +++ b/src/xrpld/app/tx/detail/NFTokenUtils.cpp @@ -17,15 +17,15 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -191,6 +191,7 @@ getPageForToken( : carr[0].getFieldH256(sfNFTokenID); auto np = std::make_shared(keylet::nftpage(base, tokenIDForNewPage)); + assert(np->key() > base.key); np->setFieldArray(sfNFTokens, narr); np->setFieldH256(sfNextPageMin, cp->key()); diff --git a/src/ripple/app/tx/impl/details/NFTokenUtils.h b/src/xrpld/app/tx/detail/NFTokenUtils.h similarity index 94% rename from src/ripple/app/tx/impl/details/NFTokenUtils.h rename to src/xrpld/app/tx/detail/NFTokenUtils.h index 48ed3993357..243c5273399 100644 --- a/src/ripple/app/tx/impl/details/NFTokenUtils.h +++ b/src/xrpld/app/tx/detail/NFTokenUtils.h @@ -20,13 +20,13 @@ #ifndef RIPPLE_TX_IMPL_DETAILS_NFTOKENUTILS_H_INCLUDED #define RIPPLE_TX_IMPL_DETAILS_NFTOKENUTILS_H_INCLUDED -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/Offer.h b/src/xrpld/app/tx/detail/Offer.h similarity index 97% rename from src/ripple/app/tx/impl/Offer.h rename to src/xrpld/app/tx/detail/Offer.h index 53253426c40..a6f707ba561 100644 --- a/src/ripple/app/tx/impl/Offer.h +++ b/src/xrpld/app/tx/detail/Offer.h @@ -20,12 +20,12 @@ #ifndef RIPPLE_APP_BOOK_OFFER_H_INCLUDED #define RIPPLE_APP_BOOK_OFFER_H_INCLUDED -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/app/tx/impl/OfferStream.cpp b/src/xrpld/app/tx/detail/OfferStream.cpp similarity index 99% rename from src/ripple/app/tx/impl/OfferStream.cpp rename to src/xrpld/app/tx/detail/OfferStream.cpp index 5933d9c3838..b963195259a 100644 --- a/src/ripple/app/tx/impl/OfferStream.cpp +++ b/src/xrpld/app/tx/detail/OfferStream.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include -#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/OfferStream.h b/src/xrpld/app/tx/detail/OfferStream.h similarity index 95% rename from src/ripple/app/tx/impl/OfferStream.h rename to src/xrpld/app/tx/detail/OfferStream.h index 9472bc4e74d..be224a67b4e 100644 --- a/src/ripple/app/tx/impl/OfferStream.h +++ b/src/xrpld/app/tx/detail/OfferStream.h @@ -20,13 +20,13 @@ #ifndef RIPPLE_APP_BOOK_OFFERSTREAM_H_INCLUDED #define RIPPLE_APP_BOOK_OFFERSTREAM_H_INCLUDED -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/ripple/app/tx/impl/PayChan.cpp b/src/xrpld/app/tx/detail/PayChan.cpp similarity index 97% rename from src/ripple/app/tx/impl/PayChan.cpp rename to src/xrpld/app/tx/detail/PayChan.cpp index 3fe2a28a7cf..d17736c4738 100644 --- a/src/ripple/app/tx/impl/PayChan.cpp +++ b/src/xrpld/app/tx/detail/PayChan.cpp @@ -17,19 +17,19 @@ */ //============================================================================== -#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 namespace ripple { diff --git a/src/ripple/app/tx/impl/PayChan.h b/src/xrpld/app/tx/detail/PayChan.h similarity index 98% rename from src/ripple/app/tx/impl/PayChan.h rename to src/xrpld/app/tx/detail/PayChan.h index 9fe4b841944..8bb3a6d9379 100644 --- a/src/ripple/app/tx/impl/PayChan.h +++ b/src/xrpld/app/tx/detail/PayChan.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TX_PAYCHAN_H_INCLUDED #define RIPPLE_TX_PAYCHAN_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/Payment.cpp b/src/xrpld/app/tx/detail/Payment.cpp similarity index 98% rename from src/ripple/app/tx/impl/Payment.cpp rename to src/xrpld/app/tx/detail/Payment.cpp index 3903aa75045..309e9d4a498 100644 --- a/src/ripple/app/tx/impl/Payment.cpp +++ b/src/xrpld/app/tx/detail/Payment.cpp @@ -17,14 +17,14 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/Payment.h b/src/xrpld/app/tx/detail/Payment.h similarity index 92% rename from src/ripple/app/tx/impl/Payment.h rename to src/xrpld/app/tx/detail/Payment.h index 1d4711198b9..3176ae1c0d3 100644 --- a/src/ripple/app/tx/impl/Payment.h +++ b/src/xrpld/app/tx/detail/Payment.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_TX_PAYMENT_H_INCLUDED #define RIPPLE_TX_PAYMENT_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/SetAccount.cpp b/src/xrpld/app/tx/detail/SetAccount.cpp similarity index 98% rename from src/ripple/app/tx/impl/SetAccount.cpp rename to src/xrpld/app/tx/detail/SetAccount.cpp index d43b3b339e5..c0e115c2497 100644 --- a/src/ripple/app/tx/impl/SetAccount.cpp +++ b/src/xrpld/app/tx/detail/SetAccount.cpp @@ -17,15 +17,15 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/SetAccount.h b/src/xrpld/app/tx/detail/SetAccount.h similarity index 88% rename from src/ripple/app/tx/impl/SetAccount.h rename to src/xrpld/app/tx/detail/SetAccount.h index 1c6bb4b7d80..8e9b74d860b 100644 --- a/src/ripple/app/tx/impl/SetAccount.h +++ b/src/xrpld/app/tx/detail/SetAccount.h @@ -20,12 +20,12 @@ #ifndef RIPPLE_TX_SETACCOUNT_H_INCLUDED #define RIPPLE_TX_SETACCOUNT_H_INCLUDED -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/SetOracle.cpp b/src/xrpld/app/tx/detail/SetOracle.cpp similarity index 97% rename from src/ripple/app/tx/impl/SetOracle.cpp rename to src/xrpld/app/tx/detail/SetOracle.cpp index d0987d26538..055143cc6fd 100644 --- a/src/ripple/app/tx/impl/SetOracle.cpp +++ b/src/xrpld/app/tx/detail/SetOracle.cpp @@ -17,14 +17,14 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/SetOracle.h b/src/xrpld/app/tx/detail/SetOracle.h similarity index 97% rename from src/ripple/app/tx/impl/SetOracle.h rename to src/xrpld/app/tx/detail/SetOracle.h index 0ab8e603aa5..13c4d7a0cc9 100644 --- a/src/ripple/app/tx/impl/SetOracle.h +++ b/src/xrpld/app/tx/detail/SetOracle.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TX_SETORACLE_H_INCLUDED #define RIPPLE_TX_SETORACLE_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/SetRegularKey.cpp b/src/xrpld/app/tx/detail/SetRegularKey.cpp similarity index 95% rename from src/ripple/app/tx/impl/SetRegularKey.cpp rename to src/xrpld/app/tx/detail/SetRegularKey.cpp index 8b789d75aed..9f165612f3a 100644 --- a/src/ripple/app/tx/impl/SetRegularKey.cpp +++ b/src/xrpld/app/tx/detail/SetRegularKey.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include -#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/SetRegularKey.h b/src/xrpld/app/tx/detail/SetRegularKey.h similarity index 91% rename from src/ripple/app/tx/impl/SetRegularKey.h rename to src/xrpld/app/tx/detail/SetRegularKey.h index 402ee436ed5..89a714342ff 100644 --- a/src/ripple/app/tx/impl/SetRegularKey.h +++ b/src/xrpld/app/tx/detail/SetRegularKey.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_TX_SETREGULARKEY_H_INCLUDED #define RIPPLE_TX_SETREGULARKEY_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/SetSignerList.cpp b/src/xrpld/app/tx/detail/SetSignerList.cpp similarity index 96% rename from src/ripple/app/tx/impl/SetSignerList.cpp rename to src/xrpld/app/tx/detail/SetSignerList.cpp index 07cc705bad1..0949fbbe775 100644 --- a/src/ripple/app/tx/impl/SetSignerList.cpp +++ b/src/xrpld/app/tx/detail/SetSignerList.cpp @@ -17,16 +17,16 @@ */ //============================================================================== -#include - -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -416,11 +416,11 @@ SetSignerList::writeSignersToSLE( STArray toLedger(signers_.size()); for (auto const& entry : signers_) { - toLedger.emplace_back(sfSignerEntry); + toLedger.push_back(STObject::makeInnerObject(sfSignerEntry)); STObject& obj = toLedger.back(); obj.reserve(2); - obj.setAccountID(sfAccount, entry.account); - obj.setFieldU16(sfSignerWeight, entry.weight); + obj[sfAccount] = entry.account; + obj[sfSignerWeight] = entry.weight; // This is a defensive check to make absolutely sure we will never write // a tag into the ledger while featureExpandedSignerList is not enabled diff --git a/src/ripple/app/tx/impl/SetSignerList.h b/src/xrpld/app/tx/detail/SetSignerList.h similarity index 88% rename from src/ripple/app/tx/impl/SetSignerList.h rename to src/xrpld/app/tx/detail/SetSignerList.h index f8e49e4a7b0..c2006945eca 100644 --- a/src/ripple/app/tx/impl/SetSignerList.h +++ b/src/xrpld/app/tx/detail/SetSignerList.h @@ -20,15 +20,15 @@ #ifndef RIPPLE_TX_SETSIGNERLIST_H_INCLUDED #define RIPPLE_TX_SETSIGNERLIST_H_INCLUDED -#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/app/tx/impl/SetTrust.cpp b/src/xrpld/app/tx/detail/SetTrust.cpp similarity index 98% rename from src/ripple/app/tx/impl/SetTrust.cpp rename to src/xrpld/app/tx/detail/SetTrust.cpp index 00a5165221e..3a7fe9cca0d 100644 --- a/src/ripple/app/tx/impl/SetTrust.cpp +++ b/src/xrpld/app/tx/detail/SetTrust.cpp @@ -17,14 +17,14 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/SetTrust.h b/src/xrpld/app/tx/detail/SetTrust.h similarity index 89% rename from src/ripple/app/tx/impl/SetTrust.h rename to src/xrpld/app/tx/detail/SetTrust.h index 259ed077412..a86c8498d48 100644 --- a/src/ripple/app/tx/impl/SetTrust.h +++ b/src/xrpld/app/tx/detail/SetTrust.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_TX_SETTRUST_H_INCLUDED #define RIPPLE_TX_SETTRUST_H_INCLUDED -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/SignerEntries.cpp b/src/xrpld/app/tx/detail/SignerEntries.cpp similarity index 92% rename from src/ripple/app/tx/impl/SignerEntries.cpp rename to src/xrpld/app/tx/detail/SignerEntries.cpp index a948b2f902b..cab362a8e3b 100644 --- a/src/ripple/app/tx/impl/SignerEntries.cpp +++ b/src/xrpld/app/tx/detail/SignerEntries.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -30,7 +30,7 @@ Expected, NotTEC> SignerEntries::deserialize( STObject const& obj, beast::Journal journal, - std::string const& annotation) + std::string_view annotation) { std::pair, NotTEC> s; diff --git a/src/ripple/app/tx/impl/SignerEntries.h b/src/xrpld/app/tx/detail/SignerEntries.h similarity index 69% rename from src/ripple/app/tx/impl/SignerEntries.h rename to src/xrpld/app/tx/detail/SignerEntries.h index cf4921ecf4b..2227aa98109 100644 --- a/src/ripple/app/tx/impl/SignerEntries.h +++ b/src/xrpld/app/tx/detail/SignerEntries.h @@ -20,25 +20,34 @@ #ifndef RIPPLE_TX_IMPL_SIGNER_ENTRIES_H_INCLUDED #define RIPPLE_TX_IMPL_SIGNER_ENTRIES_H_INCLUDED -#include // NotTEC -#include // -#include // beast::Journal -#include // Rules -#include // STTx::maxMultiSigners -#include // temMALFORMED -#include // AccountID +#include // NotTEC +#include // +#include // beast::Journal +#include // Rules +#include // STTx::maxMultiSigners +#include // temMALFORMED +#include // AccountID + #include +#include namespace ripple { // Forward declarations class STObject; -// Support for SignerEntries that is needed by a few Transactors +// Support for SignerEntries that is needed by a few Transactors. +// +// SignerEntries is represented as a std::vector. +// There is no direct constructor for SignerEntries. +// +// o A std::vector is a SignerEntries. +// o More commonly, SignerEntries are extracted from an STObject by +// calling SignerEntries::deserialize(). class SignerEntries { public: - explicit SignerEntries() = default; + explicit SignerEntries() = delete; struct SignerEntry { @@ -69,11 +78,15 @@ class SignerEntries }; // Deserialize a SignerEntries array from the network or from the ledger. + // + // obj Contains a SignerEntries field that is an STArray. + // journal For reporting error conditions. + // annotation Source of SignerEntries, like "ledger" or "transaction". static Expected, NotTEC> deserialize( STObject const& obj, beast::Journal journal, - std::string const& annotation); + std::string_view annotation); }; } // namespace ripple diff --git a/src/ripple/app/tx/impl/Taker.cpp b/src/xrpld/app/tx/detail/Taker.cpp similarity index 99% rename from src/ripple/app/tx/impl/Taker.cpp rename to src/xrpld/app/tx/detail/Taker.cpp index f463ce41198..9d335de2846 100644 --- a/src/ripple/app/tx/impl/Taker.cpp +++ b/src/xrpld/app/tx/detail/Taker.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include -#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/Taker.h b/src/xrpld/app/tx/detail/Taker.h similarity index 96% rename from src/ripple/app/tx/impl/Taker.h rename to src/xrpld/app/tx/detail/Taker.h index 4a516dccec1..3e64c59b542 100644 --- a/src/ripple/app/tx/impl/Taker.h +++ b/src/xrpld/app/tx/detail/Taker.h @@ -20,14 +20,14 @@ #ifndef RIPPLE_APP_BOOK_TAKER_H_INCLUDED #define RIPPLE_APP_BOOK_TAKER_H_INCLUDED -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/app/tx/impl/Transactor.cpp b/src/xrpld/app/tx/detail/Transactor.cpp similarity index 98% rename from src/ripple/app/tx/impl/Transactor.cpp rename to src/xrpld/app/tx/detail/Transactor.cpp index c02b57a3ae4..42e9f0677ab 100644 --- a/src/ripple/app/tx/impl/Transactor.cpp +++ b/src/xrpld/app/tx/detail/Transactor.cpp @@ -17,22 +17,22 @@ */ //============================================================================== -#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 +#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/Transactor.h b/src/xrpld/app/tx/detail/Transactor.h similarity index 97% rename from src/ripple/app/tx/impl/Transactor.h rename to src/xrpld/app/tx/detail/Transactor.h index cc280e6141d..27f22a0eb2e 100644 --- a/src/ripple/app/tx/impl/Transactor.h +++ b/src/xrpld/app/tx/detail/Transactor.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_APP_TX_TRANSACTOR_H_INCLUDED #define RIPPLE_APP_TX_TRANSACTOR_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/XChainBridge.cpp b/src/xrpld/app/tx/detail/XChainBridge.cpp similarity index 98% rename from src/ripple/app/tx/impl/XChainBridge.cpp rename to src/xrpld/app/tx/detail/XChainBridge.cpp index be315236f2c..f5633903567 100644 --- a/src/ripple/app/tx/impl/XChainBridge.cpp +++ b/src/xrpld/app/tx/detail/XChainBridge.cpp @@ -17,31 +17,31 @@ */ //============================================================================== -#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 +#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/app/tx/impl/XChainBridge.h b/src/xrpld/app/tx/detail/XChainBridge.h similarity index 98% rename from src/ripple/app/tx/impl/XChainBridge.h rename to src/xrpld/app/tx/detail/XChainBridge.h index 4d41c7d1c21..822f687729a 100644 --- a/src/ripple/app/tx/impl/XChainBridge.h +++ b/src/xrpld/app/tx/detail/XChainBridge.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_TX_XCHAINBRIDGE_H_INCLUDED #define RIPPLE_TX_XCHAINBRIDGE_H_INCLUDED -#include -#include -#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/apply.cpp b/src/xrpld/app/tx/detail/apply.cpp similarity index 96% rename from src/ripple/app/tx/impl/apply.cpp rename to src/xrpld/app/tx/detail/apply.cpp index c0704c5c3ae..103ec041074 100644 --- a/src/ripple/app/tx/impl/apply.cpp +++ b/src/xrpld/app/tx/detail/apply.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/applySteps.cpp b/src/xrpld/app/tx/detail/applySteps.cpp similarity index 89% rename from src/ripple/app/tx/impl/applySteps.cpp rename to src/xrpld/app/tx/detail/applySteps.cpp index 1a1fc343e3c..9ddaa3051c4 100644 --- a/src/ripple/app/tx/impl/applySteps.cpp +++ b/src/xrpld/app/tx/detail/applySteps.cpp @@ -17,41 +17,41 @@ */ //============================================================================== -#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 -#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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/ripple/conditions/Condition.h b/src/xrpld/conditions/Condition.h similarity index 96% rename from src/ripple/conditions/Condition.h rename to src/xrpld/conditions/Condition.h index 340b7c96124..a3120f1b3ca 100644 --- a/src/ripple/conditions/Condition.h +++ b/src/xrpld/conditions/Condition.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_CONDITIONS_CONDITION_H #define RIPPLE_CONDITIONS_CONDITION_H -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/ripple/conditions/Fulfillment.h b/src/xrpld/conditions/Fulfillment.h similarity index 96% rename from src/ripple/conditions/Fulfillment.h rename to src/xrpld/conditions/Fulfillment.h index 075c005100c..e70bcf54d41 100644 --- a/src/ripple/conditions/Fulfillment.h +++ b/src/xrpld/conditions/Fulfillment.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_CONDITIONS_FULFILLMENT_H #define RIPPLE_CONDITIONS_FULFILLMENT_H -#include -#include -#include -#include +#include +#include +#include +#include namespace ripple { namespace cryptoconditions { diff --git a/src/ripple/conditions/impl/Condition.cpp b/src/xrpld/conditions/detail/Condition.cpp similarity index 96% rename from src/ripple/conditions/impl/Condition.cpp rename to src/xrpld/conditions/detail/Condition.cpp index 8a1d30916a1..3085ace0a31 100644 --- a/src/ripple/conditions/impl/Condition.cpp +++ b/src/xrpld/conditions/detail/Condition.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/conditions/impl/Fulfillment.cpp b/src/xrpld/conditions/detail/Fulfillment.cpp similarity index 94% rename from src/ripple/conditions/impl/Fulfillment.cpp rename to src/xrpld/conditions/detail/Fulfillment.cpp index ff47e386469..285113ebfb2 100644 --- a/src/ripple/conditions/impl/Fulfillment.cpp +++ b/src/xrpld/conditions/detail/Fulfillment.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/conditions/impl/PreimageSha256.h b/src/xrpld/conditions/detail/PreimageSha256.h similarity index 94% rename from src/ripple/conditions/impl/PreimageSha256.h rename to src/xrpld/conditions/detail/PreimageSha256.h index 316e57ac173..c0eca96b066 100644 --- a/src/ripple/conditions/impl/PreimageSha256.h +++ b/src/xrpld/conditions/detail/PreimageSha256.h @@ -20,12 +20,12 @@ #ifndef RIPPLE_CONDITIONS_PREIMAGE_SHA256_H #define RIPPLE_CONDITIONS_PREIMAGE_SHA256_H -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/conditions/impl/error.cpp b/src/xrpld/conditions/detail/error.cpp similarity index 98% rename from src/ripple/conditions/impl/error.cpp rename to src/xrpld/conditions/detail/error.cpp index f685a45899e..3594c9e14da 100644 --- a/src/ripple/conditions/impl/error.cpp +++ b/src/xrpld/conditions/detail/error.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include #include #include #include diff --git a/src/ripple/conditions/impl/error.h b/src/xrpld/conditions/detail/error.h similarity index 100% rename from src/ripple/conditions/impl/error.h rename to src/xrpld/conditions/detail/error.h diff --git a/src/ripple/conditions/impl/utils.h b/src/xrpld/conditions/detail/utils.h similarity index 97% rename from src/ripple/conditions/impl/utils.h rename to src/xrpld/conditions/detail/utils.h index e9ab1770a18..35d9c7dea51 100644 --- a/src/ripple/conditions/impl/utils.h +++ b/src/xrpld/conditions/detail/utils.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_CONDITIONS_UTILS_H #define RIPPLE_CONDITIONS_UTILS_H -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/consensus/Consensus.cpp b/src/xrpld/consensus/Consensus.cpp similarity index 98% rename from src/ripple/consensus/Consensus.cpp rename to src/xrpld/consensus/Consensus.cpp index cc1f84270e7..01451c6a255 100644 --- a/src/ripple/consensus/Consensus.cpp +++ b/src/xrpld/consensus/Consensus.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include namespace ripple { diff --git a/src/ripple/consensus/Consensus.h b/src/xrpld/consensus/Consensus.h similarity index 99% rename from src/ripple/consensus/Consensus.h rename to src/xrpld/consensus/Consensus.h index 248bbdc4a1b..fd3560b1744 100644 --- a/src/ripple/consensus/Consensus.h +++ b/src/xrpld/consensus/Consensus.h @@ -20,15 +20,15 @@ #ifndef RIPPLE_CONSENSUS_CONSENSUS_H_INCLUDED #define RIPPLE_CONSENSUS_CONSENSUS_H_INCLUDED -#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/consensus/ConsensusParms.h b/src/xrpld/consensus/ConsensusParms.h similarity index 100% rename from src/ripple/consensus/ConsensusParms.h rename to src/xrpld/consensus/ConsensusParms.h diff --git a/src/ripple/consensus/ConsensusProposal.h b/src/xrpld/consensus/ConsensusProposal.h similarity index 97% rename from src/ripple/consensus/ConsensusProposal.h rename to src/xrpld/consensus/ConsensusProposal.h index c5103cfe0d5..c00bffe0237 100644 --- a/src/ripple/consensus/ConsensusProposal.h +++ b/src/xrpld/consensus/ConsensusProposal.h @@ -19,11 +19,11 @@ #ifndef RIPPLE_CONSENSUS_CONSENSUSPROPOSAL_H_INCLUDED #define RIPPLE_CONSENSUS_CONSENSUSPROPOSAL_H_INCLUDED -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/consensus/ConsensusTypes.h b/src/xrpld/consensus/ConsensusTypes.h similarity index 98% rename from src/ripple/consensus/ConsensusTypes.h rename to src/xrpld/consensus/ConsensusTypes.h index 05d03c8a9c6..da03fc4875a 100644 --- a/src/ripple/consensus/ConsensusTypes.h +++ b/src/xrpld/consensus/ConsensusTypes.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_CONSENSUS_CONSENSUS_TYPES_H_INCLUDED #define RIPPLE_CONSENSUS_CONSENSUS_TYPES_H_INCLUDED -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/ripple/consensus/DisputedTx.h b/src/xrpld/consensus/DisputedTx.h similarity index 96% rename from src/ripple/consensus/DisputedTx.h rename to src/xrpld/consensus/DisputedTx.h index ae127197eec..bffb1009323 100644 --- a/src/ripple/consensus/DisputedTx.h +++ b/src/xrpld/consensus/DisputedTx.h @@ -20,13 +20,13 @@ #ifndef RIPPLE_APP_CONSENSUS_IMPL_DISPUTEDTX_H_INCLUDED #define RIPPLE_APP_CONSENSUS_IMPL_DISPUTEDTX_H_INCLUDED -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/consensus/LedgerTiming.h b/src/xrpld/consensus/LedgerTiming.h similarity index 98% rename from src/ripple/consensus/LedgerTiming.h rename to src/xrpld/consensus/LedgerTiming.h index 9320cf07de1..1bb5bfd730f 100644 --- a/src/ripple/consensus/LedgerTiming.h +++ b/src/xrpld/consensus/LedgerTiming.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_APP_LEDGER_LEDGERTIMING_H_INCLUDED #define RIPPLE_APP_LEDGER_LEDGERTIMING_H_INCLUDED -#include -#include +#include +#include #include #include diff --git a/src/ripple/consensus/LedgerTrie.h b/src/xrpld/consensus/LedgerTrie.h similarity index 99% rename from src/ripple/consensus/LedgerTrie.h rename to src/xrpld/consensus/LedgerTrie.h index 12cd0d3cbbc..32bae28cc07 100644 --- a/src/ripple/consensus/LedgerTrie.h +++ b/src/xrpld/consensus/LedgerTrie.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_APP_CONSENSUS_LEDGERS_TRIE_H_INCLUDED #define RIPPLE_APP_CONSENSUS_LEDGERS_TRIE_H_INCLUDED -#include -#include +#include +#include #include #include #include diff --git a/src/ripple/consensus/README.md b/src/xrpld/consensus/README.md similarity index 100% rename from src/ripple/consensus/README.md rename to src/xrpld/consensus/README.md diff --git a/src/ripple/consensus/Validations.h b/src/xrpld/consensus/Validations.h similarity index 99% rename from src/ripple/consensus/Validations.h rename to src/xrpld/consensus/Validations.h index 1bef76d961c..ed07858d321 100644 --- a/src/ripple/consensus/Validations.h +++ b/src/xrpld/consensus/Validations.h @@ -20,13 +20,13 @@ #ifndef RIPPLE_CONSENSUS_VALIDATIONS_H_INCLUDED #define RIPPLE_CONSENSUS_VALIDATIONS_H_INCLUDED -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/core/ClosureCounter.h b/src/xrpld/core/ClosureCounter.h similarity index 99% rename from src/ripple/core/ClosureCounter.h rename to src/xrpld/core/ClosureCounter.h index 9f5bc3ee617..9b1a69bf95d 100644 --- a/src/ripple/core/ClosureCounter.h +++ b/src/xrpld/core/ClosureCounter.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_CORE_CLOSURE_COUNTER_H_INCLUDED #define RIPPLE_CORE_CLOSURE_COUNTER_H_INCLUDED -#include +#include #include #include #include diff --git a/src/ripple/core/Config.h b/src/xrpld/core/Config.h similarity index 97% rename from src/ripple/core/Config.h rename to src/xrpld/core/Config.h index 24b762cf8c5..2872193f0ee 100644 --- a/src/ripple/core/Config.h +++ b/src/xrpld/core/Config.h @@ -20,12 +20,12 @@ #ifndef RIPPLE_CORE_CONFIG_H_INCLUDED #define RIPPLE_CORE_CONFIG_H_INCLUDED -#include -#include -#include -#include -#include -#include // VFALCO Breaks levelization +#include +#include +#include +#include +#include +#include // VFALCO Breaks levelization #include #include // VFALCO FIX: This include should not be here diff --git a/src/ripple/core/ConfigSections.h b/src/xrpld/core/ConfigSections.h similarity index 100% rename from src/ripple/core/ConfigSections.h rename to src/xrpld/core/ConfigSections.h diff --git a/src/ripple/core/Coro.ipp b/src/xrpld/core/Coro.ipp similarity index 98% rename from src/ripple/core/Coro.ipp rename to src/xrpld/core/Coro.ipp index 2b07c5a4584..a936dd896ae 100644 --- a/src/ripple/core/Coro.ipp +++ b/src/xrpld/core/Coro.ipp @@ -20,7 +20,7 @@ #ifndef RIPPLE_CORE_COROINL_H_INCLUDED #define RIPPLE_CORE_COROINL_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/core/DatabaseCon.h b/src/xrpld/core/DatabaseCon.h similarity index 98% rename from src/ripple/core/DatabaseCon.h rename to src/xrpld/core/DatabaseCon.h index 59eec3a32e9..d2f6b0a4f05 100644 --- a/src/ripple/core/DatabaseCon.h +++ b/src/xrpld/core/DatabaseCon.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_APP_DATA_DATABASECON_H_INCLUDED #define RIPPLE_APP_DATA_DATABASECON_H_INCLUDED -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/ripple/core/Job.h b/src/xrpld/core/Job.h similarity index 97% rename from src/ripple/core/Job.h rename to src/xrpld/core/Job.h index c4f2eddf35a..c5926ae2e08 100644 --- a/src/ripple/core/Job.h +++ b/src/xrpld/core/Job.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_CORE_JOB_H_INCLUDED #define RIPPLE_CORE_JOB_H_INCLUDED -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/ripple/core/JobQueue.h b/src/xrpld/core/JobQueue.h similarity index 98% rename from src/ripple/core/JobQueue.h rename to src/xrpld/core/JobQueue.h index a9d541baa75..06f90dd1c4e 100644 --- a/src/ripple/core/JobQueue.h +++ b/src/xrpld/core/JobQueue.h @@ -20,12 +20,12 @@ #ifndef RIPPLE_CORE_JOBQUEUE_H_INCLUDED #define RIPPLE_CORE_JOBQUEUE_H_INCLUDED -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include // workaround for boost 1.72 bug #include // workaround for boost 1.72 bug @@ -402,7 +402,7 @@ class JobQueue : private Workers::Callback } // namespace ripple -#include +#include namespace ripple { diff --git a/src/ripple/core/JobTypeData.h b/src/xrpld/core/JobTypeData.h similarity index 96% rename from src/ripple/core/JobTypeData.h rename to src/xrpld/core/JobTypeData.h index 3f0cdb6e939..43d63895d8b 100644 --- a/src/ripple/core/JobTypeData.h +++ b/src/xrpld/core/JobTypeData.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_CORE_JOBTYPEDATA_H_INCLUDED #define RIPPLE_CORE_JOBTYPEDATA_H_INCLUDED -#include -#include -#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/core/JobTypeInfo.h b/src/xrpld/core/JobTypeInfo.h similarity index 98% rename from src/ripple/core/JobTypeInfo.h rename to src/xrpld/core/JobTypeInfo.h index 7ed7c469711..a521980ebe8 100644 --- a/src/ripple/core/JobTypeInfo.h +++ b/src/xrpld/core/JobTypeInfo.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_CORE_JOBTYPEINFO_H_INCLUDED #define RIPPLE_CORE_JOBTYPEINFO_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/core/JobTypes.h b/src/xrpld/core/JobTypes.h similarity index 99% rename from src/ripple/core/JobTypes.h rename to src/xrpld/core/JobTypes.h index 2803537f115..2dbc45ca1b5 100644 --- a/src/ripple/core/JobTypes.h +++ b/src/xrpld/core/JobTypes.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_CORE_JOBTYPES_H_INCLUDED #define RIPPLE_CORE_JOBTYPES_H_INCLUDED -#include -#include +#include +#include #include #include #include diff --git a/src/ripple/core/LoadEvent.h b/src/xrpld/core/LoadEvent.h similarity index 100% rename from src/ripple/core/LoadEvent.h rename to src/xrpld/core/LoadEvent.h diff --git a/src/ripple/core/LoadMonitor.h b/src/xrpld/core/LoadMonitor.h similarity index 95% rename from src/ripple/core/LoadMonitor.h rename to src/xrpld/core/LoadMonitor.h index e903bf25e31..e57429da23b 100644 --- a/src/ripple/core/LoadMonitor.h +++ b/src/xrpld/core/LoadMonitor.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_CORE_LOADMONITOR_H_INCLUDED #define RIPPLE_CORE_LOADMONITOR_H_INCLUDED -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/ripple/core/Pg.cpp b/src/xrpld/core/Pg.cpp similarity index 99% rename from src/ripple/core/Pg.cpp rename to src/xrpld/core/Pg.cpp index df0f6da5ef5..829e17658c1 100644 --- a/src/ripple/core/Pg.cpp +++ b/src/xrpld/core/Pg.cpp @@ -29,8 +29,8 @@ #include #endif -#include -#include +#include +#include #include #include #include diff --git a/src/ripple/core/Pg.h b/src/xrpld/core/Pg.h similarity index 99% rename from src/ripple/core/Pg.h rename to src/xrpld/core/Pg.h index b2e8f465c30..c1333ed66fb 100644 --- a/src/ripple/core/Pg.h +++ b/src/xrpld/core/Pg.h @@ -21,9 +21,9 @@ #ifndef RIPPLE_CORE_PG_H_INCLUDED #define RIPPLE_CORE_PG_H_INCLUDED -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/ripple/core/SociDB.h b/src/xrpld/core/SociDB.h similarity index 98% rename from src/ripple/core/SociDB.h rename to src/xrpld/core/SociDB.h index 621754098f8..20f210d4e38 100644 --- a/src/ripple/core/SociDB.h +++ b/src/xrpld/core/SociDB.h @@ -33,8 +33,8 @@ #pragma clang diagnostic ignored "-Wdeprecated" #endif -#include -#include +#include +#include #define SOCI_USE_BOOST #include #include diff --git a/src/ripple/core/TimeKeeper.h b/src/xrpld/core/TimeKeeper.h similarity index 98% rename from src/ripple/core/TimeKeeper.h rename to src/xrpld/core/TimeKeeper.h index e239a2f7565..f94a92a6666 100644 --- a/src/ripple/core/TimeKeeper.h +++ b/src/xrpld/core/TimeKeeper.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_CORE_TIMEKEEPER_H_INCLUDED #define RIPPLE_CORE_TIMEKEEPER_H_INCLUDED -#include -#include +#include +#include #include diff --git a/src/ripple/core/impl/Config.cpp b/src/xrpld/core/detail/Config.cpp similarity index 98% rename from src/ripple/core/impl/Config.cpp rename to src/xrpld/core/detail/Config.cpp index 2f26b8ba525..07d269883e2 100644 --- a/src/ripple/core/impl/Config.cpp +++ b/src/xrpld/core/detail/Config.cpp @@ -17,17 +17,17 @@ */ //============================================================================== -#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/core/impl/DatabaseCon.cpp b/src/xrpld/core/detail/DatabaseCon.cpp similarity index 98% rename from src/ripple/core/impl/DatabaseCon.cpp rename to src/xrpld/core/detail/DatabaseCon.cpp index 4f65f7003f6..c23c7491b04 100644 --- a/src/ripple/core/impl/DatabaseCon.cpp +++ b/src/xrpld/core/detail/DatabaseCon.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/core/impl/Job.cpp b/src/xrpld/core/detail/Job.cpp similarity index 97% rename from src/ripple/core/impl/Job.cpp rename to src/xrpld/core/detail/Job.cpp index 780a9f49cdf..0782fd05a66 100644 --- a/src/ripple/core/impl/Job.cpp +++ b/src/xrpld/core/detail/Job.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include #include namespace ripple { diff --git a/src/ripple/core/impl/JobQueue.cpp b/src/xrpld/core/detail/JobQueue.cpp similarity index 99% rename from src/ripple/core/impl/JobQueue.cpp rename to src/xrpld/core/detail/JobQueue.cpp index 28947300cc6..1c859d724f4 100644 --- a/src/ripple/core/impl/JobQueue.cpp +++ b/src/xrpld/core/detail/JobQueue.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include -#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/core/impl/LoadEvent.cpp b/src/xrpld/core/detail/LoadEvent.cpp similarity index 96% rename from src/ripple/core/impl/LoadEvent.cpp rename to src/xrpld/core/detail/LoadEvent.cpp index 38617e7f541..ca78fdb19cc 100644 --- a/src/ripple/core/impl/LoadEvent.cpp +++ b/src/xrpld/core/detail/LoadEvent.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include #include #include diff --git a/src/ripple/core/impl/LoadMonitor.cpp b/src/xrpld/core/detail/LoadMonitor.cpp similarity index 97% rename from src/ripple/core/impl/LoadMonitor.cpp rename to src/xrpld/core/detail/LoadMonitor.cpp index e70b7947a32..80b08bbdfc3 100644 --- a/src/ripple/core/impl/LoadMonitor.cpp +++ b/src/xrpld/core/detail/LoadMonitor.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include -#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/core/impl/SociDB.cpp b/src/xrpld/core/detail/SociDB.cpp similarity index 97% rename from src/ripple/core/impl/SociDB.cpp rename to src/xrpld/core/detail/SociDB.cpp index 2d133263607..94f9098d9c0 100644 --- a/src/ripple/core/impl/SociDB.cpp +++ b/src/xrpld/core/detail/SociDB.cpp @@ -22,12 +22,12 @@ #pragma clang diagnostic ignored "-Wdeprecated" #endif -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/core/impl/Workers.cpp b/src/xrpld/core/detail/Workers.cpp similarity index 98% rename from src/ripple/core/impl/Workers.cpp rename to src/xrpld/core/detail/Workers.cpp index 732e6f0ec8a..ff861010d95 100644 --- a/src/ripple/core/impl/Workers.cpp +++ b/src/xrpld/core/detail/Workers.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include -#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/core/impl/Workers.h b/src/xrpld/core/detail/Workers.h similarity index 98% rename from src/ripple/core/impl/Workers.h rename to src/xrpld/core/detail/Workers.h index 88ab8fa27e2..3645d4fbcf0 100644 --- a/src/ripple/core/impl/Workers.h +++ b/src/xrpld/core/detail/Workers.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_CORE_WORKERS_H_INCLUDED #define RIPPLE_CORE_WORKERS_H_INCLUDED -#include -#include +#include +#include #include #include #include diff --git a/src/ripple/core/impl/semaphore.h b/src/xrpld/core/detail/semaphore.h similarity index 100% rename from src/ripple/core/impl/semaphore.h rename to src/xrpld/core/detail/semaphore.h diff --git a/src/ripple/ledger/ApplyView.h b/src/xrpld/ledger/ApplyView.h similarity index 99% rename from src/ripple/ledger/ApplyView.h rename to src/xrpld/ledger/ApplyView.h index a37ba6c46a1..f0166cd0b38 100644 --- a/src/ripple/ledger/ApplyView.h +++ b/src/xrpld/ledger/ApplyView.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_LEDGER_APPLYVIEW_H_INCLUDED #define RIPPLE_LEDGER_APPLYVIEW_H_INCLUDED -#include -#include -#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/ledger/ApplyViewImpl.h b/src/xrpld/ledger/ApplyViewImpl.h similarity index 94% rename from src/ripple/ledger/ApplyViewImpl.h rename to src/xrpld/ledger/ApplyViewImpl.h index a7fb1bd426b..65678c5a6c4 100644 --- a/src/ripple/ledger/ApplyViewImpl.h +++ b/src/xrpld/ledger/ApplyViewImpl.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_LEDGER_APPLYVIEWIMPL_H_INCLUDED #define RIPPLE_LEDGER_APPLYVIEWIMPL_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/ledger/BookDirs.h b/src/xrpld/ledger/BookDirs.h similarity index 98% rename from src/ripple/ledger/BookDirs.h rename to src/xrpld/ledger/BookDirs.h index 86ea67d9166..2c27a5b6596 100644 --- a/src/ripple/ledger/BookDirs.h +++ b/src/xrpld/ledger/BookDirs.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_LEDGER_BOOK_DIRS_H_INCLUDED #define RIPPLE_LEDGER_BOOK_DIRS_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/ledger/CachedSLEs.h b/src/xrpld/ledger/CachedSLEs.h similarity index 91% rename from src/ripple/ledger/CachedSLEs.h rename to src/xrpld/ledger/CachedSLEs.h index d2b04e2cb5c..bc94092e20d 100644 --- a/src/ripple/ledger/CachedSLEs.h +++ b/src/xrpld/ledger/CachedSLEs.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_LEDGER_CACHEDSLES_H_INCLUDED #define RIPPLE_LEDGER_CACHEDSLES_H_INCLUDED -#include -#include -#include +#include +#include +#include namespace ripple { using CachedSLEs = TaggedCache; diff --git a/src/ripple/ledger/CachedView.h b/src/xrpld/ledger/CachedView.h similarity index 97% rename from src/ripple/ledger/CachedView.h rename to src/xrpld/ledger/CachedView.h index da483b34948..fd921c63ca9 100644 --- a/src/ripple/ledger/CachedView.h +++ b/src/xrpld/ledger/CachedView.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_LEDGER_CACHEDVIEW_H_INCLUDED #define RIPPLE_LEDGER_CACHEDVIEW_H_INCLUDED -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/ripple/ledger/Directory.h b/src/xrpld/ledger/Dir.h similarity index 84% rename from src/ripple/ledger/Directory.h rename to src/xrpld/ledger/Dir.h index 0efcf43e773..0e92d7dbca6 100644 --- a/src/ripple/ledger/Directory.h +++ b/src/xrpld/ledger/Dir.h @@ -20,11 +20,23 @@ #ifndef RIPPLE_LEDGER_DIR_H_INCLUDED #define RIPPLE_LEDGER_DIR_H_INCLUDED -#include -#include +#include +#include namespace ripple { +/** A class that simplifies iterating ledger directory pages + + The Dir class provides a forward iterator for walking through + the uint256 values contained in ledger directories. + + The Dir class also allows accelerated directory walking by + stepping directly from one page to the next using the next_page() + member function. + + As of July 2024, the Dir class is only being used with NFTokenOffer + directories and for unit tests. +*/ class Dir { private: diff --git a/src/ripple/ledger/OpenView.h b/src/xrpld/ledger/OpenView.h similarity index 97% rename from src/ripple/ledger/OpenView.h rename to src/xrpld/ledger/OpenView.h index 98b783e3a48..bd8627a18b2 100644 --- a/src/ripple/ledger/OpenView.h +++ b/src/xrpld/ledger/OpenView.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_LEDGER_OPENVIEW_H_INCLUDED #define RIPPLE_LEDGER_OPENVIEW_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/ledger/PaymentSandbox.h b/src/xrpld/ledger/PaymentSandbox.h similarity index 97% rename from src/ripple/ledger/PaymentSandbox.h rename to src/xrpld/ledger/PaymentSandbox.h index 60e42af1147..d7299b2efbf 100644 --- a/src/ripple/ledger/PaymentSandbox.h +++ b/src/xrpld/ledger/PaymentSandbox.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_LEDGER_PAYMENTSANDBOX_H_INCLUDED #define RIPPLE_LEDGER_PAYMENTSANDBOX_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/ledger/RawView.h b/src/xrpld/ledger/RawView.h similarity index 96% rename from src/ripple/ledger/RawView.h rename to src/xrpld/ledger/RawView.h index 29c9ab9abb9..cd9bcff8761 100644 --- a/src/ripple/ledger/RawView.h +++ b/src/xrpld/ledger/RawView.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_LEDGER_RAWVIEW_H_INCLUDED #define RIPPLE_LEDGER_RAWVIEW_H_INCLUDED -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/ripple/ledger/ReadView.h b/src/xrpld/ledger/ReadView.h similarity index 92% rename from src/ripple/ledger/ReadView.h rename to src/xrpld/ledger/ReadView.h index 2ea3ab492ed..50f1a7d98c1 100644 --- a/src/ripple/ledger/ReadView.h +++ b/src/xrpld/ledger/ReadView.h @@ -20,21 +20,21 @@ #ifndef RIPPLE_LEDGER_READVIEW_H_INCLUDED #define RIPPLE_LEDGER_READVIEW_H_INCLUDED -#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 #include #include #include @@ -283,6 +283,6 @@ makeRulesGivenLedger( } // namespace ripple -#include +#include #endif diff --git a/src/ripple/ledger/Sandbox.h b/src/xrpld/ledger/Sandbox.h similarity index 95% rename from src/ripple/ledger/Sandbox.h rename to src/xrpld/ledger/Sandbox.h index d8610a69ef1..22b8dbecfb2 100644 --- a/src/ripple/ledger/Sandbox.h +++ b/src/xrpld/ledger/Sandbox.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_LEDGER_SANDBOX_H_INCLUDED #define RIPPLE_LEDGER_SANDBOX_H_INCLUDED -#include -#include +#include +#include namespace ripple { diff --git a/src/ripple/ledger/View.h b/src/xrpld/ledger/View.h similarity index 96% rename from src/ripple/ledger/View.h rename to src/xrpld/ledger/View.h index 5680114a79c..09f374d2c29 100644 --- a/src/ripple/ledger/View.h +++ b/src/xrpld/ledger/View.h @@ -20,19 +20,19 @@ #ifndef RIPPLE_LEDGER_VIEW_H_INCLUDED #define RIPPLE_LEDGER_VIEW_H_INCLUDED -#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/ledger/impl/ApplyStateTable.cpp b/src/xrpld/ledger/detail/ApplyStateTable.cpp similarity index 99% rename from src/ripple/ledger/impl/ApplyStateTable.cpp rename to src/xrpld/ledger/detail/ApplyStateTable.cpp index ab2f0ca8cdb..b849365c83f 100644 --- a/src/ripple/ledger/impl/ApplyStateTable.cpp +++ b/src/xrpld/ledger/detail/ApplyStateTable.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/ledger/detail/ApplyStateTable.h b/src/xrpld/ledger/detail/ApplyStateTable.h similarity index 93% rename from src/ripple/ledger/detail/ApplyStateTable.h rename to src/xrpld/ledger/detail/ApplyStateTable.h index 3fbc4960973..d1616d095e5 100644 --- a/src/ripple/ledger/detail/ApplyStateTable.h +++ b/src/xrpld/ledger/detail/ApplyStateTable.h @@ -20,13 +20,13 @@ #ifndef RIPPLE_LEDGER_APPLYSTATETABLE_H_INCLUDED #define RIPPLE_LEDGER_APPLYSTATETABLE_H_INCLUDED -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/ledger/impl/ApplyView.cpp b/src/xrpld/ledger/detail/ApplyView.cpp similarity index 98% rename from src/ripple/ledger/impl/ApplyView.cpp rename to src/xrpld/ledger/detail/ApplyView.cpp index 53dc073c33d..735aa9906e0 100644 --- a/src/ripple/ledger/impl/ApplyView.cpp +++ b/src/xrpld/ledger/detail/ApplyView.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include -#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/ledger/impl/ApplyViewBase.cpp b/src/xrpld/ledger/detail/ApplyViewBase.cpp similarity index 97% rename from src/ripple/ledger/impl/ApplyViewBase.cpp rename to src/xrpld/ledger/detail/ApplyViewBase.cpp index ac87aabb47f..647927ae965 100644 --- a/src/ripple/ledger/impl/ApplyViewBase.cpp +++ b/src/xrpld/ledger/detail/ApplyViewBase.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include namespace ripple { namespace detail { diff --git a/src/ripple/ledger/detail/ApplyViewBase.h b/src/xrpld/ledger/detail/ApplyViewBase.h similarity index 94% rename from src/ripple/ledger/detail/ApplyViewBase.h rename to src/xrpld/ledger/detail/ApplyViewBase.h index 68c210c7b71..8305731b29e 100644 --- a/src/ripple/ledger/detail/ApplyViewBase.h +++ b/src/xrpld/ledger/detail/ApplyViewBase.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_LEDGER_APPLYVIEWBASE_H_INCLUDED #define RIPPLE_LEDGER_APPLYVIEWBASE_H_INCLUDED -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace ripple { namespace detail { diff --git a/src/ripple/ledger/impl/ApplyViewImpl.cpp b/src/xrpld/ledger/detail/ApplyViewImpl.cpp similarity index 95% rename from src/ripple/ledger/impl/ApplyViewImpl.cpp rename to src/xrpld/ledger/detail/ApplyViewImpl.cpp index 155ff4df99f..ffbf681cd20 100644 --- a/src/ripple/ledger/impl/ApplyViewImpl.cpp +++ b/src/xrpld/ledger/detail/ApplyViewImpl.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include #include namespace ripple { diff --git a/src/ripple/ledger/impl/BookDirs.cpp b/src/xrpld/ledger/detail/BookDirs.cpp similarity index 96% rename from src/ripple/ledger/impl/BookDirs.cpp rename to src/xrpld/ledger/detail/BookDirs.cpp index f8589d5575c..58527b02ff2 100644 --- a/src/ripple/ledger/impl/BookDirs.cpp +++ b/src/xrpld/ledger/detail/BookDirs.cpp @@ -18,9 +18,9 @@ */ //============================================================================== -#include -#include -#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/ledger/impl/CachedView.cpp b/src/xrpld/ledger/detail/CachedView.cpp similarity index 95% rename from src/ripple/ledger/impl/CachedView.cpp rename to src/xrpld/ledger/detail/CachedView.cpp index 210031346d3..5502c40e6d5 100644 --- a/src/ripple/ledger/impl/CachedView.cpp +++ b/src/xrpld/ledger/detail/CachedView.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include -#include +#include +#include +#include namespace ripple { namespace detail { diff --git a/src/ripple/ledger/impl/Directory.cpp b/src/xrpld/ledger/detail/Dir.cpp similarity index 98% rename from src/ripple/ledger/impl/Directory.cpp rename to src/xrpld/ledger/detail/Dir.cpp index 759b4d71b74..6004a73095c 100644 --- a/src/ripple/ledger/impl/Directory.cpp +++ b/src/xrpld/ledger/detail/Dir.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { diff --git a/src/ripple/ledger/impl/OpenView.cpp b/src/xrpld/ledger/detail/OpenView.cpp similarity index 98% rename from src/ripple/ledger/impl/OpenView.cpp rename to src/xrpld/ledger/detail/OpenView.cpp index 67858ad5667..619006161f8 100644 --- a/src/ripple/ledger/impl/OpenView.cpp +++ b/src/xrpld/ledger/detail/OpenView.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include namespace ripple { diff --git a/src/ripple/ledger/impl/PaymentSandbox.cpp b/src/xrpld/ledger/detail/PaymentSandbox.cpp similarity index 98% rename from src/ripple/ledger/impl/PaymentSandbox.cpp rename to src/xrpld/ledger/detail/PaymentSandbox.cpp index 45a57cd30d6..d182d22b56c 100644 --- a/src/ripple/ledger/impl/PaymentSandbox.cpp +++ b/src/xrpld/ledger/detail/PaymentSandbox.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/ripple/ledger/impl/RawStateTable.cpp b/src/xrpld/ledger/detail/RawStateTable.cpp similarity index 99% rename from src/ripple/ledger/impl/RawStateTable.cpp rename to src/xrpld/ledger/detail/RawStateTable.cpp index 019ef6156c2..4d3732f8a45 100644 --- a/src/ripple/ledger/impl/RawStateTable.cpp +++ b/src/xrpld/ledger/detail/RawStateTable.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include namespace ripple { namespace detail { diff --git a/src/ripple/ledger/detail/RawStateTable.h b/src/xrpld/ledger/detail/RawStateTable.h similarity index 98% rename from src/ripple/ledger/detail/RawStateTable.h rename to src/xrpld/ledger/detail/RawStateTable.h index 2bb38dc49d8..2db37d98333 100644 --- a/src/ripple/ledger/detail/RawStateTable.h +++ b/src/xrpld/ledger/detail/RawStateTable.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_LEDGER_RAWSTATETABLE_H_INCLUDED #define RIPPLE_LEDGER_RAWSTATETABLE_H_INCLUDED -#include -#include +#include +#include #include #include diff --git a/src/ripple/ledger/impl/ReadView.cpp b/src/xrpld/ledger/detail/ReadView.cpp similarity index 98% rename from src/ripple/ledger/impl/ReadView.cpp rename to src/xrpld/ledger/detail/ReadView.cpp index 1ce21777297..69a4b5d6a95 100644 --- a/src/ripple/ledger/impl/ReadView.cpp +++ b/src/xrpld/ledger/detail/ReadView.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { diff --git a/src/ripple/ledger/detail/ReadViewFwdRange.h b/src/xrpld/ledger/detail/ReadViewFwdRange.h similarity index 100% rename from src/ripple/ledger/detail/ReadViewFwdRange.h rename to src/xrpld/ledger/detail/ReadViewFwdRange.h diff --git a/src/ripple/ledger/detail/ReadViewFwdRange.ipp b/src/xrpld/ledger/detail/ReadViewFwdRange.ipp similarity index 100% rename from src/ripple/ledger/detail/ReadViewFwdRange.ipp rename to src/xrpld/ledger/detail/ReadViewFwdRange.ipp diff --git a/src/ripple/ledger/impl/View.cpp b/src/xrpld/ledger/detail/View.cpp similarity index 99% rename from src/ripple/ledger/impl/View.cpp rename to src/xrpld/ledger/detail/View.cpp index b71b4f39e5e..13ac07e5e74 100644 --- a/src/ripple/ledger/impl/View.cpp +++ b/src/xrpld/ledger/detail/View.cpp @@ -17,15 +17,15 @@ */ //============================================================================== -#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/net/AutoSocket.h b/src/xrpld/net/AutoSocket.h similarity index 99% rename from src/ripple/net/AutoSocket.h rename to src/xrpld/net/AutoSocket.h index e64c7a1e5cf..be35c082461 100644 --- a/src/ripple/net/AutoSocket.h +++ b/src/xrpld/net/AutoSocket.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_WEBSOCKET_AUTOSOCKET_AUTOSOCKET_H_INCLUDED #define RIPPLE_WEBSOCKET_AUTOSOCKET_AUTOSOCKET_H_INCLUDED -#include -#include +#include +#include #include #include #include diff --git a/src/ripple/net/DatabaseBody.h b/src/xrpld/net/DatabaseBody.h similarity index 98% rename from src/ripple/net/DatabaseBody.h rename to src/xrpld/net/DatabaseBody.h index c828e5bf123..15780ced313 100644 --- a/src/ripple/net/DatabaseBody.h +++ b/src/xrpld/net/DatabaseBody.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_NET_DATABASEBODY_H #define RIPPLE_NET_DATABASEBODY_H -#include +#include #include #include #include @@ -174,6 +174,6 @@ class DatabaseBody::reader } // namespace ripple -#include +#include #endif // RIPPLE_NET_DATABASEBODY_H diff --git a/src/ripple/net/DatabaseDownloader.h b/src/xrpld/net/DatabaseDownloader.h similarity index 96% rename from src/ripple/net/DatabaseDownloader.h rename to src/xrpld/net/DatabaseDownloader.h index 3e920909417..490e7c62e16 100644 --- a/src/ripple/net/DatabaseDownloader.h +++ b/src/xrpld/net/DatabaseDownloader.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_NET_DATABASEDOWNLOADER_H #define RIPPLE_NET_DATABASEDOWNLOADER_H -#include -#include +#include +#include namespace ripple { diff --git a/src/ripple/net/HTTPClient.h b/src/xrpld/net/HTTPClient.h similarity index 97% rename from src/ripple/net/HTTPClient.h rename to src/xrpld/net/HTTPClient.h index f133e3ee04a..3b7da776ea4 100644 --- a/src/ripple/net/HTTPClient.h +++ b/src/xrpld/net/HTTPClient.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_NET_HTTPCLIENT_H_INCLUDED #define RIPPLE_NET_HTTPCLIENT_H_INCLUDED -#include -#include +#include +#include #include #include diff --git a/src/ripple/net/HTTPClientSSLContext.h b/src/xrpld/net/HTTPClientSSLContext.h similarity index 97% rename from src/ripple/net/HTTPClientSSLContext.h rename to src/xrpld/net/HTTPClientSSLContext.h index b0f6942ae13..64ca2461d23 100644 --- a/src/ripple/net/HTTPClientSSLContext.h +++ b/src/xrpld/net/HTTPClientSSLContext.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_NET_HTTPCLIENTSSLCONTEXT_H_INCLUDED #define RIPPLE_NET_HTTPCLIENTSSLCONTEXT_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/net/HTTPDownloader.h b/src/xrpld/net/HTTPDownloader.h similarity index 97% rename from src/ripple/net/HTTPDownloader.h rename to src/xrpld/net/HTTPDownloader.h index 39b9a904aa3..f96fb8e572b 100644 --- a/src/ripple/net/HTTPDownloader.h +++ b/src/xrpld/net/HTTPDownloader.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_NET_HTTPDOWNLOADER_H_INCLUDED #define RIPPLE_NET_HTTPDOWNLOADER_H_INCLUDED -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/ripple/net/HTTPStream.h b/src/xrpld/net/HTTPStream.h similarity index 98% rename from src/ripple/net/HTTPStream.h rename to src/xrpld/net/HTTPStream.h index f5aaaa48a81..275d8ca9544 100644 --- a/src/ripple/net/HTTPStream.h +++ b/src/xrpld/net/HTTPStream.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_NET_HTTPSTREAM_H_INCLUDED #define RIPPLE_NET_HTTPSTREAM_H_INCLUDED -#include -#include +#include +#include #include #include diff --git a/src/ripple/net/InfoSub.h b/src/xrpld/net/InfoSub.h similarity index 97% rename from src/ripple/net/InfoSub.h rename to src/xrpld/net/InfoSub.h index 33441dde632..08fba26ff00 100644 --- a/src/ripple/net/InfoSub.h +++ b/src/xrpld/net/InfoSub.h @@ -20,12 +20,12 @@ #ifndef RIPPLE_NET_INFOSUB_H_INCLUDED #define RIPPLE_NET_INFOSUB_H_INCLUDED -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/net/RPCCall.h b/src/xrpld/net/RPCCall.h similarity index 96% rename from src/ripple/net/RPCCall.h rename to src/xrpld/net/RPCCall.h index 600fad28e58..9c78bb20d25 100644 --- a/src/ripple/net/RPCCall.h +++ b/src/xrpld/net/RPCCall.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_NET_RPCCALL_H_INCLUDED #define RIPPLE_NET_RPCCALL_H_INCLUDED -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/ripple/net/RPCSub.h b/src/xrpld/net/RPCSub.h similarity index 96% rename from src/ripple/net/RPCSub.h rename to src/xrpld/net/RPCSub.h index e2193b1ce1a..b2a751d4a19 100644 --- a/src/ripple/net/RPCSub.h +++ b/src/xrpld/net/RPCSub.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_NET_RPCSUB_H_INCLUDED #define RIPPLE_NET_RPCSUB_H_INCLUDED -#include -#include +#include +#include #include namespace ripple { diff --git a/src/ripple/net/RegisterSSLCerts.h b/src/xrpld/net/RegisterSSLCerts.h similarity index 98% rename from src/ripple/net/RegisterSSLCerts.h rename to src/xrpld/net/RegisterSSLCerts.h index 8b09f1031d7..88664139f19 100644 --- a/src/ripple/net/RegisterSSLCerts.h +++ b/src/xrpld/net/RegisterSSLCerts.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_NET_REGISTER_SSL_CERTS_H_INCLUDED #define RIPPLE_NET_REGISTER_SSL_CERTS_H_INCLUDED -#include +#include #include namespace ripple { diff --git a/src/ripple/net/ShardDownloader.md b/src/xrpld/net/ShardDownloader.md similarity index 100% rename from src/ripple/net/ShardDownloader.md rename to src/xrpld/net/ShardDownloader.md diff --git a/src/ripple/net/impl/DatabaseBody.ipp b/src/xrpld/net/detail/DatabaseBody.ipp similarity index 99% rename from src/ripple/net/impl/DatabaseBody.ipp rename to src/xrpld/net/detail/DatabaseBody.ipp index cdc7da2bc41..76223ca6a35 100644 --- a/src/ripple/net/impl/DatabaseBody.ipp +++ b/src/xrpld/net/detail/DatabaseBody.ipp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { diff --git a/src/ripple/net/impl/DatabaseDownloader.cpp b/src/xrpld/net/detail/DatabaseDownloader.cpp similarity index 98% rename from src/ripple/net/impl/DatabaseDownloader.cpp rename to src/xrpld/net/detail/DatabaseDownloader.cpp index eab0d74d7d9..b39e6904c46 100644 --- a/src/ripple/net/impl/DatabaseDownloader.cpp +++ b/src/xrpld/net/detail/DatabaseDownloader.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { diff --git a/src/ripple/net/impl/HTTPClient.cpp b/src/xrpld/net/detail/HTTPClient.cpp similarity index 98% rename from src/ripple/net/impl/HTTPClient.cpp rename to src/xrpld/net/detail/HTTPClient.cpp index 6ab01317516..61c2875a5fa 100644 --- a/src/ripple/net/impl/HTTPClient.cpp +++ b/src/xrpld/net/detail/HTTPClient.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/net/impl/HTTPDownloader.cpp b/src/xrpld/net/detail/HTTPDownloader.cpp similarity index 99% rename from src/ripple/net/impl/HTTPDownloader.cpp rename to src/xrpld/net/detail/HTTPDownloader.cpp index 44d27466224..760aa020e4a 100644 --- a/src/ripple/net/impl/HTTPDownloader.cpp +++ b/src/xrpld/net/detail/HTTPDownloader.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include namespace ripple { diff --git a/src/ripple/net/impl/HTTPStream.cpp b/src/xrpld/net/detail/HTTPStream.cpp similarity index 99% rename from src/ripple/net/impl/HTTPStream.cpp rename to src/xrpld/net/detail/HTTPStream.cpp index d235767739d..b94f8959ec9 100644 --- a/src/ripple/net/impl/HTTPStream.cpp +++ b/src/xrpld/net/detail/HTTPStream.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { diff --git a/src/ripple/net/impl/InfoSub.cpp b/src/xrpld/net/detail/InfoSub.cpp similarity index 99% rename from src/ripple/net/impl/InfoSub.cpp rename to src/xrpld/net/detail/InfoSub.cpp index 5b37cf0759b..3dc891cb5f9 100644 --- a/src/ripple/net/impl/InfoSub.cpp +++ b/src/xrpld/net/detail/InfoSub.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include namespace ripple { diff --git a/src/ripple/net/impl/RPCCall.cpp b/src/xrpld/net/detail/RPCCall.cpp similarity index 98% rename from src/ripple/net/impl/RPCCall.cpp rename to src/xrpld/net/detail/RPCCall.cpp index 8537f76b703..533878ab1b0 100644 --- a/src/ripple/net/impl/RPCCall.cpp +++ b/src/xrpld/net/detail/RPCCall.cpp @@ -17,27 +17,27 @@ */ //============================================================================== -#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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/net/impl/RPCSub.cpp b/src/xrpld/net/detail/RPCSub.cpp similarity index 96% rename from src/ripple/net/impl/RPCSub.cpp rename to src/xrpld/net/detail/RPCSub.cpp index 8b052e817cb..13bdf9119b4 100644 --- a/src/ripple/net/impl/RPCSub.cpp +++ b/src/xrpld/net/detail/RPCSub.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/net/impl/RegisterSSLCerts.cpp b/src/xrpld/net/detail/RegisterSSLCerts.cpp similarity index 98% rename from src/ripple/net/impl/RegisterSSLCerts.cpp rename to src/xrpld/net/detail/RegisterSSLCerts.cpp index b4e3f51a93d..ede42b03af2 100644 --- a/src/ripple/net/impl/RegisterSSLCerts.cpp +++ b/src/xrpld/net/detail/RegisterSSLCerts.cpp @@ -16,7 +16,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ //============================================================================== -#include +#include #include #if BOOST_OS_WINDOWS diff --git a/src/ripple/net/images/interrupt_sequence.png b/src/xrpld/net/images/interrupt_sequence.png similarity index 100% rename from src/ripple/net/images/interrupt_sequence.png rename to src/xrpld/net/images/interrupt_sequence.png diff --git a/src/ripple/net/images/states.png b/src/xrpld/net/images/states.png similarity index 100% rename from src/ripple/net/images/states.png rename to src/xrpld/net/images/states.png diff --git a/src/ripple/net/uml/interrupt_sequence.pu b/src/xrpld/net/uml/interrupt_sequence.pu similarity index 100% rename from src/ripple/net/uml/interrupt_sequence.pu rename to src/xrpld/net/uml/interrupt_sequence.pu diff --git a/src/ripple/net/uml/states.pu b/src/xrpld/net/uml/states.pu similarity index 100% rename from src/ripple/net/uml/states.pu rename to src/xrpld/net/uml/states.pu diff --git a/src/ripple/nodestore/Backend.h b/src/xrpld/nodestore/Backend.h similarity index 99% rename from src/ripple/nodestore/Backend.h rename to src/xrpld/nodestore/Backend.h index d773be74198..85d38ec0a7b 100644 --- a/src/ripple/nodestore/Backend.h +++ b/src/xrpld/nodestore/Backend.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_NODESTORE_BACKEND_H_INCLUDED #define RIPPLE_NODESTORE_BACKEND_H_INCLUDED -#include +#include #include #include diff --git a/src/ripple/nodestore/Database.h b/src/xrpld/nodestore/Database.h similarity index 98% rename from src/ripple/nodestore/Database.h rename to src/xrpld/nodestore/Database.h index 0f9e95b23e1..ad843c55d52 100644 --- a/src/ripple/nodestore/Database.h +++ b/src/xrpld/nodestore/Database.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_NODESTORE_DATABASE_H_INCLUDED #define RIPPLE_NODESTORE_DATABASE_H_INCLUDED -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/nodestore/DatabaseRotating.h b/src/xrpld/nodestore/DatabaseRotating.h similarity index 98% rename from src/ripple/nodestore/DatabaseRotating.h rename to src/xrpld/nodestore/DatabaseRotating.h index c8d7104fe59..10f575c4662 100644 --- a/src/ripple/nodestore/DatabaseRotating.h +++ b/src/xrpld/nodestore/DatabaseRotating.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_NODESTORE_DATABASEROTATING_H_INCLUDED #define RIPPLE_NODESTORE_DATABASEROTATING_H_INCLUDED -#include +#include namespace ripple { namespace NodeStore { diff --git a/src/ripple/nodestore/DatabaseShard.h b/src/xrpld/nodestore/DatabaseShard.h similarity index 98% rename from src/ripple/nodestore/DatabaseShard.h rename to src/xrpld/nodestore/DatabaseShard.h index 55f864f41b7..408ac3501d3 100644 --- a/src/ripple/nodestore/DatabaseShard.h +++ b/src/xrpld/nodestore/DatabaseShard.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_NODESTORE_DATABASESHARD_H_INCLUDED #define RIPPLE_NODESTORE_DATABASESHARD_H_INCLUDED -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/nodestore/DeterministicShard.md b/src/xrpld/nodestore/DeterministicShard.md similarity index 100% rename from src/ripple/nodestore/DeterministicShard.md rename to src/xrpld/nodestore/DeterministicShard.md diff --git a/src/ripple/nodestore/DummyScheduler.h b/src/xrpld/nodestore/DummyScheduler.h similarity index 97% rename from src/ripple/nodestore/DummyScheduler.h rename to src/xrpld/nodestore/DummyScheduler.h index cfe7c3fd5dd..4e6fab7827d 100644 --- a/src/ripple/nodestore/DummyScheduler.h +++ b/src/xrpld/nodestore/DummyScheduler.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_NODESTORE_DUMMYSCHEDULER_H_INCLUDED #define RIPPLE_NODESTORE_DUMMYSCHEDULER_H_INCLUDED -#include +#include namespace ripple { namespace NodeStore { diff --git a/src/ripple/nodestore/Factory.h b/src/xrpld/nodestore/Factory.h similarity index 95% rename from src/ripple/nodestore/Factory.h rename to src/xrpld/nodestore/Factory.h index 4313b4ef12f..8853a6ce9a5 100644 --- a/src/ripple/nodestore/Factory.h +++ b/src/xrpld/nodestore/Factory.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_NODESTORE_FACTORY_H_INCLUDED #define RIPPLE_NODESTORE_FACTORY_H_INCLUDED -#include -#include -#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/nodestore/Manager.h b/src/xrpld/nodestore/Manager.h similarity index 96% rename from src/ripple/nodestore/Manager.h rename to src/xrpld/nodestore/Manager.h index 26fdc8789eb..5a4d46068be 100644 --- a/src/ripple/nodestore/Manager.h +++ b/src/xrpld/nodestore/Manager.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_NODESTORE_MANAGER_H_INCLUDED #define RIPPLE_NODESTORE_MANAGER_H_INCLUDED -#include -#include -#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/nodestore/NodeObject.h b/src/xrpld/nodestore/NodeObject.h similarity index 96% rename from src/ripple/nodestore/NodeObject.h rename to src/xrpld/nodestore/NodeObject.h index a94e689b34b..f5a1fdb075d 100644 --- a/src/ripple/nodestore/NodeObject.h +++ b/src/xrpld/nodestore/NodeObject.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_NODESTORE_NODEOBJECT_H_INCLUDED #define RIPPLE_NODESTORE_NODEOBJECT_H_INCLUDED -#include -#include -#include +#include +#include +#include // VFALCO NOTE Intentionally not in the NodeStore namespace diff --git a/src/ripple/nodestore/README.md b/src/xrpld/nodestore/README.md similarity index 100% rename from src/ripple/nodestore/README.md rename to src/xrpld/nodestore/README.md diff --git a/src/ripple/nodestore/Scheduler.h b/src/xrpld/nodestore/Scheduler.h similarity index 98% rename from src/ripple/nodestore/Scheduler.h rename to src/xrpld/nodestore/Scheduler.h index c97f75ae59b..236c2260eed 100644 --- a/src/ripple/nodestore/Scheduler.h +++ b/src/xrpld/nodestore/Scheduler.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_NODESTORE_SCHEDULER_H_INCLUDED #define RIPPLE_NODESTORE_SCHEDULER_H_INCLUDED -#include +#include #include namespace ripple { diff --git a/src/ripple/nodestore/ShardInfo.h b/src/xrpld/nodestore/ShardInfo.h similarity index 96% rename from src/ripple/nodestore/ShardInfo.h rename to src/xrpld/nodestore/ShardInfo.h index 90400276f85..b894ddc34a3 100644 --- a/src/ripple/nodestore/ShardInfo.h +++ b/src/xrpld/nodestore/ShardInfo.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_NODESTORE_SHARDINFO_H_INCLUDED #define RIPPLE_NODESTORE_SHARDINFO_H_INCLUDED -#include -#include -#include +#include +#include +#include namespace ripple { namespace NodeStore { diff --git a/src/ripple/nodestore/ShardPool.md b/src/xrpld/nodestore/ShardPool.md similarity index 100% rename from src/ripple/nodestore/ShardPool.md rename to src/xrpld/nodestore/ShardPool.md diff --git a/src/ripple/nodestore/ShardSizeTuning.md b/src/xrpld/nodestore/ShardSizeTuning.md similarity index 100% rename from src/ripple/nodestore/ShardSizeTuning.md rename to src/xrpld/nodestore/ShardSizeTuning.md diff --git a/src/ripple/nodestore/Task.h b/src/xrpld/nodestore/Task.h similarity index 100% rename from src/ripple/nodestore/Task.h rename to src/xrpld/nodestore/Task.h diff --git a/src/ripple/nodestore/Types.h b/src/xrpld/nodestore/Types.h similarity index 96% rename from src/ripple/nodestore/Types.h rename to src/xrpld/nodestore/Types.h index 6d8583ed9d1..39104f946e3 100644 --- a/src/ripple/nodestore/Types.h +++ b/src/xrpld/nodestore/Types.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_NODESTORE_TYPES_H_INCLUDED #define RIPPLE_NODESTORE_TYPES_H_INCLUDED -#include -#include +#include +#include #include namespace ripple { diff --git a/src/ripple/nodestore/backend/CassandraFactory.cpp b/src/xrpld/nodestore/backend/CassandraFactory.cpp similarity index 98% rename from src/ripple/nodestore/backend/CassandraFactory.cpp rename to src/xrpld/nodestore/backend/CassandraFactory.cpp index d13cd71827b..c53e7709587 100644 --- a/src/ripple/nodestore/backend/CassandraFactory.cpp +++ b/src/xrpld/nodestore/backend/CassandraFactory.cpp @@ -22,17 +22,17 @@ #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/nodestore/backend/MemoryFactory.cpp b/src/xrpld/nodestore/backend/MemoryFactory.cpp similarity index 98% rename from src/ripple/nodestore/backend/MemoryFactory.cpp rename to src/xrpld/nodestore/backend/MemoryFactory.cpp index f82c14429ee..767db9d1695 100644 --- a/src/ripple/nodestore/backend/MemoryFactory.cpp +++ b/src/xrpld/nodestore/backend/MemoryFactory.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/ripple/nodestore/backend/NuDBFactory.cpp b/src/xrpld/nodestore/backend/NuDBFactory.cpp similarity index 97% rename from src/ripple/nodestore/backend/NuDBFactory.cpp rename to src/xrpld/nodestore/backend/NuDBFactory.cpp index 30b848e82af..742bf05031b 100644 --- a/src/ripple/nodestore/backend/NuDBFactory.cpp +++ b/src/xrpld/nodestore/backend/NuDBFactory.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/nodestore/backend/NullFactory.cpp b/src/xrpld/nodestore/backend/NullFactory.cpp similarity index 96% rename from src/ripple/nodestore/backend/NullFactory.cpp rename to src/xrpld/nodestore/backend/NullFactory.cpp index 8509787b318..47254cd50fc 100644 --- a/src/ripple/nodestore/backend/NullFactory.cpp +++ b/src/xrpld/nodestore/backend/NullFactory.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include -#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/nodestore/backend/RocksDBFactory.cpp b/src/xrpld/nodestore/backend/RocksDBFactory.cpp similarity index 96% rename from src/ripple/nodestore/backend/RocksDBFactory.cpp rename to src/xrpld/nodestore/backend/RocksDBFactory.cpp index b34560dba89..9ba9fffe1db 100644 --- a/src/ripple/nodestore/backend/RocksDBFactory.cpp +++ b/src/xrpld/nodestore/backend/RocksDBFactory.cpp @@ -17,20 +17,20 @@ */ //============================================================================== -#include +#include #if RIPPLE_ROCKSDB_AVAILABLE -#include -#include -#include -#include -#include // VFALCO Bad dependency -#include -#include -#include -#include -#include +#include // VFALCO Bad dependency +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/nodestore/impl/BatchWriter.cpp b/src/xrpld/nodestore/detail/BatchWriter.cpp similarity index 98% rename from src/ripple/nodestore/impl/BatchWriter.cpp rename to src/xrpld/nodestore/detail/BatchWriter.cpp index 692032016cc..1c5067d5bed 100644 --- a/src/ripple/nodestore/impl/BatchWriter.cpp +++ b/src/xrpld/nodestore/detail/BatchWriter.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { namespace NodeStore { diff --git a/src/ripple/nodestore/impl/BatchWriter.h b/src/xrpld/nodestore/detail/BatchWriter.h similarity index 96% rename from src/ripple/nodestore/impl/BatchWriter.h rename to src/xrpld/nodestore/detail/BatchWriter.h index 9ce4f120329..c48002f4f80 100644 --- a/src/ripple/nodestore/impl/BatchWriter.h +++ b/src/xrpld/nodestore/detail/BatchWriter.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_NODESTORE_BATCHWRITER_H_INCLUDED #define RIPPLE_NODESTORE_BATCHWRITER_H_INCLUDED -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/ripple/nodestore/impl/Database.cpp b/src/xrpld/nodestore/detail/Database.cpp similarity index 97% rename from src/ripple/nodestore/impl/Database.cpp rename to src/xrpld/nodestore/detail/Database.cpp index 70416c873d5..93468eb6084 100644 --- a/src/ripple/nodestore/impl/Database.cpp +++ b/src/xrpld/nodestore/detail/Database.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/nodestore/impl/DatabaseNodeImp.cpp b/src/xrpld/nodestore/detail/DatabaseNodeImp.cpp similarity index 98% rename from src/ripple/nodestore/impl/DatabaseNodeImp.cpp rename to src/xrpld/nodestore/detail/DatabaseNodeImp.cpp index 9ef878bf3be..d61c68e759a 100644 --- a/src/ripple/nodestore/impl/DatabaseNodeImp.cpp +++ b/src/xrpld/nodestore/detail/DatabaseNodeImp.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include -#include +#include +#include +#include namespace ripple { namespace NodeStore { diff --git a/src/ripple/nodestore/impl/DatabaseNodeImp.h b/src/xrpld/nodestore/detail/DatabaseNodeImp.h similarity index 97% rename from src/ripple/nodestore/impl/DatabaseNodeImp.h rename to src/xrpld/nodestore/detail/DatabaseNodeImp.h index 452bd8d27fe..f5f5f64bd1d 100644 --- a/src/ripple/nodestore/impl/DatabaseNodeImp.h +++ b/src/xrpld/nodestore/detail/DatabaseNodeImp.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_NODESTORE_DATABASENODEIMP_H_INCLUDED #define RIPPLE_NODESTORE_DATABASENODEIMP_H_INCLUDED -#include -#include -#include +#include +#include +#include namespace ripple { namespace NodeStore { diff --git a/src/ripple/nodestore/impl/DatabaseRotatingImp.cpp b/src/xrpld/nodestore/detail/DatabaseRotatingImp.cpp similarity index 97% rename from src/ripple/nodestore/impl/DatabaseRotatingImp.cpp rename to src/xrpld/nodestore/detail/DatabaseRotatingImp.cpp index 267b4ee581f..b1283d7de71 100644 --- a/src/ripple/nodestore/impl/DatabaseRotatingImp.cpp +++ b/src/xrpld/nodestore/detail/DatabaseRotatingImp.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include -#include +#include +#include +#include namespace ripple { namespace NodeStore { diff --git a/src/ripple/nodestore/impl/DatabaseRotatingImp.h b/src/xrpld/nodestore/detail/DatabaseRotatingImp.h similarity index 98% rename from src/ripple/nodestore/impl/DatabaseRotatingImp.h rename to src/xrpld/nodestore/detail/DatabaseRotatingImp.h index 3a9fd302b4f..ec46fc687be 100644 --- a/src/ripple/nodestore/impl/DatabaseRotatingImp.h +++ b/src/xrpld/nodestore/detail/DatabaseRotatingImp.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_NODESTORE_DATABASEROTATINGIMP_H_INCLUDED #define RIPPLE_NODESTORE_DATABASEROTATINGIMP_H_INCLUDED -#include +#include #include diff --git a/src/ripple/nodestore/impl/DatabaseShardImp.cpp b/src/xrpld/nodestore/detail/DatabaseShardImp.cpp similarity index 99% rename from src/ripple/nodestore/impl/DatabaseShardImp.cpp rename to src/xrpld/nodestore/detail/DatabaseShardImp.cpp index 33000b5d24c..c7e45641d7f 100644 --- a/src/ripple/nodestore/impl/DatabaseShardImp.cpp +++ b/src/xrpld/nodestore/detail/DatabaseShardImp.cpp @@ -17,22 +17,22 @@ */ //============================================================================== -#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 +#include +#include #include diff --git a/src/ripple/nodestore/impl/DatabaseShardImp.h b/src/xrpld/nodestore/detail/DatabaseShardImp.h similarity index 98% rename from src/ripple/nodestore/impl/DatabaseShardImp.h rename to src/xrpld/nodestore/detail/DatabaseShardImp.h index 5cf1f3701c4..df740cf407c 100644 --- a/src/ripple/nodestore/impl/DatabaseShardImp.h +++ b/src/xrpld/nodestore/detail/DatabaseShardImp.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_NODESTORE_DATABASESHARDIMP_H_INCLUDED #define RIPPLE_NODESTORE_DATABASESHARDIMP_H_INCLUDED -#include -#include -#include +#include +#include +#include #include diff --git a/src/ripple/nodestore/impl/DecodedBlob.cpp b/src/xrpld/nodestore/detail/DecodedBlob.cpp similarity index 96% rename from src/ripple/nodestore/impl/DecodedBlob.cpp rename to src/xrpld/nodestore/detail/DecodedBlob.cpp index 13175d36295..b71f2c543b1 100644 --- a/src/ripple/nodestore/impl/DecodedBlob.cpp +++ b/src/xrpld/nodestore/detail/DecodedBlob.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include #include #include diff --git a/src/ripple/nodestore/impl/DecodedBlob.h b/src/xrpld/nodestore/detail/DecodedBlob.h similarity index 98% rename from src/ripple/nodestore/impl/DecodedBlob.h rename to src/xrpld/nodestore/detail/DecodedBlob.h index 623e1f18dce..d52f20c4eef 100644 --- a/src/ripple/nodestore/impl/DecodedBlob.h +++ b/src/xrpld/nodestore/detail/DecodedBlob.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_NODESTORE_DECODEDBLOB_H_INCLUDED #define RIPPLE_NODESTORE_DECODEDBLOB_H_INCLUDED -#include +#include namespace ripple { namespace NodeStore { diff --git a/src/ripple/nodestore/impl/DeterministicShard.cpp b/src/xrpld/nodestore/detail/DeterministicShard.cpp similarity index 95% rename from src/ripple/nodestore/impl/DeterministicShard.cpp rename to src/xrpld/nodestore/detail/DeterministicShard.cpp index 5dd6bfb4cb3..c575a685ded 100644 --- a/src/ripple/nodestore/impl/DeterministicShard.cpp +++ b/src/xrpld/nodestore/detail/DeterministicShard.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/nodestore/impl/DeterministicShard.h b/src/xrpld/nodestore/detail/DeterministicShard.h similarity index 98% rename from src/ripple/nodestore/impl/DeterministicShard.h rename to src/xrpld/nodestore/detail/DeterministicShard.h index c32a45127ef..3eb5eaa8144 100644 --- a/src/ripple/nodestore/impl/DeterministicShard.h +++ b/src/xrpld/nodestore/detail/DeterministicShard.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_NODESTORE_DETERMINISTICSHARD_H_INCLUDED #define RIPPLE_NODESTORE_DETERMINISTICSHARD_H_INCLUDED -#include -#include +#include +#include #include #include diff --git a/src/ripple/nodestore/impl/DummyScheduler.cpp b/src/xrpld/nodestore/detail/DummyScheduler.cpp similarity index 96% rename from src/ripple/nodestore/impl/DummyScheduler.cpp rename to src/xrpld/nodestore/detail/DummyScheduler.cpp index ee44e02fb81..76cd89610cc 100644 --- a/src/ripple/nodestore/impl/DummyScheduler.cpp +++ b/src/xrpld/nodestore/detail/DummyScheduler.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { namespace NodeStore { diff --git a/src/ripple/nodestore/impl/EncodedBlob.h b/src/xrpld/nodestore/detail/EncodedBlob.h similarity index 98% rename from src/ripple/nodestore/impl/EncodedBlob.h rename to src/xrpld/nodestore/detail/EncodedBlob.h index 77f8fbf3c6c..2b506a0df3f 100644 --- a/src/ripple/nodestore/impl/EncodedBlob.h +++ b/src/xrpld/nodestore/detail/EncodedBlob.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_NODESTORE_ENCODEDBLOB_H_INCLUDED #define RIPPLE_NODESTORE_ENCODEDBLOB_H_INCLUDED -#include -#include +#include +#include #include #include #include diff --git a/src/ripple/nodestore/impl/ManagerImp.cpp b/src/xrpld/nodestore/detail/ManagerImp.cpp similarity index 97% rename from src/ripple/nodestore/impl/ManagerImp.cpp rename to src/xrpld/nodestore/detail/ManagerImp.cpp index d5ea29059df..019dd1f8122 100644 --- a/src/ripple/nodestore/impl/ManagerImp.cpp +++ b/src/xrpld/nodestore/detail/ManagerImp.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include #include diff --git a/src/ripple/nodestore/impl/ManagerImp.h b/src/xrpld/nodestore/detail/ManagerImp.h similarity index 98% rename from src/ripple/nodestore/impl/ManagerImp.h rename to src/xrpld/nodestore/detail/ManagerImp.h index 42f8584ef07..92411cc7601 100644 --- a/src/ripple/nodestore/impl/ManagerImp.h +++ b/src/xrpld/nodestore/detail/ManagerImp.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_NODESTORE_MANAGERIMP_H_INCLUDED #define RIPPLE_NODESTORE_MANAGERIMP_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/nodestore/impl/NodeObject.cpp b/src/xrpld/nodestore/detail/NodeObject.cpp similarity index 97% rename from src/ripple/nodestore/impl/NodeObject.cpp rename to src/xrpld/nodestore/detail/NodeObject.cpp index fb476107c8e..f633014b09f 100644 --- a/src/ripple/nodestore/impl/NodeObject.cpp +++ b/src/xrpld/nodestore/detail/NodeObject.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include namespace ripple { diff --git a/src/ripple/nodestore/impl/Shard.cpp b/src/xrpld/nodestore/detail/Shard.cpp similarity index 98% rename from src/ripple/nodestore/impl/Shard.cpp rename to src/xrpld/nodestore/detail/Shard.cpp index 10adf298361..8c2e9997fbf 100644 --- a/src/ripple/nodestore/impl/Shard.cpp +++ b/src/xrpld/nodestore/detail/Shard.cpp @@ -17,16 +17,16 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { namespace NodeStore { diff --git a/src/ripple/nodestore/impl/Shard.h b/src/xrpld/nodestore/detail/Shard.h similarity index 96% rename from src/ripple/nodestore/impl/Shard.h rename to src/xrpld/nodestore/detail/Shard.h index 210bdd54a60..be11e538c77 100644 --- a/src/ripple/nodestore/impl/Shard.h +++ b/src/xrpld/nodestore/detail/Shard.h @@ -20,17 +20,17 @@ #ifndef RIPPLE_NODESTORE_SHARD_H_INCLUDED #define RIPPLE_NODESTORE_SHARD_H_INCLUDED -#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/nodestore/impl/ShardInfo.cpp b/src/xrpld/nodestore/detail/ShardInfo.cpp similarity index 95% rename from src/ripple/nodestore/impl/ShardInfo.cpp rename to src/xrpld/nodestore/detail/ShardInfo.cpp index fca828ab447..43a9d484900 100644 --- a/src/ripple/nodestore/impl/ShardInfo.cpp +++ b/src/xrpld/nodestore/detail/ShardInfo.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace ripple { namespace NodeStore { diff --git a/src/ripple/nodestore/impl/TaskQueue.cpp b/src/xrpld/nodestore/detail/TaskQueue.cpp similarity index 97% rename from src/ripple/nodestore/impl/TaskQueue.cpp rename to src/xrpld/nodestore/detail/TaskQueue.cpp index 90b6ba3451a..6062138c60f 100644 --- a/src/ripple/nodestore/impl/TaskQueue.cpp +++ b/src/xrpld/nodestore/detail/TaskQueue.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include diff --git a/src/ripple/nodestore/impl/TaskQueue.h b/src/xrpld/nodestore/detail/TaskQueue.h similarity index 97% rename from src/ripple/nodestore/impl/TaskQueue.h rename to src/xrpld/nodestore/detail/TaskQueue.h index 942bd9c32d8..8a743ff6016 100644 --- a/src/ripple/nodestore/impl/TaskQueue.h +++ b/src/xrpld/nodestore/detail/TaskQueue.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_NODESTORE_TASKQUEUE_H_INCLUDED #define RIPPLE_NODESTORE_TASKQUEUE_H_INCLUDED -#include +#include #include #include diff --git a/src/ripple/nodestore/impl/codec.h b/src/xrpld/nodestore/detail/codec.h similarity index 98% rename from src/ripple/nodestore/impl/codec.h rename to src/xrpld/nodestore/detail/codec.h index a6749e0d162..f19672b8123 100644 --- a/src/ripple/nodestore/impl/codec.h +++ b/src/xrpld/nodestore/detail/codec.h @@ -23,11 +23,11 @@ // Disable lz4 deprecation warning due to incompatibility with clang attributes #define LZ4_DISABLE_DEPRECATE_WARNINGS -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/nodestore/impl/varint.h b/src/xrpld/nodestore/detail/varint.h similarity index 100% rename from src/ripple/nodestore/impl/varint.h rename to src/xrpld/nodestore/detail/varint.h diff --git a/src/ripple/overlay/Cluster.h b/src/xrpld/overlay/Cluster.h similarity index 92% rename from src/ripple/overlay/Cluster.h rename to src/xrpld/overlay/Cluster.h index 46d5a6ddb3c..42bda586c0d 100644 --- a/src/ripple/overlay/Cluster.h +++ b/src/xrpld/overlay/Cluster.h @@ -20,13 +20,13 @@ #ifndef RIPPLE_OVERLAY_CLUSTER_H_INCLUDED #define RIPPLE_OVERLAY_CLUSTER_H_INCLUDED -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/overlay/ClusterNode.h b/src/xrpld/overlay/ClusterNode.h similarity index 96% rename from src/ripple/overlay/ClusterNode.h rename to src/xrpld/overlay/ClusterNode.h index 7996f8ffd26..1ca78208dd5 100644 --- a/src/ripple/overlay/ClusterNode.h +++ b/src/xrpld/overlay/ClusterNode.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_APP_PEERS_CLUSTERNODESTATUS_H_INCLUDED #define RIPPLE_APP_PEERS_CLUSTERNODESTATUS_H_INCLUDED -#include -#include +#include +#include #include #include diff --git a/src/ripple/overlay/Compression.h b/src/xrpld/overlay/Compression.h similarity index 97% rename from src/ripple/overlay/Compression.h rename to src/xrpld/overlay/Compression.h index 6bb94792b43..1cf13fcb185 100644 --- a/src/ripple/overlay/Compression.h +++ b/src/xrpld/overlay/Compression.h @@ -20,8 +20,8 @@ #ifndef RIPPLED_COMPRESSION_H_INCLUDED #define RIPPLED_COMPRESSION_H_INCLUDED -#include -#include +#include +#include #include namespace ripple { diff --git a/src/ripple/overlay/Message.h b/src/xrpld/overlay/Message.h similarity index 96% rename from src/ripple/overlay/Message.h rename to src/xrpld/overlay/Message.h index 0d6479366e8..247e53ec9fd 100644 --- a/src/ripple/overlay/Message.h +++ b/src/xrpld/overlay/Message.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_OVERLAY_MESSAGE_H_INCLUDED #define RIPPLE_OVERLAY_MESSAGE_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/overlay/Overlay.h b/src/xrpld/overlay/Overlay.h similarity index 97% rename from src/ripple/overlay/Overlay.h rename to src/xrpld/overlay/Overlay.h index 844eafb86cc..1a3362d386f 100644 --- a/src/ripple/overlay/Overlay.h +++ b/src/xrpld/overlay/Overlay.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_OVERLAY_OVERLAY_H_INCLUDED #define RIPPLE_OVERLAY_OVERLAY_H_INCLUDED -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/overlay/Peer.h b/src/xrpld/overlay/Peer.h similarity index 95% rename from src/ripple/overlay/Peer.h rename to src/xrpld/overlay/Peer.h index ba415974151..81c04f7206c 100644 --- a/src/ripple/overlay/Peer.h +++ b/src/xrpld/overlay/Peer.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_OVERLAY_PEER_H_INCLUDED #define RIPPLE_OVERLAY_PEER_H_INCLUDED -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/overlay/PeerReservationTable.h b/src/xrpld/overlay/PeerReservationTable.h similarity index 94% rename from src/ripple/overlay/PeerReservationTable.h rename to src/xrpld/overlay/PeerReservationTable.h index e8fd4a29437..fb3add61f70 100644 --- a/src/ripple/overlay/PeerReservationTable.h +++ b/src/xrpld/overlay/PeerReservationTable.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_OVERLAY_PEER_RESERVATION_TABLE_H_INCLUDED #define RIPPLE_OVERLAY_PEER_RESERVATION_TABLE_H_INCLUDED -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/overlay/PeerSet.h b/src/xrpld/overlay/PeerSet.h similarity index 93% rename from src/ripple/overlay/PeerSet.h rename to src/xrpld/overlay/PeerSet.h index db21b0c7498..aca6242f9de 100644 --- a/src/ripple/overlay/PeerSet.h +++ b/src/xrpld/overlay/PeerSet.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_APP_PEERS_PEERSET_H_INCLUDED #define RIPPLE_APP_PEERS_PEERSET_H_INCLUDED -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/overlay/README.md b/src/xrpld/overlay/README.md similarity index 100% rename from src/ripple/overlay/README.md rename to src/xrpld/overlay/README.md diff --git a/src/ripple/overlay/ReduceRelayCommon.h b/src/xrpld/overlay/ReduceRelayCommon.h similarity index 100% rename from src/ripple/overlay/ReduceRelayCommon.h rename to src/xrpld/overlay/ReduceRelayCommon.h diff --git a/src/ripple/overlay/Slot.h b/src/xrpld/overlay/Slot.h similarity index 98% rename from src/ripple/overlay/Slot.h rename to src/xrpld/overlay/Slot.h index e58619e66f8..2a8b2146a02 100644 --- a/src/ripple/overlay/Slot.h +++ b/src/xrpld/overlay/Slot.h @@ -20,15 +20,15 @@ #ifndef RIPPLE_OVERLAY_SLOT_H_INCLUDED #define RIPPLE_OVERLAY_SLOT_H_INCLUDED -#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/overlay/Squelch.h b/src/xrpld/overlay/Squelch.h similarity index 95% rename from src/ripple/overlay/Squelch.h rename to src/xrpld/overlay/Squelch.h index 175c80a0af2..2919922da92 100644 --- a/src/ripple/overlay/Squelch.h +++ b/src/xrpld/overlay/Squelch.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_OVERLAY_SQUELCH_H_INCLUDED #define RIPPLE_OVERLAY_SQUELCH_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/overlay/impl/Cluster.cpp b/src/xrpld/overlay/detail/Cluster.cpp similarity index 92% rename from src/ripple/overlay/impl/Cluster.cpp rename to src/xrpld/overlay/detail/Cluster.cpp index a7b1e44d4b7..9d25248e8df 100644 --- a/src/ripple/overlay/impl/Cluster.cpp +++ b/src/xrpld/overlay/detail/Cluster.cpp @@ -17,14 +17,14 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/overlay/impl/ConnectAttempt.cpp b/src/xrpld/overlay/detail/ConnectAttempt.cpp similarity index 98% rename from src/ripple/overlay/impl/ConnectAttempt.cpp rename to src/xrpld/overlay/detail/ConnectAttempt.cpp index f1d1c6ffe00..6a3ebdd5b98 100644 --- a/src/ripple/overlay/impl/ConnectAttempt.cpp +++ b/src/xrpld/overlay/detail/ConnectAttempt.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/overlay/impl/ConnectAttempt.h b/src/xrpld/overlay/detail/ConnectAttempt.h similarity index 97% rename from src/ripple/overlay/impl/ConnectAttempt.h rename to src/xrpld/overlay/detail/ConnectAttempt.h index 65eac6809f4..474ac3c069f 100644 --- a/src/ripple/overlay/impl/ConnectAttempt.h +++ b/src/xrpld/overlay/detail/ConnectAttempt.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_OVERLAY_CONNECTATTEMPT_H_INCLUDED #define RIPPLE_OVERLAY_CONNECTATTEMPT_H_INCLUDED -#include -#include +#include +#include namespace ripple { diff --git a/src/ripple/overlay/impl/Handshake.cpp b/src/xrpld/overlay/detail/Handshake.cpp similarity index 98% rename from src/ripple/overlay/impl/Handshake.cpp rename to src/xrpld/overlay/detail/Handshake.cpp index b655859dcbc..8f1aae8c025 100644 --- a/src/ripple/overlay/impl/Handshake.cpp +++ b/src/xrpld/overlay/detail/Handshake.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/overlay/impl/Handshake.h b/src/xrpld/overlay/detail/Handshake.h similarity index 98% rename from src/ripple/overlay/impl/Handshake.h rename to src/xrpld/overlay/detail/Handshake.h index 2accf5d221e..76c11b287ca 100644 --- a/src/ripple/overlay/impl/Handshake.h +++ b/src/xrpld/overlay/detail/Handshake.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_OVERLAY_HANDSHAKE_H_INCLUDED #define RIPPLE_OVERLAY_HANDSHAKE_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/overlay/impl/Message.cpp b/src/xrpld/overlay/detail/Message.cpp similarity index 98% rename from src/ripple/overlay/impl/Message.cpp rename to src/xrpld/overlay/detail/Message.cpp index b4cb1f192aa..e19d718c73d 100644 --- a/src/ripple/overlay/impl/Message.cpp +++ b/src/xrpld/overlay/detail/Message.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include #include namespace ripple { diff --git a/src/ripple/overlay/impl/OverlayImpl.cpp b/src/xrpld/overlay/detail/OverlayImpl.cpp similarity index 98% rename from src/ripple/overlay/impl/OverlayImpl.cpp rename to src/xrpld/overlay/detail/OverlayImpl.cpp index 7e60b2c120c..f033ad4e9f9 100644 --- a/src/ripple/overlay/impl/OverlayImpl.cpp +++ b/src/xrpld/overlay/detail/OverlayImpl.cpp @@ -17,26 +17,26 @@ */ //============================================================================== -#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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/ripple/overlay/impl/OverlayImpl.h b/src/xrpld/overlay/detail/OverlayImpl.h similarity index 96% rename from src/ripple/overlay/impl/OverlayImpl.h rename to src/xrpld/overlay/detail/OverlayImpl.h index 2ba7999cbe0..1934a7c94c8 100644 --- a/src/ripple/overlay/impl/OverlayImpl.h +++ b/src/xrpld/overlay/detail/OverlayImpl.h @@ -20,21 +20,21 @@ #ifndef RIPPLE_OVERLAY_OVERLAYIMPL_H_INCLUDED #define RIPPLE_OVERLAY_OVERLAYIMPL_H_INCLUDED -#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 #include #include #include diff --git a/src/ripple/overlay/impl/PeerImp.cpp b/src/xrpld/overlay/detail/PeerImp.cpp similarity index 99% rename from src/ripple/overlay/impl/PeerImp.cpp rename to src/xrpld/overlay/detail/PeerImp.cpp index 4cd3a89452d..96f793b8d80 100644 --- a/src/ripple/overlay/impl/PeerImp.cpp +++ b/src/xrpld/overlay/detail/PeerImp.cpp @@ -17,28 +17,28 @@ */ //============================================================================== -#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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/overlay/impl/PeerImp.h b/src/xrpld/overlay/detail/PeerImp.h similarity index 96% rename from src/ripple/overlay/impl/PeerImp.h rename to src/xrpld/overlay/detail/PeerImp.h index 710ab4d74d6..1c25d8089b8 100644 --- a/src/ripple/overlay/impl/PeerImp.h +++ b/src/xrpld/overlay/detail/PeerImp.h @@ -20,22 +20,22 @@ #ifndef RIPPLE_OVERLAY_PEERIMP_H_INCLUDED #define RIPPLE_OVERLAY_PEERIMP_H_INCLUDED -#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 +#include +#include #include #include diff --git a/src/ripple/overlay/impl/PeerReservationTable.cpp b/src/xrpld/overlay/detail/PeerReservationTable.cpp similarity index 93% rename from src/ripple/overlay/impl/PeerReservationTable.cpp rename to src/xrpld/overlay/detail/PeerReservationTable.cpp index 6f39d12e99c..6fd0112f46f 100644 --- a/src/ripple/overlay/impl/PeerReservationTable.cpp +++ b/src/xrpld/overlay/detail/PeerReservationTable.cpp @@ -17,14 +17,14 @@ */ //============================================================================== -#include - -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include #include diff --git a/src/ripple/overlay/impl/PeerSet.cpp b/src/xrpld/overlay/detail/PeerSet.cpp similarity index 97% rename from src/ripple/overlay/impl/PeerSet.cpp rename to src/xrpld/overlay/detail/PeerSet.cpp index de5c3cd9f93..909b20c3079 100644 --- a/src/ripple/overlay/impl/PeerSet.cpp +++ b/src/xrpld/overlay/detail/PeerSet.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include -#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/overlay/impl/ProtocolMessage.h b/src/xrpld/overlay/detail/ProtocolMessage.h similarity index 98% rename from src/ripple/overlay/impl/ProtocolMessage.h rename to src/xrpld/overlay/detail/ProtocolMessage.h index d6fb14bc78c..b8c6a2c1cf2 100644 --- a/src/ripple/overlay/impl/ProtocolMessage.h +++ b/src/xrpld/overlay/detail/ProtocolMessage.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_OVERLAY_PROTOCOLMESSAGE_H_INCLUDED #define RIPPLE_OVERLAY_PROTOCOLMESSAGE_H_INCLUDED -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/overlay/impl/ProtocolVersion.cpp b/src/xrpld/overlay/detail/ProtocolVersion.cpp similarity index 97% rename from src/ripple/overlay/impl/ProtocolVersion.cpp rename to src/xrpld/overlay/detail/ProtocolVersion.cpp index fbd48474420..bd2effa6341 100644 --- a/src/ripple/overlay/impl/ProtocolVersion.cpp +++ b/src/xrpld/overlay/detail/ProtocolVersion.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/ripple/overlay/impl/ProtocolVersion.h b/src/xrpld/overlay/detail/ProtocolVersion.h similarity index 100% rename from src/ripple/overlay/impl/ProtocolVersion.h rename to src/xrpld/overlay/detail/ProtocolVersion.h diff --git a/src/ripple/overlay/impl/TrafficCount.cpp b/src/xrpld/overlay/detail/TrafficCount.cpp similarity index 99% rename from src/ripple/overlay/impl/TrafficCount.cpp rename to src/xrpld/overlay/detail/TrafficCount.cpp index 9b35d47683c..f3e9c137fba 100644 --- a/src/ripple/overlay/impl/TrafficCount.cpp +++ b/src/xrpld/overlay/detail/TrafficCount.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { diff --git a/src/ripple/overlay/impl/TrafficCount.h b/src/xrpld/overlay/detail/TrafficCount.h similarity index 99% rename from src/ripple/overlay/impl/TrafficCount.h rename to src/xrpld/overlay/detail/TrafficCount.h index 9e212da7917..acd96695257 100644 --- a/src/ripple/overlay/impl/TrafficCount.h +++ b/src/xrpld/overlay/detail/TrafficCount.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_OVERLAY_TRAFFIC_H_INCLUDED #define RIPPLE_OVERLAY_TRAFFIC_H_INCLUDED -#include -#include +#include +#include #include #include diff --git a/src/ripple/overlay/impl/Tuning.h b/src/xrpld/overlay/detail/Tuning.h similarity index 100% rename from src/ripple/overlay/impl/Tuning.h rename to src/xrpld/overlay/detail/Tuning.h diff --git a/src/ripple/overlay/impl/TxMetrics.cpp b/src/xrpld/overlay/detail/TxMetrics.cpp similarity index 98% rename from src/ripple/overlay/impl/TxMetrics.cpp rename to src/xrpld/overlay/detail/TxMetrics.cpp index c9b826e9a36..8759e0122e5 100644 --- a/src/ripple/overlay/impl/TxMetrics.cpp +++ b/src/xrpld/overlay/detail/TxMetrics.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include #include diff --git a/src/ripple/overlay/impl/TxMetrics.h b/src/xrpld/overlay/detail/TxMetrics.h similarity index 98% rename from src/ripple/overlay/impl/TxMetrics.h rename to src/xrpld/overlay/detail/TxMetrics.h index d70cadee1b1..eda7f1bb1b3 100644 --- a/src/ripple/overlay/impl/TxMetrics.h +++ b/src/xrpld/overlay/detail/TxMetrics.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_OVERLAY_TXMETRICS_H_INCLUDED #define RIPPLE_OVERLAY_TXMETRICS_H_INCLUDED -#include -#include +#include +#include #include diff --git a/src/ripple/overlay/impl/ZeroCopyStream.h b/src/xrpld/overlay/detail/ZeroCopyStream.h similarity index 100% rename from src/ripple/overlay/impl/ZeroCopyStream.h rename to src/xrpld/overlay/detail/ZeroCopyStream.h diff --git a/src/ripple/overlay/make_Overlay.h b/src/xrpld/overlay/make_Overlay.h similarity index 91% rename from src/ripple/overlay/make_Overlay.h rename to src/xrpld/overlay/make_Overlay.h index 9a63f5a46af..6532281f3dc 100644 --- a/src/ripple/overlay/make_Overlay.h +++ b/src/xrpld/overlay/make_Overlay.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_OVERLAY_MAKE_OVERLAY_H_INCLUDED #define RIPPLE_OVERLAY_MAKE_OVERLAY_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/overlay/predicates.h b/src/xrpld/overlay/predicates.h similarity index 98% rename from src/ripple/overlay/predicates.h rename to src/xrpld/overlay/predicates.h index 8e403b81fa8..88e7ce6aa4d 100644 --- a/src/ripple/overlay/predicates.h +++ b/src/xrpld/overlay/predicates.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_OVERLAY_PREDICATES_H_INCLUDED #define RIPPLE_OVERLAY_PREDICATES_H_INCLUDED -#include -#include +#include +#include #include diff --git a/src/ripple/peerfinder/PeerfinderManager.h b/src/xrpld/peerfinder/PeerfinderManager.h similarity index 98% rename from src/ripple/peerfinder/PeerfinderManager.h rename to src/xrpld/peerfinder/PeerfinderManager.h index a831cbb707e..10de99abe62 100644 --- a/src/ripple/peerfinder/PeerfinderManager.h +++ b/src/xrpld/peerfinder/PeerfinderManager.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_PEERFINDER_MANAGER_H_INCLUDED #define RIPPLE_PEERFINDER_MANAGER_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/peerfinder/README.md b/src/xrpld/peerfinder/README.md similarity index 100% rename from src/ripple/peerfinder/README.md rename to src/xrpld/peerfinder/README.md diff --git a/src/ripple/peerfinder/Slot.h b/src/xrpld/peerfinder/Slot.h similarity index 97% rename from src/ripple/peerfinder/Slot.h rename to src/xrpld/peerfinder/Slot.h index b43b8075ddc..879c6a53317 100644 --- a/src/ripple/peerfinder/Slot.h +++ b/src/xrpld/peerfinder/Slot.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_PEERFINDER_SLOT_H_INCLUDED #define RIPPLE_PEERFINDER_SLOT_H_INCLUDED -#include -#include +#include +#include #include #include diff --git a/src/ripple/peerfinder/impl/Bootcache.cpp b/src/xrpld/peerfinder/detail/Bootcache.cpp similarity index 97% rename from src/ripple/peerfinder/impl/Bootcache.cpp rename to src/xrpld/peerfinder/detail/Bootcache.cpp index a07c53417d2..9e94a12e619 100644 --- a/src/ripple/peerfinder/impl/Bootcache.cpp +++ b/src/xrpld/peerfinder/detail/Bootcache.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include -#include +#include +#include +#include +#include namespace ripple { namespace PeerFinder { diff --git a/src/ripple/peerfinder/impl/Bootcache.h b/src/xrpld/peerfinder/detail/Bootcache.h similarity index 96% rename from src/ripple/peerfinder/impl/Bootcache.h rename to src/xrpld/peerfinder/detail/Bootcache.h index b48f248ae40..07e8869594c 100644 --- a/src/ripple/peerfinder/impl/Bootcache.h +++ b/src/xrpld/peerfinder/detail/Bootcache.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_PEERFINDER_BOOTCACHE_H_INCLUDED #define RIPPLE_PEERFINDER_BOOTCACHE_H_INCLUDED -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/peerfinder/impl/Checker.h b/src/xrpld/peerfinder/detail/Checker.h similarity index 99% rename from src/ripple/peerfinder/impl/Checker.h rename to src/xrpld/peerfinder/detail/Checker.h index 3a5ef901328..338bd839541 100644 --- a/src/ripple/peerfinder/impl/Checker.h +++ b/src/xrpld/peerfinder/detail/Checker.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_PEERFINDER_CHECKER_H_INCLUDED #define RIPPLE_PEERFINDER_CHECKER_H_INCLUDED -#include +#include #include #include #include diff --git a/src/ripple/peerfinder/impl/Counts.h b/src/xrpld/peerfinder/detail/Counts.h similarity index 98% rename from src/ripple/peerfinder/impl/Counts.h rename to src/xrpld/peerfinder/detail/Counts.h index 5d9e318594f..1ea6ff976de 100644 --- a/src/ripple/peerfinder/impl/Counts.h +++ b/src/xrpld/peerfinder/detail/Counts.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_PEERFINDER_COUNTS_H_INCLUDED #define RIPPLE_PEERFINDER_COUNTS_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/src/ripple/peerfinder/impl/Endpoint.cpp b/src/xrpld/peerfinder/detail/Endpoint.cpp similarity index 93% rename from src/ripple/peerfinder/impl/Endpoint.cpp rename to src/xrpld/peerfinder/detail/Endpoint.cpp index 9740b60206b..53415a8c131 100644 --- a/src/ripple/peerfinder/impl/Endpoint.cpp +++ b/src/xrpld/peerfinder/detail/Endpoint.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include namespace ripple { namespace PeerFinder { diff --git a/src/ripple/peerfinder/impl/Fixed.h b/src/xrpld/peerfinder/detail/Fixed.h similarity index 97% rename from src/ripple/peerfinder/impl/Fixed.h rename to src/xrpld/peerfinder/detail/Fixed.h index bf7a2b6b35b..464a4d97d9a 100644 --- a/src/ripple/peerfinder/impl/Fixed.h +++ b/src/xrpld/peerfinder/detail/Fixed.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_PEERFINDER_FIXED_H_INCLUDED #define RIPPLE_PEERFINDER_FIXED_H_INCLUDED -#include +#include namespace ripple { namespace PeerFinder { diff --git a/src/ripple/peerfinder/impl/Handouts.h b/src/xrpld/peerfinder/detail/Handouts.h similarity index 98% rename from src/ripple/peerfinder/impl/Handouts.h rename to src/xrpld/peerfinder/detail/Handouts.h index 00e163bbeaa..0b54dc205fa 100644 --- a/src/ripple/peerfinder/impl/Handouts.h +++ b/src/xrpld/peerfinder/detail/Handouts.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_PEERFINDER_HANDOUTS_H_INCLUDED #define RIPPLE_PEERFINDER_HANDOUTS_H_INCLUDED -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/ripple/peerfinder/impl/Livecache.h b/src/xrpld/peerfinder/detail/Livecache.h similarity index 98% rename from src/ripple/peerfinder/impl/Livecache.h rename to src/xrpld/peerfinder/detail/Livecache.h index 8ecd68e845e..1583ccd96a3 100644 --- a/src/ripple/peerfinder/impl/Livecache.h +++ b/src/xrpld/peerfinder/detail/Livecache.h @@ -20,13 +20,13 @@ #ifndef RIPPLE_PEERFINDER_LIVECACHE_H_INCLUDED #define RIPPLE_PEERFINDER_LIVECACHE_H_INCLUDED -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/peerfinder/impl/Logic.h b/src/xrpld/peerfinder/detail/Logic.h similarity index 98% rename from src/ripple/peerfinder/impl/Logic.h rename to src/xrpld/peerfinder/detail/Logic.h index 7a2b6a7543a..49b71a6a545 100644 --- a/src/ripple/peerfinder/impl/Logic.h +++ b/src/xrpld/peerfinder/detail/Logic.h @@ -20,22 +20,22 @@ #ifndef RIPPLE_PEERFINDER_LOGIC_H_INCLUDED #define RIPPLE_PEERFINDER_LOGIC_H_INCLUDED -#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 +#include +#include #include #include diff --git a/src/ripple/peerfinder/impl/PeerfinderConfig.cpp b/src/xrpld/peerfinder/detail/PeerfinderConfig.cpp similarity index 97% rename from src/ripple/peerfinder/impl/PeerfinderConfig.cpp rename to src/xrpld/peerfinder/detail/PeerfinderConfig.cpp index 8b90bc97184..3075224189e 100644 --- a/src/ripple/peerfinder/impl/PeerfinderConfig.cpp +++ b/src/xrpld/peerfinder/detail/PeerfinderConfig.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include namespace ripple { namespace PeerFinder { diff --git a/src/ripple/peerfinder/impl/PeerfinderManager.cpp b/src/xrpld/peerfinder/detail/PeerfinderManager.cpp similarity index 97% rename from src/ripple/peerfinder/impl/PeerfinderManager.cpp rename to src/xrpld/peerfinder/detail/PeerfinderManager.cpp index e3743c047e4..8baa2b50b9a 100644 --- a/src/ripple/peerfinder/impl/PeerfinderManager.cpp +++ b/src/xrpld/peerfinder/detail/PeerfinderManager.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/peerfinder/impl/Reporting.h b/src/xrpld/peerfinder/detail/Reporting.h similarity index 100% rename from src/ripple/peerfinder/impl/Reporting.h rename to src/xrpld/peerfinder/detail/Reporting.h diff --git a/src/ripple/peerfinder/impl/SlotImp.cpp b/src/xrpld/peerfinder/detail/SlotImp.cpp similarity index 96% rename from src/ripple/peerfinder/impl/SlotImp.cpp rename to src/xrpld/peerfinder/detail/SlotImp.cpp index c41aeb9d5d8..a5d13aa729e 100644 --- a/src/ripple/peerfinder/impl/SlotImp.cpp +++ b/src/xrpld/peerfinder/detail/SlotImp.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include -#include +#include +#include +#include namespace ripple { namespace PeerFinder { diff --git a/src/ripple/peerfinder/impl/SlotImp.h b/src/xrpld/peerfinder/detail/SlotImp.h similarity index 96% rename from src/ripple/peerfinder/impl/SlotImp.h rename to src/xrpld/peerfinder/detail/SlotImp.h index 49e5d731ba0..45143a90121 100644 --- a/src/ripple/peerfinder/impl/SlotImp.h +++ b/src/xrpld/peerfinder/detail/SlotImp.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_PEERFINDER_SLOTIMP_H_INCLUDED #define RIPPLE_PEERFINDER_SLOTIMP_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/peerfinder/impl/Source.h b/src/xrpld/peerfinder/detail/Source.h similarity index 97% rename from src/ripple/peerfinder/impl/Source.h rename to src/xrpld/peerfinder/detail/Source.h index 5c148438148..a64da7b9e79 100644 --- a/src/ripple/peerfinder/impl/Source.h +++ b/src/xrpld/peerfinder/detail/Source.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_PEERFINDER_SOURCE_H_INCLUDED #define RIPPLE_PEERFINDER_SOURCE_H_INCLUDED -#include +#include #include namespace ripple { diff --git a/src/ripple/peerfinder/impl/SourceStrings.cpp b/src/xrpld/peerfinder/detail/SourceStrings.cpp similarity index 97% rename from src/ripple/peerfinder/impl/SourceStrings.cpp rename to src/xrpld/peerfinder/detail/SourceStrings.cpp index 4e5db79c75c..b01fbfd8c21 100644 --- a/src/ripple/peerfinder/impl/SourceStrings.cpp +++ b/src/xrpld/peerfinder/detail/SourceStrings.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { namespace PeerFinder { diff --git a/src/ripple/peerfinder/impl/SourceStrings.h b/src/xrpld/peerfinder/detail/SourceStrings.h similarity index 97% rename from src/ripple/peerfinder/impl/SourceStrings.h rename to src/xrpld/peerfinder/detail/SourceStrings.h index 5d67d0887f3..52d985a7017 100644 --- a/src/ripple/peerfinder/impl/SourceStrings.h +++ b/src/xrpld/peerfinder/detail/SourceStrings.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_PEERFINDER_SOURCESTRINGS_H_INCLUDED #define RIPPLE_PEERFINDER_SOURCESTRINGS_H_INCLUDED -#include +#include #include namespace ripple { diff --git a/src/ripple/peerfinder/impl/Store.h b/src/xrpld/peerfinder/detail/Store.h similarity index 100% rename from src/ripple/peerfinder/impl/Store.h rename to src/xrpld/peerfinder/detail/Store.h diff --git a/src/ripple/peerfinder/impl/StoreSqdb.h b/src/xrpld/peerfinder/detail/StoreSqdb.h similarity index 95% rename from src/ripple/peerfinder/impl/StoreSqdb.h rename to src/xrpld/peerfinder/detail/StoreSqdb.h index 879bee83b6f..ad8b886d4a3 100644 --- a/src/ripple/peerfinder/impl/StoreSqdb.h +++ b/src/xrpld/peerfinder/detail/StoreSqdb.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_PEERFINDER_STORESQDB_H_INCLUDED #define RIPPLE_PEERFINDER_STORESQDB_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/peerfinder/impl/Tuning.h b/src/xrpld/peerfinder/detail/Tuning.h similarity index 100% rename from src/ripple/peerfinder/impl/Tuning.h rename to src/xrpld/peerfinder/detail/Tuning.h diff --git a/src/ripple/peerfinder/impl/iosformat.h b/src/xrpld/peerfinder/detail/iosformat.h similarity index 100% rename from src/ripple/peerfinder/impl/iosformat.h rename to src/xrpld/peerfinder/detail/iosformat.h diff --git a/src/ripple/peerfinder/make_Manager.h b/src/xrpld/peerfinder/make_Manager.h similarity index 96% rename from src/ripple/peerfinder/make_Manager.h rename to src/xrpld/peerfinder/make_Manager.h index 932fccb9abd..3a4f68d94c9 100644 --- a/src/ripple/peerfinder/make_Manager.h +++ b/src/xrpld/peerfinder/make_Manager.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_PEERFINDER_MAKE_MANAGER_H_INCLUDED #define RIPPLE_PEERFINDER_MAKE_MANAGER_H_INCLUDED -#include +#include #include #include diff --git a/src/ripple/peerfinder/sim/FunctionQueue.h b/src/xrpld/peerfinder/sim/FunctionQueue.h similarity index 100% rename from src/ripple/peerfinder/sim/FunctionQueue.h rename to src/xrpld/peerfinder/sim/FunctionQueue.h diff --git a/src/ripple/peerfinder/sim/GraphAlgorithms.h b/src/xrpld/peerfinder/sim/GraphAlgorithms.h similarity index 100% rename from src/ripple/peerfinder/sim/GraphAlgorithms.h rename to src/xrpld/peerfinder/sim/GraphAlgorithms.h diff --git a/src/ripple/peerfinder/sim/Message.h b/src/xrpld/peerfinder/sim/Message.h similarity index 100% rename from src/ripple/peerfinder/sim/Message.h rename to src/xrpld/peerfinder/sim/Message.h diff --git a/src/ripple/peerfinder/sim/NodeSnapshot.h b/src/xrpld/peerfinder/sim/NodeSnapshot.h similarity index 100% rename from src/ripple/peerfinder/sim/NodeSnapshot.h rename to src/xrpld/peerfinder/sim/NodeSnapshot.h diff --git a/src/ripple/peerfinder/sim/Params.h b/src/xrpld/peerfinder/sim/Params.h similarity index 100% rename from src/ripple/peerfinder/sim/Params.h rename to src/xrpld/peerfinder/sim/Params.h diff --git a/src/ripple/peerfinder/sim/Predicates.h b/src/xrpld/peerfinder/sim/Predicates.h similarity index 100% rename from src/ripple/peerfinder/sim/Predicates.h rename to src/xrpld/peerfinder/sim/Predicates.h diff --git a/src/ripple/basics/PerfLog.h b/src/xrpld/perflog/PerfLog.h similarity index 97% rename from src/ripple/basics/PerfLog.h rename to src/xrpld/perflog/PerfLog.h index 3d1cb371715..17147ccce3c 100644 --- a/src/ripple/basics/PerfLog.h +++ b/src/xrpld/perflog/PerfLog.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_BASICS_PERFLOG_H #define RIPPLE_BASICS_PERFLOG_H -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/ripple/perflog/impl/PerfLogImp.cpp b/src/xrpld/perflog/detail/PerfLogImp.cpp similarity index 97% rename from src/ripple/perflog/impl/PerfLogImp.cpp rename to src/xrpld/perflog/detail/PerfLogImp.cpp index 3d07d0ed625..b9691e05c23 100644 --- a/src/ripple/perflog/impl/PerfLogImp.cpp +++ b/src/xrpld/perflog/detail/PerfLogImp.cpp @@ -17,15 +17,15 @@ */ //============================================================================== -#include - -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/perflog/impl/PerfLogImp.h b/src/xrpld/perflog/detail/PerfLogImp.h similarity index 96% rename from src/ripple/perflog/impl/PerfLogImp.h rename to src/xrpld/perflog/detail/PerfLogImp.h index 4904126d95f..937486f75dc 100644 --- a/src/ripple/perflog/impl/PerfLogImp.h +++ b/src/xrpld/perflog/detail/PerfLogImp.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_BASICS_PERFLOGIMP_H #define RIPPLE_BASICS_PERFLOGIMP_H -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/rpc/BookChanges.h b/src/xrpld/rpc/BookChanges.h similarity index 100% rename from src/ripple/rpc/BookChanges.h rename to src/xrpld/rpc/BookChanges.h diff --git a/src/ripple/rpc/CTID.h b/src/xrpld/rpc/CTID.h similarity index 99% rename from src/ripple/rpc/CTID.h rename to src/xrpld/rpc/CTID.h index 8f6c64bc028..8cac8d63171 100644 --- a/src/ripple/rpc/CTID.h +++ b/src/xrpld/rpc/CTID.h @@ -63,7 +63,7 @@ decodeCTID(const T ctid) noexcept if (ctidString.length() != 16) return {}; - if (!boost::regex_match(ctidString, boost::regex("^[0-9A-F]+$"))) + if (!boost::regex_match(ctidString, boost::regex("^[0-9A-Fa-f]+$"))) return {}; ctidValue = std::stoull(ctidString, nullptr, 16); diff --git a/src/ripple/rpc/Context.h b/src/xrpld/rpc/Context.h similarity index 92% rename from src/ripple/rpc/Context.h rename to src/xrpld/rpc/Context.h index ea18efcec6c..edc5582a401 100644 --- a/src/ripple/rpc/Context.h +++ b/src/xrpld/rpc/Context.h @@ -20,12 +20,12 @@ #ifndef RIPPLE_RPC_CONTEXT_H_INCLUDED #define RIPPLE_RPC_CONTEXT_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include namespace ripple { diff --git a/src/ripple/rpc/DeliveredAmount.h b/src/xrpld/rpc/DeliveredAmount.h similarity index 96% rename from src/ripple/rpc/DeliveredAmount.h rename to src/xrpld/rpc/DeliveredAmount.h index 94fff68f7bd..2ebadd38752 100644 --- a/src/ripple/rpc/DeliveredAmount.h +++ b/src/xrpld/rpc/DeliveredAmount.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_RPC_DELIVEREDAMOUNT_H_INCLUDED #define RIPPLE_RPC_DELIVEREDAMOUNT_H_INCLUDED -#include -#include +#include +#include #include #include diff --git a/src/ripple/rpc/GRPCHandlers.h b/src/xrpld/rpc/GRPCHandlers.h similarity index 96% rename from src/ripple/rpc/GRPCHandlers.h rename to src/xrpld/rpc/GRPCHandlers.h index 9fb8d0909fe..679b16fd8ac 100644 --- a/src/ripple/rpc/GRPCHandlers.h +++ b/src/xrpld/rpc/GRPCHandlers.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_RPC_GRPCHANDLER_H_INCLUDED #define RIPPLE_RPC_GRPCHANDLER_H_INCLUDED -#include -#include +#include +#include #include namespace ripple { diff --git a/src/ripple/rpc/Output.h b/src/xrpld/rpc/Output.h similarity index 100% rename from src/ripple/rpc/Output.h rename to src/xrpld/rpc/Output.h diff --git a/src/ripple/rpc/README.md b/src/xrpld/rpc/README.md similarity index 100% rename from src/ripple/rpc/README.md rename to src/xrpld/rpc/README.md diff --git a/src/ripple/rpc/RPCHandler.h b/src/xrpld/rpc/RPCHandler.h similarity index 91% rename from src/ripple/rpc/RPCHandler.h rename to src/xrpld/rpc/RPCHandler.h index 45c737783c6..c056ca27eb6 100644 --- a/src/ripple/rpc/RPCHandler.h +++ b/src/xrpld/rpc/RPCHandler.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_RPC_RPCHANDLER_H_INCLUDED #define RIPPLE_RPC_RPCHANDLER_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include namespace ripple { namespace RPC { diff --git a/src/ripple/rpc/Request.h b/src/xrpld/rpc/Request.h similarity index 93% rename from src/ripple/rpc/Request.h rename to src/xrpld/rpc/Request.h index 4f9918215a3..ec65e38d4f4 100644 --- a/src/ripple/rpc/Request.h +++ b/src/xrpld/rpc/Request.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_RPC_REQUEST_H_INCLUDED #define RIPPLE_RPC_REQUEST_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/Role.h b/src/xrpld/rpc/Role.h similarity index 94% rename from src/ripple/rpc/Role.h rename to src/xrpld/rpc/Role.h index 1ce76f90d6d..0ce84e09ef6 100644 --- a/src/ripple/rpc/Role.h +++ b/src/xrpld/rpc/Role.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_SERVER_ROLE_H_INCLUDED #define RIPPLE_SERVER_ROLE_H_INCLUDED -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/rpc/ServerHandler.h b/src/xrpld/rpc/ServerHandler.h similarity index 95% rename from src/ripple/rpc/ServerHandler.h rename to src/xrpld/rpc/ServerHandler.h index 7e9e427cfdb..a8d4e900fc6 100644 --- a/src/ripple/rpc/ServerHandler.h +++ b/src/xrpld/rpc/ServerHandler.h @@ -20,14 +20,14 @@ #ifndef RIPPLE_RPC_SERVERHANDLER_H_INCLUDED #define RIPPLE_RPC_SERVERHANDLER_H_INCLUDED -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/rpc/ShardArchiveHandler.h b/src/xrpld/rpc/ShardArchiveHandler.h similarity index 95% rename from src/ripple/rpc/ShardArchiveHandler.h rename to src/xrpld/rpc/ShardArchiveHandler.h index b9e9b3a60a9..3a407b37976 100644 --- a/src/ripple/rpc/ShardArchiveHandler.h +++ b/src/xrpld/rpc/ShardArchiveHandler.h @@ -20,12 +20,12 @@ #ifndef RIPPLE_RPC_SHARDARCHIVEHANDLER_H_INCLUDED #define RIPPLE_RPC_SHARDARCHIVEHANDLER_H_INCLUDED -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/rpc/ShardVerificationScheduler.h b/src/xrpld/rpc/ShardVerificationScheduler.h similarity index 98% rename from src/ripple/rpc/ShardVerificationScheduler.h rename to src/xrpld/rpc/ShardVerificationScheduler.h index 659b3e90491..bc561381b3e 100644 --- a/src/ripple/rpc/ShardVerificationScheduler.h +++ b/src/xrpld/rpc/ShardVerificationScheduler.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_RPC_SHARDVERIFICATIONSCHEDULER_H_INCLUDED #define RIPPLE_RPC_SHARDVERIFICATIONSCHEDULER_H_INCLUDED -#include +#include #include namespace ripple { diff --git a/src/ripple/rpc/Status.h b/src/xrpld/rpc/Status.h similarity index 98% rename from src/ripple/rpc/Status.h rename to src/xrpld/rpc/Status.h index d930d7ab439..1d94a6837a8 100644 --- a/src/ripple/rpc/Status.h +++ b/src/xrpld/rpc/Status.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_RPC_STATUS_H_INCLUDED #define RIPPLE_RPC_STATUS_H_INCLUDED -#include -#include +#include +#include #include namespace ripple { diff --git a/src/ripple/rpc/impl/DeliveredAmount.cpp b/src/xrpld/rpc/detail/DeliveredAmount.cpp similarity index 95% rename from src/ripple/rpc/impl/DeliveredAmount.cpp rename to src/xrpld/rpc/detail/DeliveredAmount.cpp index 59316d91cf5..7874997e24f 100644 --- a/src/ripple/rpc/impl/DeliveredAmount.cpp +++ b/src/xrpld/rpc/detail/DeliveredAmount.cpp @@ -17,17 +17,17 @@ */ //============================================================================== -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/rpc/impl/Handler.cpp b/src/xrpld/rpc/detail/Handler.cpp similarity index 98% rename from src/ripple/rpc/impl/Handler.cpp rename to src/xrpld/rpc/detail/Handler.cpp index 1fc160dc4db..4bac4610229 100644 --- a/src/ripple/rpc/impl/Handler.cpp +++ b/src/xrpld/rpc/detail/Handler.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include diff --git a/src/ripple/rpc/impl/Handler.h b/src/xrpld/rpc/detail/Handler.h similarity index 94% rename from src/ripple/rpc/impl/Handler.h rename to src/xrpld/rpc/detail/Handler.h index 28d1ee60c85..81fbc2be321 100644 --- a/src/ripple/rpc/impl/Handler.h +++ b/src/xrpld/rpc/detail/Handler.h @@ -20,13 +20,13 @@ #ifndef RIPPLE_RPC_HANDLER_H_INCLUDED #define RIPPLE_RPC_HANDLER_H_INCLUDED -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include namespace Json { diff --git a/src/ripple/rpc/impl/LegacyPathFind.cpp b/src/xrpld/rpc/detail/LegacyPathFind.cpp similarity index 89% rename from src/ripple/rpc/impl/LegacyPathFind.cpp rename to src/xrpld/rpc/detail/LegacyPathFind.cpp index 1c13709ead6..35220178bf5 100644 --- a/src/ripple/rpc/impl/LegacyPathFind.cpp +++ b/src/xrpld/rpc/detail/LegacyPathFind.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace ripple { namespace RPC { diff --git a/src/ripple/rpc/impl/LegacyPathFind.h b/src/xrpld/rpc/detail/LegacyPathFind.h similarity index 100% rename from src/ripple/rpc/impl/LegacyPathFind.h rename to src/xrpld/rpc/detail/LegacyPathFind.h diff --git a/src/ripple/rpc/impl/RPCHandler.cpp b/src/xrpld/rpc/detail/RPCHandler.cpp similarity index 91% rename from src/ripple/rpc/impl/RPCHandler.cpp rename to src/xrpld/rpc/detail/RPCHandler.cpp index 9c5aa6d465b..8504fe72a83 100644 --- a/src/ripple/rpc/impl/RPCHandler.cpp +++ b/src/xrpld/rpc/detail/RPCHandler.cpp @@ -17,29 +17,29 @@ */ //============================================================================== -#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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/rpc/impl/RPCHelpers.cpp b/src/xrpld/rpc/detail/RPCHelpers.cpp similarity index 97% rename from src/ripple/rpc/impl/RPCHelpers.cpp rename to src/xrpld/rpc/detail/RPCHelpers.cpp index a6179b04c88..71513ddcd5c 100644 --- a/src/ripple/rpc/impl/RPCHelpers.cpp +++ b/src/xrpld/rpc/detail/RPCHelpers.cpp @@ -17,22 +17,22 @@ */ //============================================================================== -#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 +#include +#include #include #include @@ -986,6 +986,22 @@ chooseLedgerEntryType(Json::Value const& params) return result; } +bool +isAccountObjectsValidType(LedgerEntryType const& type) +{ + switch (type) + { + case LedgerEntryType::ltAMENDMENTS: + case LedgerEntryType::ltDIR_NODE: + case LedgerEntryType::ltFEE_SETTINGS: + case LedgerEntryType::ltLEDGER_HASHES: + case LedgerEntryType::ltNEGATIVE_UNL: + return false; + default: + return true; + } +} + beast::SemanticVersion const firstVersion("1.0.0"); beast::SemanticVersion const goodVersion("1.0.0"); beast::SemanticVersion const lastVersion("1.0.0"); diff --git a/src/ripple/rpc/impl/RPCHelpers.h b/src/xrpld/rpc/detail/RPCHelpers.h similarity index 92% rename from src/ripple/rpc/impl/RPCHelpers.h rename to src/xrpld/rpc/detail/RPCHelpers.h index e003773e50c..54c426b17c3 100644 --- a/src/ripple/rpc/impl/RPCHelpers.h +++ b/src/xrpld/rpc/detail/RPCHelpers.h @@ -20,17 +20,17 @@ #ifndef RIPPLE_RPC_RPCHELPERS_H_INCLUDED #define RIPPLE_RPC_RPCHELPERS_H_INCLUDED -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include #include #include @@ -232,6 +232,15 @@ setVersion(Object& parent, unsigned int apiVersion, bool betaEnabled) std::pair chooseLedgerEntryType(Json::Value const& params); +/** + * Check if the type is a valid filtering type for account_objects method + * + * Since Amendments, DirectoryNode, FeeSettings, LedgerHashes can not be + * owned by an account, this function will return false in these situations. + */ +bool +isAccountObjectsValidType(LedgerEntryType const& type); + /** * Retrieve the api version number from the json value * diff --git a/src/ripple/rpc/impl/Role.cpp b/src/xrpld/rpc/detail/Role.cpp similarity index 99% rename from src/ripple/rpc/impl/Role.cpp rename to src/xrpld/rpc/detail/Role.cpp index 54f6d6e2575..5cfe30b26e6 100644 --- a/src/ripple/rpc/impl/Role.cpp +++ b/src/xrpld/rpc/detail/Role.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include #include #include diff --git a/src/ripple/rpc/impl/ServerHandler.cpp b/src/xrpld/rpc/detail/ServerHandler.cpp similarity index 97% rename from src/ripple/rpc/impl/ServerHandler.cpp rename to src/xrpld/rpc/detail/ServerHandler.cpp index 700e1c64976..c006111894b 100644 --- a/src/ripple/rpc/impl/ServerHandler.cpp +++ b/src/xrpld/rpc/detail/ServerHandler.cpp @@ -17,33 +17,33 @@ */ //============================================================================== -#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 +#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/rpc/impl/ShardArchiveHandler.cpp b/src/xrpld/rpc/detail/ShardArchiveHandler.cpp similarity index 97% rename from src/ripple/rpc/impl/ShardArchiveHandler.cpp rename to src/xrpld/rpc/detail/ShardArchiveHandler.cpp index d05744f483a..1ab8f7767b5 100644 --- a/src/ripple/rpc/impl/ShardArchiveHandler.cpp +++ b/src/xrpld/rpc/detail/ShardArchiveHandler.cpp @@ -17,14 +17,14 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/ripple/rpc/impl/ShardVerificationScheduler.cpp b/src/xrpld/rpc/detail/ShardVerificationScheduler.cpp similarity index 95% rename from src/ripple/rpc/impl/ShardVerificationScheduler.cpp rename to src/xrpld/rpc/detail/ShardVerificationScheduler.cpp index ad6b6df7b5c..f571e8b29cd 100644 --- a/src/ripple/rpc/impl/ShardVerificationScheduler.cpp +++ b/src/xrpld/rpc/detail/ShardVerificationScheduler.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include namespace ripple { namespace RPC { diff --git a/src/ripple/rpc/impl/Status.cpp b/src/xrpld/rpc/detail/Status.cpp similarity index 98% rename from src/ripple/rpc/impl/Status.cpp rename to src/xrpld/rpc/detail/Status.cpp index e9e64da7ac0..af212d37f14 100644 --- a/src/ripple/rpc/impl/Status.cpp +++ b/src/xrpld/rpc/detail/Status.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include namespace ripple { diff --git a/src/ripple/rpc/impl/TransactionSign.cpp b/src/xrpld/rpc/detail/TransactionSign.cpp similarity index 97% rename from src/ripple/rpc/impl/TransactionSign.cpp rename to src/xrpld/rpc/detail/TransactionSign.cpp index 3f4407c86e7..1fee84c683b 100644 --- a/src/ripple/rpc/impl/TransactionSign.cpp +++ b/src/xrpld/rpc/detail/TransactionSign.cpp @@ -17,29 +17,29 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include -#include // Validity::Valid -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // Validity::Valid +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -1051,7 +1051,7 @@ transactionSignFor( auto& sttx = preprocResult.second; { // Make the signer object that we'll inject. - STObject signer(sfSigner); + STObject signer = STObject::makeInnerObject(sfSigner); signer[sfAccount] = *signerAccountID; signer.setFieldVL(sfTxnSignature, signForParams.getSignature()); signer.setFieldVL( diff --git a/src/ripple/rpc/impl/TransactionSign.h b/src/xrpld/rpc/detail/TransactionSign.h similarity index 97% rename from src/ripple/rpc/impl/TransactionSign.h rename to src/xrpld/rpc/detail/TransactionSign.h index 2a38031f50a..36fb60555cf 100644 --- a/src/ripple/rpc/impl/TransactionSign.h +++ b/src/xrpld/rpc/detail/TransactionSign.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_RPC_TRANSACTIONSIGN_H_INCLUDED #define RIPPLE_RPC_TRANSACTIONSIGN_H_INCLUDED -#include -#include -#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/impl/Tuning.h b/src/xrpld/rpc/detail/Tuning.h similarity index 100% rename from src/ripple/rpc/impl/Tuning.h rename to src/xrpld/rpc/detail/Tuning.h diff --git a/src/ripple/rpc/impl/WSInfoSub.h b/src/xrpld/rpc/detail/WSInfoSub.h similarity index 93% rename from src/ripple/rpc/impl/WSInfoSub.h rename to src/xrpld/rpc/detail/WSInfoSub.h index 31f6353b994..2267b9147f4 100644 --- a/src/ripple/rpc/impl/WSInfoSub.h +++ b/src/xrpld/rpc/detail/WSInfoSub.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_RPC_WSINFOSUB_H #define RIPPLE_RPC_WSINFOSUB_H -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/rpc/handlers/AMMInfo.cpp b/src/xrpld/rpc/handlers/AMMInfo.cpp similarity index 96% rename from src/ripple/rpc/handlers/AMMInfo.cpp rename to src/xrpld/rpc/handlers/AMMInfo.cpp index b4f56ffba21..aad8faea213 100644 --- a/src/ripple/rpc/handlers/AMMInfo.cpp +++ b/src/xrpld/rpc/handlers/AMMInfo.cpp @@ -16,15 +16,15 @@ 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 namespace ripple { diff --git a/src/ripple/rpc/handlers/AccountChannels.cpp b/src/xrpld/rpc/handlers/AccountChannels.cpp similarity index 94% rename from src/ripple/rpc/handlers/AccountChannels.cpp rename to src/xrpld/rpc/handlers/AccountChannels.cpp index ebd89b04418..5ae87e32a12 100644 --- a/src/ripple/rpc/handlers/AccountChannels.cpp +++ b/src/xrpld/rpc/handlers/AccountChannels.cpp @@ -17,18 +17,18 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { void diff --git a/src/ripple/rpc/handlers/AccountCurrenciesHandler.cpp b/src/xrpld/rpc/handlers/AccountCurrenciesHandler.cpp similarity index 90% rename from src/ripple/rpc/handlers/AccountCurrenciesHandler.cpp rename to src/xrpld/rpc/handlers/AccountCurrenciesHandler.cpp index 45dc8b545ca..04336114987 100644 --- a/src/ripple/rpc/handlers/AccountCurrenciesHandler.cpp +++ b/src/xrpld/rpc/handlers/AccountCurrenciesHandler.cpp @@ -17,14 +17,14 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/AccountInfo.cpp b/src/xrpld/rpc/handlers/AccountInfo.cpp similarity index 96% rename from src/ripple/rpc/handlers/AccountInfo.cpp rename to src/xrpld/rpc/handlers/AccountInfo.cpp index bd2184f49a3..29b8679505d 100644 --- a/src/ripple/rpc/handlers/AccountInfo.cpp +++ b/src/xrpld/rpc/handlers/AccountInfo.cpp @@ -17,17 +17,17 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/rpc/handlers/AccountLines.cpp b/src/xrpld/rpc/handlers/AccountLines.cpp similarity index 95% rename from src/ripple/rpc/handlers/AccountLines.cpp rename to src/xrpld/rpc/handlers/AccountLines.cpp index 3bfcd225b14..cace3487bb8 100644 --- a/src/ripple/rpc/handlers/AccountLines.cpp +++ b/src/xrpld/rpc/handlers/AccountLines.cpp @@ -17,16 +17,16 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/AccountObjects.cpp b/src/xrpld/rpc/handlers/AccountObjects.cpp similarity index 86% rename from src/ripple/rpc/handlers/AccountObjects.cpp rename to src/xrpld/rpc/handlers/AccountObjects.cpp index 2531cd03115..d2eb2eacde6 100644 --- a/src/ripple/rpc/handlers/AccountObjects.cpp +++ b/src/xrpld/rpc/handlers/AccountObjects.cpp @@ -17,19 +17,19 @@ */ //============================================================================== -#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 @@ -75,8 +75,9 @@ doAccountNFTs(RPC::JsonContext& context) return *err; uint256 marker; + bool const markerSet = params.isMember(jss::marker); - if (params.isMember(jss::marker)) + if (markerSet) { auto const& m = params[jss::marker]; if (!m.isString()) @@ -98,6 +99,7 @@ doAccountNFTs(RPC::JsonContext& context) // Continue iteration from the current page: bool pastMarker = marker.isZero(); + bool markerFound = false; uint256 const maskedMarker = marker & nft::pageMask; while (cp) { @@ -119,12 +121,23 @@ doAccountNFTs(RPC::JsonContext& context) uint256 const nftokenID = o[sfNFTokenID]; uint256 const maskedNftokenID = nftokenID & nft::pageMask; - if (!pastMarker && maskedNftokenID < maskedMarker) - continue; + if (!pastMarker) + { + if (maskedNftokenID < maskedMarker) + continue; - if (!pastMarker && maskedNftokenID == maskedMarker && - nftokenID <= marker) - continue; + if (maskedNftokenID == maskedMarker && nftokenID < marker) + continue; + + if (nftokenID == marker) + { + markerFound = true; + continue; + } + } + + if (markerSet && !markerFound) + return RPC::invalid_field_error(jss::marker); pastMarker = true; @@ -155,6 +168,9 @@ doAccountNFTs(RPC::JsonContext& context) cp = nullptr; } + if (markerSet && !markerFound) + return RPC::invalid_field_error(jss::marker); + result[jss::account] = toBase58(accountID); context.loadType = Resource::feeMediumBurdenRPC; return result; @@ -220,6 +236,9 @@ doAccountObjects(RPC::JsonContext& context) { auto [rpcStatus, type] = RPC::chooseLedgerEntryType(params); + if (!RPC::isAccountObjectsValidType(type)) + return RPC::invalid_field_error(jss::type); + if (rpcStatus) { result.clear(); diff --git a/src/ripple/rpc/handlers/AccountOffers.cpp b/src/xrpld/rpc/handlers/AccountOffers.cpp similarity index 93% rename from src/ripple/rpc/handlers/AccountOffers.cpp rename to src/xrpld/rpc/handlers/AccountOffers.cpp index 867f888e241..1a3b5227ed8 100644 --- a/src/ripple/rpc/handlers/AccountOffers.cpp +++ b/src/xrpld/rpc/handlers/AccountOffers.cpp @@ -17,17 +17,17 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/AccountTx.cpp b/src/xrpld/rpc/handlers/AccountTx.cpp similarity index 95% rename from src/ripple/rpc/handlers/AccountTx.cpp rename to src/xrpld/rpc/handlers/AccountTx.cpp index 7fe7472721f..4f9431ce081 100644 --- a/src/ripple/rpc/handlers/AccountTx.cpp +++ b/src/xrpld/rpc/handlers/AccountTx.cpp @@ -17,26 +17,26 @@ */ //============================================================================== -#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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/ripple/rpc/handlers/BlackList.cpp b/src/xrpld/rpc/handlers/BlackList.cpp similarity index 89% rename from src/ripple/rpc/handlers/BlackList.cpp rename to src/xrpld/rpc/handlers/BlackList.cpp index 3fe5b99e5a0..3e887ff7309 100644 --- a/src/ripple/rpc/handlers/BlackList.cpp +++ b/src/xrpld/rpc/handlers/BlackList.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include -#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/BookOffers.cpp b/src/xrpld/rpc/handlers/BookOffers.cpp similarity index 94% rename from src/ripple/rpc/handlers/BookOffers.cpp rename to src/xrpld/rpc/handlers/BookOffers.cpp index e21d7047f69..6126913a5b6 100644 --- a/src/ripple/rpc/handlers/BookOffers.cpp +++ b/src/xrpld/rpc/handlers/BookOffers.cpp @@ -17,18 +17,18 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/CanDelete.cpp b/src/xrpld/rpc/handlers/CanDelete.cpp similarity index 91% rename from src/ripple/rpc/handlers/CanDelete.cpp rename to src/xrpld/rpc/handlers/CanDelete.cpp index 3127b5c4390..db9fdf7c5d0 100644 --- a/src/ripple/rpc/handlers/CanDelete.cpp +++ b/src/xrpld/rpc/handlers/CanDelete.cpp @@ -17,14 +17,14 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/rpc/handlers/Connect.cpp b/src/xrpld/rpc/handlers/Connect.cpp similarity index 86% rename from src/ripple/rpc/handlers/Connect.cpp rename to src/xrpld/rpc/handlers/Connect.cpp index 46fac457cb8..dadf0a0515e 100644 --- a/src/ripple/rpc/handlers/Connect.cpp +++ b/src/xrpld/rpc/handlers/Connect.cpp @@ -17,15 +17,15 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/ConsensusInfo.cpp b/src/xrpld/rpc/handlers/ConsensusInfo.cpp similarity index 84% rename from src/ripple/rpc/handlers/ConsensusInfo.cpp rename to src/xrpld/rpc/handlers/ConsensusInfo.cpp index ee7eb10e684..42fbb60ba76 100644 --- a/src/ripple/rpc/handlers/ConsensusInfo.cpp +++ b/src/xrpld/rpc/handlers/ConsensusInfo.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/CrawlShards.cpp b/src/xrpld/rpc/handlers/CrawlShards.cpp similarity index 87% rename from src/ripple/rpc/handlers/CrawlShards.cpp rename to src/xrpld/rpc/handlers/CrawlShards.cpp index 41b74860c3a..f586d750439 100644 --- a/src/ripple/rpc/handlers/CrawlShards.cpp +++ b/src/xrpld/rpc/handlers/CrawlShards.cpp @@ -17,15 +17,15 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/DepositAuthorized.cpp b/src/xrpld/rpc/handlers/DepositAuthorized.cpp similarity index 93% rename from src/ripple/rpc/handlers/DepositAuthorized.cpp rename to src/xrpld/rpc/handlers/DepositAuthorized.cpp index bb6e3b07a9a..0efa584625b 100644 --- a/src/ripple/rpc/handlers/DepositAuthorized.cpp +++ b/src/xrpld/rpc/handlers/DepositAuthorized.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/DownloadShard.cpp b/src/xrpld/rpc/handlers/DownloadShard.cpp similarity index 94% rename from src/ripple/rpc/handlers/DownloadShard.cpp rename to src/xrpld/rpc/handlers/DownloadShard.cpp index eacf499df04..1ec12e0fa66 100644 --- a/src/ripple/rpc/handlers/DownloadShard.cpp +++ b/src/xrpld/rpc/handlers/DownloadShard.cpp @@ -17,15 +17,15 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/ripple/rpc/handlers/Feature1.cpp b/src/xrpld/rpc/handlers/Feature1.cpp similarity index 90% rename from src/ripple/rpc/handlers/Feature1.cpp rename to src/xrpld/rpc/handlers/Feature1.cpp index 94a205e62f7..d4499f120ef 100644 --- a/src/ripple/rpc/handlers/Feature1.cpp +++ b/src/xrpld/rpc/handlers/Feature1.cpp @@ -17,14 +17,14 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/Fee1.cpp b/src/xrpld/rpc/handlers/Fee1.cpp similarity index 83% rename from src/ripple/rpc/handlers/Fee1.cpp rename to src/xrpld/rpc/handlers/Fee1.cpp index 89fa9c6ea07..da766fdbb32 100644 --- a/src/ripple/rpc/handlers/Fee1.cpp +++ b/src/xrpld/rpc/handlers/Fee1.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { Json::Value diff --git a/src/ripple/rpc/handlers/FetchInfo.cpp b/src/xrpld/rpc/handlers/FetchInfo.cpp similarity index 85% rename from src/ripple/rpc/handlers/FetchInfo.cpp rename to src/xrpld/rpc/handlers/FetchInfo.cpp index 79d82b646a0..113ae78a35c 100644 --- a/src/ripple/rpc/handlers/FetchInfo.cpp +++ b/src/xrpld/rpc/handlers/FetchInfo.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/GatewayBalances.cpp b/src/xrpld/rpc/handlers/GatewayBalances.cpp similarity index 95% rename from src/ripple/rpc/handlers/GatewayBalances.cpp rename to src/xrpld/rpc/handlers/GatewayBalances.cpp index 89be6290f77..8fd13d472cc 100644 --- a/src/ripple/rpc/handlers/GatewayBalances.cpp +++ b/src/xrpld/rpc/handlers/GatewayBalances.cpp @@ -17,17 +17,17 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/GetAggregatePrice.cpp b/src/xrpld/rpc/handlers/GetAggregatePrice.cpp similarity index 97% rename from src/ripple/rpc/handlers/GetAggregatePrice.cpp rename to src/xrpld/rpc/handlers/GetAggregatePrice.cpp index 3554ba90c96..7467b94b63f 100644 --- a/src/ripple/rpc/handlers/GetAggregatePrice.cpp +++ b/src/xrpld/rpc/handlers/GetAggregatePrice.cpp @@ -17,14 +17,14 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/rpc/handlers/GetCounts.cpp b/src/xrpld/rpc/handlers/GetCounts.cpp similarity index 88% rename from src/ripple/rpc/handlers/GetCounts.cpp rename to src/xrpld/rpc/handlers/GetCounts.cpp index 131cf7d3614..0a2327e117a 100644 --- a/src/ripple/rpc/handlers/GetCounts.cpp +++ b/src/xrpld/rpc/handlers/GetCounts.cpp @@ -17,22 +17,22 @@ */ //============================================================================== -#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 +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/GetCounts.h b/src/xrpld/rpc/handlers/GetCounts.h similarity index 94% rename from src/ripple/rpc/handlers/GetCounts.h rename to src/xrpld/rpc/handlers/GetCounts.h index 28a3e7d0604..dacf93fa910 100644 --- a/src/ripple/rpc/handlers/GetCounts.h +++ b/src/xrpld/rpc/handlers/GetCounts.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_RPC_HANDLERS_GETCOUNTS_H_INCLUDED #define RIPPLE_RPC_HANDLERS_GETCOUNTS_H_INCLUDED -#include -#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/Handlers.h b/src/xrpld/rpc/handlers/Handlers.h similarity index 98% rename from src/ripple/rpc/handlers/Handlers.h rename to src/xrpld/rpc/handlers/Handlers.h index 6c74c5c7e5c..917ad38a741 100644 --- a/src/ripple/rpc/handlers/Handlers.h +++ b/src/xrpld/rpc/handlers/Handlers.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_RPC_HANDLERS_HANDLERS_H_INCLUDED #define RIPPLE_RPC_HANDLERS_HANDLERS_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/LedgerAccept.cpp b/src/xrpld/rpc/handlers/LedgerAccept.cpp similarity index 82% rename from src/ripple/rpc/handlers/LedgerAccept.cpp rename to src/xrpld/rpc/handlers/LedgerAccept.cpp index 14177791164..742a84fbb4e 100644 --- a/src/ripple/rpc/handlers/LedgerAccept.cpp +++ b/src/xrpld/rpc/handlers/LedgerAccept.cpp @@ -17,15 +17,15 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/ripple/rpc/handlers/LedgerCleanerHandler.cpp b/src/xrpld/rpc/handlers/LedgerCleanerHandler.cpp similarity index 86% rename from src/ripple/rpc/handlers/LedgerCleanerHandler.cpp rename to src/xrpld/rpc/handlers/LedgerCleanerHandler.cpp index 5b76f3f8b9d..48f024c051e 100644 --- a/src/ripple/rpc/handlers/LedgerCleanerHandler.cpp +++ b/src/xrpld/rpc/handlers/LedgerCleanerHandler.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/LedgerClosed.cpp b/src/xrpld/rpc/handlers/LedgerClosed.cpp similarity index 88% rename from src/ripple/rpc/handlers/LedgerClosed.cpp rename to src/xrpld/rpc/handlers/LedgerClosed.cpp index 66e003e08f5..9bc9315f648 100644 --- a/src/ripple/rpc/handlers/LedgerClosed.cpp +++ b/src/xrpld/rpc/handlers/LedgerClosed.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/LedgerCurrent.cpp b/src/xrpld/rpc/handlers/LedgerCurrent.cpp similarity index 85% rename from src/ripple/rpc/handlers/LedgerCurrent.cpp rename to src/xrpld/rpc/handlers/LedgerCurrent.cpp index 3539c800946..7f1d83c17a7 100644 --- a/src/ripple/rpc/handlers/LedgerCurrent.cpp +++ b/src/xrpld/rpc/handlers/LedgerCurrent.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/LedgerData.cpp b/src/xrpld/rpc/handlers/LedgerData.cpp similarity index 94% rename from src/ripple/rpc/handlers/LedgerData.cpp rename to src/xrpld/rpc/handlers/LedgerData.cpp index f5433945772..ad26b83b43b 100644 --- a/src/ripple/rpc/handlers/LedgerData.cpp +++ b/src/xrpld/rpc/handlers/LedgerData.cpp @@ -17,16 +17,16 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/LedgerDiff.cpp b/src/xrpld/rpc/handlers/LedgerDiff.cpp similarity index 97% rename from src/ripple/rpc/handlers/LedgerDiff.cpp rename to src/xrpld/rpc/handlers/LedgerDiff.cpp index 122dcfa31d5..6398be60973 100644 --- a/src/ripple/rpc/handlers/LedgerDiff.cpp +++ b/src/xrpld/rpc/handlers/LedgerDiff.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include namespace ripple { std::pair diff --git a/src/ripple/rpc/handlers/LedgerEntry.cpp b/src/xrpld/rpc/handlers/LedgerEntry.cpp similarity index 98% rename from src/ripple/rpc/handlers/LedgerEntry.cpp rename to src/xrpld/rpc/handlers/LedgerEntry.cpp index 8985a880824..f461cd3100b 100644 --- a/src/ripple/rpc/handlers/LedgerEntry.cpp +++ b/src/xrpld/rpc/handlers/LedgerEntry.cpp @@ -17,20 +17,20 @@ */ //============================================================================== -#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 namespace ripple { diff --git a/src/ripple/rpc/handlers/LedgerHandler.cpp b/src/xrpld/rpc/handlers/LedgerHandler.cpp similarity index 97% rename from src/ripple/rpc/handlers/LedgerHandler.cpp rename to src/xrpld/rpc/handlers/LedgerHandler.cpp index 623cb8d75ac..6d695abc85f 100644 --- a/src/ripple/rpc/handlers/LedgerHandler.cpp +++ b/src/xrpld/rpc/handlers/LedgerHandler.cpp @@ -17,16 +17,16 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { namespace RPC { diff --git a/src/ripple/rpc/handlers/LedgerHandler.h b/src/xrpld/rpc/handlers/LedgerHandler.h similarity index 87% rename from src/ripple/rpc/handlers/LedgerHandler.h rename to src/xrpld/rpc/handlers/LedgerHandler.h index b0bca8e6635..0a1ba2b427e 100644 --- a/src/ripple/rpc/handlers/LedgerHandler.h +++ b/src/xrpld/rpc/handlers/LedgerHandler.h @@ -20,17 +20,17 @@ #ifndef RIPPLE_RPC_HANDLERS_LEDGER_H_INCLUDED #define RIPPLE_RPC_HANDLERS_LEDGER_H_INCLUDED -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace Json { class Object; diff --git a/src/ripple/rpc/handlers/LedgerHeader.cpp b/src/xrpld/rpc/handlers/LedgerHeader.cpp similarity index 89% rename from src/ripple/rpc/handlers/LedgerHeader.cpp rename to src/xrpld/rpc/handlers/LedgerHeader.cpp index 0f44436569c..b73ee260d4a 100644 --- a/src/ripple/rpc/handlers/LedgerHeader.cpp +++ b/src/xrpld/rpc/handlers/LedgerHeader.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/LedgerRequest.cpp b/src/xrpld/rpc/handlers/LedgerRequest.cpp similarity index 78% rename from src/ripple/rpc/handlers/LedgerRequest.cpp rename to src/xrpld/rpc/handlers/LedgerRequest.cpp index 83e7a2184f1..8f79bb04f30 100644 --- a/src/ripple/rpc/handlers/LedgerRequest.cpp +++ b/src/xrpld/rpc/handlers/LedgerRequest.cpp @@ -17,17 +17,17 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/rpc/handlers/LogLevel.cpp b/src/xrpld/rpc/handlers/LogLevel.cpp similarity index 91% rename from src/ripple/rpc/handlers/LogLevel.cpp rename to src/xrpld/rpc/handlers/LogLevel.cpp index 20931898d20..bf0a0e1e285 100644 --- a/src/ripple/rpc/handlers/LogLevel.cpp +++ b/src/xrpld/rpc/handlers/LogLevel.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/rpc/handlers/LogRotate.cpp b/src/xrpld/rpc/handlers/LogRotate.cpp similarity index 89% rename from src/ripple/rpc/handlers/LogRotate.cpp rename to src/xrpld/rpc/handlers/LogRotate.cpp index 93e66451f5d..b7a887b0e27 100644 --- a/src/ripple/rpc/handlers/LogRotate.cpp +++ b/src/xrpld/rpc/handlers/LogRotate.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include -#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/Manifest.cpp b/src/xrpld/rpc/handlers/Manifest.cpp similarity index 91% rename from src/ripple/rpc/handlers/Manifest.cpp rename to src/xrpld/rpc/handlers/Manifest.cpp index 22abfde8a24..700d6ab39df 100644 --- a/src/ripple/rpc/handlers/Manifest.cpp +++ b/src/xrpld/rpc/handlers/Manifest.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { Json::Value diff --git a/src/ripple/rpc/handlers/NFTOffers.cpp b/src/xrpld/rpc/handlers/NFTOffers.cpp similarity index 92% rename from src/ripple/rpc/handlers/NFTOffers.cpp rename to src/xrpld/rpc/handlers/NFTOffers.cpp index bca862d27e3..bffb3dfbb60 100644 --- a/src/ripple/rpc/handlers/NFTOffers.cpp +++ b/src/xrpld/rpc/handlers/NFTOffers.cpp @@ -17,17 +17,17 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/NoRippleCheck.cpp b/src/xrpld/rpc/handlers/NoRippleCheck.cpp similarity index 94% rename from src/ripple/rpc/handlers/NoRippleCheck.cpp rename to src/xrpld/rpc/handlers/NoRippleCheck.cpp index 91d69df96bd..e4012468434 100644 --- a/src/ripple/rpc/handlers/NoRippleCheck.cpp +++ b/src/xrpld/rpc/handlers/NoRippleCheck.cpp @@ -17,17 +17,17 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/NodeToShard.cpp b/src/xrpld/rpc/handlers/NodeToShard.cpp similarity index 89% rename from src/ripple/rpc/handlers/NodeToShard.cpp rename to src/xrpld/rpc/handlers/NodeToShard.cpp index 552900d1548..917086ab0f4 100644 --- a/src/ripple/rpc/handlers/NodeToShard.cpp +++ b/src/xrpld/rpc/handlers/NodeToShard.cpp @@ -17,14 +17,14 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/OwnerInfo.cpp b/src/xrpld/rpc/handlers/OwnerInfo.cpp similarity index 87% rename from src/ripple/rpc/handlers/OwnerInfo.cpp rename to src/xrpld/rpc/handlers/OwnerInfo.cpp index 546a2e70980..83bf8b0ef21 100644 --- a/src/ripple/rpc/handlers/OwnerInfo.cpp +++ b/src/xrpld/rpc/handlers/OwnerInfo.cpp @@ -17,14 +17,14 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/PathFind.cpp b/src/xrpld/rpc/handlers/PathFind.cpp similarity index 87% rename from src/ripple/rpc/handlers/PathFind.cpp rename to src/xrpld/rpc/handlers/PathFind.cpp index 9c8794b5997..cab14f9b52e 100644 --- a/src/ripple/rpc/handlers/PathFind.cpp +++ b/src/xrpld/rpc/handlers/PathFind.cpp @@ -17,15 +17,15 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/PayChanClaim.cpp b/src/xrpld/rpc/handlers/PayChanClaim.cpp similarity index 91% rename from src/ripple/rpc/handlers/PayChanClaim.cpp rename to src/xrpld/rpc/handlers/PayChanClaim.cpp index 33561463f21..1fecd5f1449 100644 --- a/src/ripple/rpc/handlers/PayChanClaim.cpp +++ b/src/xrpld/rpc/handlers/PayChanClaim.cpp @@ -17,18 +17,18 @@ */ //============================================================================== -#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/rpc/handlers/Peers.cpp b/src/xrpld/rpc/handlers/Peers.cpp similarity index 90% rename from src/ripple/rpc/handlers/Peers.cpp rename to src/xrpld/rpc/handlers/Peers.cpp index 4f377da7277..718070ec927 100644 --- a/src/ripple/rpc/handlers/Peers.cpp +++ b/src/xrpld/rpc/handlers/Peers.cpp @@ -17,14 +17,14 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/Ping.cpp b/src/xrpld/rpc/handlers/Ping.cpp similarity index 93% rename from src/ripple/rpc/handlers/Ping.cpp rename to src/xrpld/rpc/handlers/Ping.cpp index efe9063a1e2..cb0dabcb9de 100644 --- a/src/ripple/rpc/handlers/Ping.cpp +++ b/src/xrpld/rpc/handlers/Ping.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include -#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/Print.cpp b/src/xrpld/rpc/handlers/Print.cpp similarity index 88% rename from src/ripple/rpc/handlers/Print.cpp rename to src/xrpld/rpc/handlers/Print.cpp index 191ecf1ec54..df501240882 100644 --- a/src/ripple/rpc/handlers/Print.cpp +++ b/src/xrpld/rpc/handlers/Print.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/Random.cpp b/src/xrpld/rpc/handlers/Random.cpp similarity index 86% rename from src/ripple/rpc/handlers/Random.cpp rename to src/xrpld/rpc/handlers/Random.cpp index 5362969660a..cea83a616c2 100644 --- a/src/ripple/rpc/handlers/Random.cpp +++ b/src/xrpld/rpc/handlers/Random.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/Reservations.cpp b/src/xrpld/rpc/handlers/Reservations.cpp similarity index 94% rename from src/ripple/rpc/handlers/Reservations.cpp rename to src/xrpld/rpc/handlers/Reservations.cpp index ffbfd0f98bf..57a8fb3664a 100644 --- a/src/ripple/rpc/handlers/Reservations.cpp +++ b/src/xrpld/rpc/handlers/Reservations.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/rpc/handlers/RipplePathFind.cpp b/src/xrpld/rpc/handlers/RipplePathFind.cpp similarity index 96% rename from src/ripple/rpc/handlers/RipplePathFind.cpp rename to src/xrpld/rpc/handlers/RipplePathFind.cpp index 19bce998494..5e18a1210e9 100644 --- a/src/ripple/rpc/handlers/RipplePathFind.cpp +++ b/src/xrpld/rpc/handlers/RipplePathFind.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/ServerInfo.cpp b/src/xrpld/rpc/handlers/ServerInfo.cpp similarity index 94% rename from src/ripple/rpc/handlers/ServerInfo.cpp rename to src/xrpld/rpc/handlers/ServerInfo.cpp index 83c73e20558..769974985da 100644 --- a/src/ripple/rpc/handlers/ServerInfo.cpp +++ b/src/xrpld/rpc/handlers/ServerInfo.cpp @@ -17,20 +17,20 @@ */ //============================================================================== -#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/rpc/handlers/ServerState.cpp b/src/xrpld/rpc/handlers/ServerState.cpp similarity index 84% rename from src/ripple/rpc/handlers/ServerState.cpp rename to src/xrpld/rpc/handlers/ServerState.cpp index 756a3953968..dec18eca119 100644 --- a/src/ripple/rpc/handlers/ServerState.cpp +++ b/src/xrpld/rpc/handlers/ServerState.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/SignFor.cpp b/src/xrpld/rpc/handlers/SignFor.cpp similarity index 89% rename from src/ripple/rpc/handlers/SignFor.cpp rename to src/xrpld/rpc/handlers/SignFor.cpp index 722cf7da157..da8ff869fba 100644 --- a/src/ripple/rpc/handlers/SignFor.cpp +++ b/src/xrpld/rpc/handlers/SignFor.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/SignHandler.cpp b/src/xrpld/rpc/handlers/SignHandler.cpp similarity index 91% rename from src/ripple/rpc/handlers/SignHandler.cpp rename to src/xrpld/rpc/handlers/SignHandler.cpp index 4d89cdcb2e0..ed634161f74 100644 --- a/src/ripple/rpc/handlers/SignHandler.cpp +++ b/src/xrpld/rpc/handlers/SignHandler.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/Stop.cpp b/src/xrpld/rpc/handlers/Stop.cpp similarity index 91% rename from src/ripple/rpc/handlers/Stop.cpp rename to src/xrpld/rpc/handlers/Stop.cpp index 9467556969d..ea37a1aaa1b 100644 --- a/src/ripple/rpc/handlers/Stop.cpp +++ b/src/xrpld/rpc/handlers/Stop.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include -#include +#include +#include +#include #include diff --git a/src/ripple/rpc/handlers/Submit.cpp b/src/xrpld/rpc/handlers/Submit.cpp similarity index 93% rename from src/ripple/rpc/handlers/Submit.cpp rename to src/xrpld/rpc/handlers/Submit.cpp index a151778fbb8..73fdc3822c2 100644 --- a/src/ripple/rpc/handlers/Submit.cpp +++ b/src/xrpld/rpc/handlers/Submit.cpp @@ -17,17 +17,17 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/SubmitMultiSigned.cpp b/src/xrpld/rpc/handlers/SubmitMultiSigned.cpp similarity index 87% rename from src/ripple/rpc/handlers/SubmitMultiSigned.cpp rename to src/xrpld/rpc/handlers/SubmitMultiSigned.cpp index 5b9d5b34ac6..9949d3e3212 100644 --- a/src/ripple/rpc/handlers/SubmitMultiSigned.cpp +++ b/src/xrpld/rpc/handlers/SubmitMultiSigned.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/Subscribe.cpp b/src/xrpld/rpc/handlers/Subscribe.cpp similarity index 96% rename from src/ripple/rpc/handlers/Subscribe.cpp rename to src/xrpld/rpc/handlers/Subscribe.cpp index 24465a2c3a5..9f9181e1ab2 100644 --- a/src/ripple/rpc/handlers/Subscribe.cpp +++ b/src/xrpld/rpc/handlers/Subscribe.cpp @@ -17,19 +17,19 @@ */ //============================================================================== -#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 namespace ripple { diff --git a/src/ripple/rpc/handlers/TransactionEntry.cpp b/src/xrpld/rpc/handlers/TransactionEntry.cpp similarity index 93% rename from src/ripple/rpc/handlers/TransactionEntry.cpp rename to src/xrpld/rpc/handlers/TransactionEntry.cpp index 6d157891d1c..e81e0434595 100644 --- a/src/ripple/rpc/handlers/TransactionEntry.cpp +++ b/src/xrpld/rpc/handlers/TransactionEntry.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/Tx.cpp b/src/xrpld/rpc/handlers/Tx.cpp similarity index 95% rename from src/ripple/rpc/handlers/Tx.cpp rename to src/xrpld/rpc/handlers/Tx.cpp index d4c9c95a341..de95044b71f 100644 --- a/src/ripple/rpc/handlers/Tx.cpp +++ b/src/xrpld/rpc/handlers/Tx.cpp @@ -17,22 +17,22 @@ */ //============================================================================== -#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 +#include +#include #include #include diff --git a/src/ripple/rpc/handlers/TxHistory.cpp b/src/xrpld/rpc/handlers/TxHistory.cpp similarity index 79% rename from src/ripple/rpc/handlers/TxHistory.cpp rename to src/xrpld/rpc/handlers/TxHistory.cpp index 8759d4af1b9..de86b182534 100644 --- a/src/ripple/rpc/handlers/TxHistory.cpp +++ b/src/xrpld/rpc/handlers/TxHistory.cpp @@ -17,21 +17,21 @@ */ //============================================================================== -#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 #include namespace ripple { diff --git a/src/ripple/rpc/handlers/TxReduceRelay.cpp b/src/xrpld/rpc/handlers/TxReduceRelay.cpp similarity index 89% rename from src/ripple/rpc/handlers/TxReduceRelay.cpp rename to src/xrpld/rpc/handlers/TxReduceRelay.cpp index bb883b8dea1..d8c21b3fa46 100644 --- a/src/ripple/rpc/handlers/TxReduceRelay.cpp +++ b/src/xrpld/rpc/handlers/TxReduceRelay.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include -#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/UnlList.cpp b/src/xrpld/rpc/handlers/UnlList.cpp similarity index 88% rename from src/ripple/rpc/handlers/UnlList.cpp rename to src/xrpld/rpc/handlers/UnlList.cpp index 0dc4dfc3776..78bd3f14eab 100644 --- a/src/ripple/rpc/handlers/UnlList.cpp +++ b/src/xrpld/rpc/handlers/UnlList.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/Unsubscribe.cpp b/src/xrpld/rpc/handlers/Unsubscribe.cpp similarity index 96% rename from src/ripple/rpc/handlers/Unsubscribe.cpp rename to src/xrpld/rpc/handlers/Unsubscribe.cpp index 512790f2a10..bab0d99744c 100644 --- a/src/ripple/rpc/handlers/Unsubscribe.cpp +++ b/src/xrpld/rpc/handlers/Unsubscribe.cpp @@ -17,14 +17,14 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/ValidationCreate.cpp b/src/xrpld/rpc/handlers/ValidationCreate.cpp similarity index 91% rename from src/ripple/rpc/handlers/ValidationCreate.cpp rename to src/xrpld/rpc/handlers/ValidationCreate.cpp index f07cbe9cdfa..ce53f84d951 100644 --- a/src/ripple/rpc/handlers/ValidationCreate.cpp +++ b/src/xrpld/rpc/handlers/ValidationCreate.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/ValidatorInfo.cpp b/src/xrpld/rpc/handlers/ValidatorInfo.cpp similarity index 89% rename from src/ripple/rpc/handlers/ValidatorInfo.cpp rename to src/xrpld/rpc/handlers/ValidatorInfo.cpp index 910c5e9740f..d1a63371980 100644 --- a/src/ripple/rpc/handlers/ValidatorInfo.cpp +++ b/src/xrpld/rpc/handlers/ValidatorInfo.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { Json::Value diff --git a/src/ripple/rpc/handlers/ValidatorListSites.cpp b/src/xrpld/rpc/handlers/ValidatorListSites.cpp similarity index 87% rename from src/ripple/rpc/handlers/ValidatorListSites.cpp rename to src/xrpld/rpc/handlers/ValidatorListSites.cpp index 4800a5e8661..902c373766f 100644 --- a/src/ripple/rpc/handlers/ValidatorListSites.cpp +++ b/src/xrpld/rpc/handlers/ValidatorListSites.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/Validators.cpp b/src/xrpld/rpc/handlers/Validators.cpp similarity index 87% rename from src/ripple/rpc/handlers/Validators.cpp rename to src/xrpld/rpc/handlers/Validators.cpp index 39306612bdf..4048e8962de 100644 --- a/src/ripple/rpc/handlers/Validators.cpp +++ b/src/xrpld/rpc/handlers/Validators.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/Version.h b/src/xrpld/rpc/handlers/Version.h similarity index 97% rename from src/ripple/rpc/handlers/Version.h rename to src/xrpld/rpc/handlers/Version.h index 8f33b62f1cf..4efeed24848 100644 --- a/src/ripple/rpc/handlers/Version.h +++ b/src/xrpld/rpc/handlers/Version.h @@ -20,7 +20,7 @@ #ifndef RIPPLED_RIPPLE_RPC_HANDLERS_VERSION_H #define RIPPLED_RIPPLE_RPC_HANDLERS_VERSION_H -#include +#include namespace ripple { namespace RPC { diff --git a/src/ripple/rpc/handlers/WalletPropose.cpp b/src/xrpld/rpc/handlers/WalletPropose.cpp similarity index 92% rename from src/ripple/rpc/handlers/WalletPropose.cpp rename to src/xrpld/rpc/handlers/WalletPropose.cpp index 25aaa3bbb8e..f3300b9ed04 100644 --- a/src/ripple/rpc/handlers/WalletPropose.cpp +++ b/src/xrpld/rpc/handlers/WalletPropose.cpp @@ -17,17 +17,17 @@ */ //============================================================================== -#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/rpc/handlers/WalletPropose.h b/src/xrpld/rpc/handlers/WalletPropose.h similarity index 97% rename from src/ripple/rpc/handlers/WalletPropose.h rename to src/xrpld/rpc/handlers/WalletPropose.h index 9da0c9e412f..d09ae9a4cfb 100644 --- a/src/ripple/rpc/handlers/WalletPropose.h +++ b/src/xrpld/rpc/handlers/WalletPropose.h @@ -20,7 +20,7 @@ #ifndef RIPPLED_RIPPLE_RPC_HANDLERS_WALLETPROPOSE_H #define RIPPLED_RIPPLE_RPC_HANDLERS_WALLETPROPOSE_H -#include +#include namespace ripple { diff --git a/src/ripple/rpc/json_body.h b/src/xrpld/rpc/json_body.h similarity index 97% rename from src/ripple/rpc/json_body.h rename to src/xrpld/rpc/json_body.h index fb5289981c0..5c97da43839 100644 --- a/src/ripple/rpc/json_body.h +++ b/src/xrpld/rpc/json_body.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_RPC_JSON_BODY_H #define RIPPLE_RPC_JSON_BODY_H -#include -#include +#include +#include #include #include diff --git a/src/ripple/shamap/Family.h b/src/xrpld/shamap/Family.h similarity index 93% rename from src/ripple/shamap/Family.h rename to src/xrpld/shamap/Family.h index fea5545d31c..730f83483a6 100644 --- a/src/ripple/shamap/Family.h +++ b/src/xrpld/shamap/Family.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_SHAMAP_FAMILY_H_INCLUDED #define RIPPLE_SHAMAP_FAMILY_H_INCLUDED -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/shamap/FullBelowCache.h b/src/xrpld/shamap/FullBelowCache.h similarity index 95% rename from src/ripple/shamap/FullBelowCache.h rename to src/xrpld/shamap/FullBelowCache.h index 6d809d3b951..eed7e6294a0 100644 --- a/src/ripple/shamap/FullBelowCache.h +++ b/src/xrpld/shamap/FullBelowCache.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_SHAMAP_FULLBELOWCACHE_H_INCLUDED #define RIPPLE_SHAMAP_FULLBELOWCACHE_H_INCLUDED -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/shamap/NodeFamily.h b/src/xrpld/shamap/NodeFamily.h similarity index 97% rename from src/ripple/shamap/NodeFamily.h rename to src/xrpld/shamap/NodeFamily.h index f20abccce9d..c540172c374 100644 --- a/src/ripple/shamap/NodeFamily.h +++ b/src/xrpld/shamap/NodeFamily.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_SHAMAP_NODEFAMILY_H_INCLUDED #define RIPPLE_SHAMAP_NODEFAMILY_H_INCLUDED -#include -#include +#include +#include namespace ripple { diff --git a/src/ripple/shamap/README.md b/src/xrpld/shamap/README.md similarity index 100% rename from src/ripple/shamap/README.md rename to src/xrpld/shamap/README.md diff --git a/src/ripple/shamap/SHAMap.h b/src/xrpld/shamap/SHAMap.h similarity index 97% rename from src/ripple/shamap/SHAMap.h rename to src/xrpld/shamap/SHAMap.h index 2d1aa192fc6..a47f1c1c2bc 100644 --- a/src/ripple/shamap/SHAMap.h +++ b/src/xrpld/shamap/SHAMap.h @@ -20,19 +20,19 @@ #ifndef RIPPLE_SHAMAP_SHAMAP_H_INCLUDED #define RIPPLE_SHAMAP_SHAMAP_H_INCLUDED -#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/shamap/SHAMapAccountStateLeafNode.h b/src/xrpld/shamap/SHAMapAccountStateLeafNode.h similarity index 91% rename from src/ripple/shamap/SHAMapAccountStateLeafNode.h rename to src/xrpld/shamap/SHAMapAccountStateLeafNode.h index 45f0c508078..842c1092dd9 100644 --- a/src/ripple/shamap/SHAMapAccountStateLeafNode.h +++ b/src/xrpld/shamap/SHAMapAccountStateLeafNode.h @@ -20,12 +20,12 @@ #ifndef RIPPLE_SHAMAP_SHAMAPACCOUNTSTATELEAFNODE_H_INCLUDED #define RIPPLE_SHAMAP_SHAMAPACCOUNTSTATELEAFNODE_H_INCLUDED -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/shamap/SHAMapAddNode.h b/src/xrpld/shamap/SHAMapAddNode.h similarity index 100% rename from src/ripple/shamap/SHAMapAddNode.h rename to src/xrpld/shamap/SHAMapAddNode.h diff --git a/src/ripple/shamap/SHAMapInnerNode.h b/src/xrpld/shamap/SHAMapInnerNode.h similarity index 95% rename from src/ripple/shamap/SHAMapInnerNode.h rename to src/xrpld/shamap/SHAMapInnerNode.h index 44ac05799f2..d2791915c3c 100644 --- a/src/ripple/shamap/SHAMapInnerNode.h +++ b/src/xrpld/shamap/SHAMapInnerNode.h @@ -20,12 +20,12 @@ #ifndef RIPPLE_SHAMAP_SHAMAPINNERNODE_H_INCLUDED #define RIPPLE_SHAMAP_SHAMAPINNERNODE_H_INCLUDED -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/shamap/SHAMapItem.h b/src/xrpld/shamap/SHAMapItem.h similarity index 96% rename from src/ripple/shamap/SHAMapItem.h rename to src/xrpld/shamap/SHAMapItem.h index 160cc3cb49d..1a1822456e9 100644 --- a/src/ripple/shamap/SHAMapItem.h +++ b/src/xrpld/shamap/SHAMapItem.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_SHAMAP_SHAMAPITEM_H_INCLUDED #define RIPPLE_SHAMAP_SHAMAPITEM_H_INCLUDED -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/shamap/SHAMapLeafNode.h b/src/xrpld/shamap/SHAMapLeafNode.h similarity index 95% rename from src/ripple/shamap/SHAMapLeafNode.h rename to src/xrpld/shamap/SHAMapLeafNode.h index f24d7053cbe..d5d84d3f003 100644 --- a/src/ripple/shamap/SHAMapLeafNode.h +++ b/src/xrpld/shamap/SHAMapLeafNode.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_SHAMAP_SHAMAPLEAFNODE_H_INCLUDED #define RIPPLE_SHAMAP_SHAMAPLEAFNODE_H_INCLUDED -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/ripple/shamap/SHAMapMissingNode.h b/src/xrpld/shamap/SHAMapMissingNode.h similarity index 96% rename from src/ripple/shamap/SHAMapMissingNode.h rename to src/xrpld/shamap/SHAMapMissingNode.h index 811fe5f9615..50aa193b2b6 100644 --- a/src/ripple/shamap/SHAMapMissingNode.h +++ b/src/xrpld/shamap/SHAMapMissingNode.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_SHAMAP_SHAMAPMISSINGNODE_H_INCLUDED #define RIPPLE_SHAMAP_SHAMAPMISSINGNODE_H_INCLUDED -#include -#include +#include +#include #include #include #include diff --git a/src/ripple/shamap/SHAMapNodeID.h b/src/xrpld/shamap/SHAMapNodeID.h similarity index 98% rename from src/ripple/shamap/SHAMapNodeID.h rename to src/xrpld/shamap/SHAMapNodeID.h index 00ca33ac43f..176553fd7d3 100644 --- a/src/ripple/shamap/SHAMapNodeID.h +++ b/src/xrpld/shamap/SHAMapNodeID.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_SHAMAP_SHAMAPNODEID_H_INCLUDED #define RIPPLE_SHAMAP_SHAMAPNODEID_H_INCLUDED -#include -#include +#include +#include #include #include #include diff --git a/src/ripple/shamap/SHAMapSyncFilter.h b/src/xrpld/shamap/SHAMapSyncFilter.h similarity index 95% rename from src/ripple/shamap/SHAMapSyncFilter.h rename to src/xrpld/shamap/SHAMapSyncFilter.h index 37eda4fdbc9..b14effac88b 100644 --- a/src/ripple/shamap/SHAMapSyncFilter.h +++ b/src/xrpld/shamap/SHAMapSyncFilter.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_SHAMAP_SHAMAPSYNCFILTER_H_INCLUDED #define RIPPLE_SHAMAP_SHAMAPSYNCFILTER_H_INCLUDED -#include -#include +#include +#include #include /** Callback for filtering SHAMap during sync. */ diff --git a/src/ripple/shamap/SHAMapTreeNode.h b/src/xrpld/shamap/SHAMapTreeNode.h similarity index 95% rename from src/ripple/shamap/SHAMapTreeNode.h rename to src/xrpld/shamap/SHAMapTreeNode.h index 8e351cce9de..d6b0ebce9e1 100644 --- a/src/ripple/shamap/SHAMapTreeNode.h +++ b/src/xrpld/shamap/SHAMapTreeNode.h @@ -20,13 +20,13 @@ #ifndef RIPPLE_SHAMAP_SHAMAPTREENODE_H_INCLUDED #define RIPPLE_SHAMAP_SHAMAPTREENODE_H_INCLUDED -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/shamap/SHAMapTxLeafNode.h b/src/xrpld/shamap/SHAMapTxLeafNode.h similarity index 91% rename from src/ripple/shamap/SHAMapTxLeafNode.h rename to src/xrpld/shamap/SHAMapTxLeafNode.h index e794a1a8f32..f4d3f21e908 100644 --- a/src/ripple/shamap/SHAMapTxLeafNode.h +++ b/src/xrpld/shamap/SHAMapTxLeafNode.h @@ -20,12 +20,12 @@ #ifndef RIPPLE_SHAMAP_SHAMAPTXLEAFNODE_H_INCLUDED #define RIPPLE_SHAMAP_SHAMAPTXLEAFNODE_H_INCLUDED -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/shamap/SHAMapTxPlusMetaLeafNode.h b/src/xrpld/shamap/SHAMapTxPlusMetaLeafNode.h similarity index 91% rename from src/ripple/shamap/SHAMapTxPlusMetaLeafNode.h rename to src/xrpld/shamap/SHAMapTxPlusMetaLeafNode.h index ff32c64e09b..6ea55f4ac46 100644 --- a/src/ripple/shamap/SHAMapTxPlusMetaLeafNode.h +++ b/src/xrpld/shamap/SHAMapTxPlusMetaLeafNode.h @@ -20,12 +20,12 @@ #ifndef RIPPLE_SHAMAP_SHAMAPLEAFTXPLUSMETANODE_H_INCLUDED #define RIPPLE_SHAMAP_SHAMAPLEAFTXPLUSMETANODE_H_INCLUDED -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/shamap/ShardFamily.h b/src/xrpld/shamap/ShardFamily.h similarity index 97% rename from src/ripple/shamap/ShardFamily.h rename to src/xrpld/shamap/ShardFamily.h index de809cf589c..2e8bece6dcf 100644 --- a/src/ripple/shamap/ShardFamily.h +++ b/src/xrpld/shamap/ShardFamily.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_SHAMAP_SHARDFAMILY_H_INCLUDED #define RIPPLE_SHAMAP_SHARDFAMILY_H_INCLUDED -#include -#include +#include +#include namespace ripple { diff --git a/src/ripple/shamap/TreeNodeCache.h b/src/xrpld/shamap/TreeNodeCache.h similarity index 96% rename from src/ripple/shamap/TreeNodeCache.h rename to src/xrpld/shamap/TreeNodeCache.h index f35c252f460..f59fdc92801 100644 --- a/src/ripple/shamap/TreeNodeCache.h +++ b/src/xrpld/shamap/TreeNodeCache.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_SHAMAP_TREENODECACHE_H_INCLUDED #define RIPPLE_SHAMAP_TREENODECACHE_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/shamap/impl/NodeFamily.cpp b/src/xrpld/shamap/detail/NodeFamily.cpp similarity index 95% rename from src/ripple/shamap/impl/NodeFamily.cpp rename to src/xrpld/shamap/detail/NodeFamily.cpp index 1752db06a8e..01440a48799 100644 --- a/src/ripple/shamap/impl/NodeFamily.cpp +++ b/src/xrpld/shamap/detail/NodeFamily.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include -#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/shamap/impl/SHAMap.cpp b/src/xrpld/shamap/detail/SHAMap.cpp similarity index 99% rename from src/ripple/shamap/impl/SHAMap.cpp rename to src/xrpld/shamap/detail/SHAMap.cpp index d6348c86c48..e17f9346b85 100644 --- a/src/ripple/shamap/impl/SHAMap.cpp +++ b/src/xrpld/shamap/detail/SHAMap.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/shamap/impl/SHAMapDelta.cpp b/src/xrpld/shamap/detail/SHAMapDelta.cpp similarity index 99% rename from src/ripple/shamap/impl/SHAMapDelta.cpp rename to src/xrpld/shamap/detail/SHAMapDelta.cpp index ab9e329eb30..0dcb861a63f 100644 --- a/src/ripple/shamap/impl/SHAMapDelta.cpp +++ b/src/xrpld/shamap/detail/SHAMapDelta.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include #include #include diff --git a/src/ripple/shamap/impl/SHAMapInnerNode.cpp b/src/xrpld/shamap/detail/SHAMapInnerNode.cpp similarity index 96% rename from src/ripple/shamap/impl/SHAMapInnerNode.cpp rename to src/xrpld/shamap/detail/SHAMapInnerNode.cpp index c9884955914..99155a6401f 100644 --- a/src/ripple/shamap/impl/SHAMapInnerNode.cpp +++ b/src/xrpld/shamap/detail/SHAMapInnerNode.cpp @@ -17,17 +17,17 @@ */ //============================================================================== -#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/shamap/impl/SHAMapLeafNode.cpp b/src/xrpld/shamap/detail/SHAMapLeafNode.cpp similarity index 95% rename from src/ripple/shamap/impl/SHAMapLeafNode.cpp rename to src/xrpld/shamap/detail/SHAMapLeafNode.cpp index 8f634cfad88..972919a9bda 100644 --- a/src/ripple/shamap/impl/SHAMapLeafNode.cpp +++ b/src/xrpld/shamap/detail/SHAMapLeafNode.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include -#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/shamap/impl/SHAMapNodeID.cpp b/src/xrpld/shamap/detail/SHAMapNodeID.cpp similarity index 95% rename from src/ripple/shamap/impl/SHAMapNodeID.cpp rename to src/xrpld/shamap/detail/SHAMapNodeID.cpp index bcbdb7f3311..5cbd095e7a9 100644 --- a/src/ripple/shamap/impl/SHAMapNodeID.cpp +++ b/src/xrpld/shamap/detail/SHAMapNodeID.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/shamap/impl/SHAMapSync.cpp b/src/xrpld/shamap/detail/SHAMapSync.cpp similarity index 99% rename from src/ripple/shamap/impl/SHAMapSync.cpp rename to src/xrpld/shamap/detail/SHAMapSync.cpp index 3f24047eb7a..02d548be24e 100644 --- a/src/ripple/shamap/impl/SHAMapSync.cpp +++ b/src/xrpld/shamap/detail/SHAMapSync.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include -#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/shamap/impl/SHAMapTreeNode.cpp b/src/xrpld/shamap/detail/SHAMapTreeNode.cpp similarity index 90% rename from src/ripple/shamap/impl/SHAMapTreeNode.cpp rename to src/xrpld/shamap/detail/SHAMapTreeNode.cpp index e7645a16a4e..fe5b5377eee 100644 --- a/src/ripple/shamap/impl/SHAMapTreeNode.cpp +++ b/src/xrpld/shamap/detail/SHAMapTreeNode.cpp @@ -17,19 +17,19 @@ */ //============================================================================== -#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/shamap/impl/ShardFamily.cpp b/src/xrpld/shamap/detail/ShardFamily.cpp similarity index 96% rename from src/ripple/shamap/impl/ShardFamily.cpp rename to src/xrpld/shamap/detail/ShardFamily.cpp index f22d4152e2b..aef4c6cde0a 100644 --- a/src/ripple/shamap/impl/ShardFamily.cpp +++ b/src/xrpld/shamap/detail/ShardFamily.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/shamap/impl/TaggedPointer.h b/src/xrpld/shamap/detail/TaggedPointer.h similarity index 98% rename from src/ripple/shamap/impl/TaggedPointer.h rename to src/xrpld/shamap/detail/TaggedPointer.h index afc0ef582ae..48534076548 100644 --- a/src/ripple/shamap/impl/TaggedPointer.h +++ b/src/xrpld/shamap/detail/TaggedPointer.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_SHAMAP_TAGGEDPOINTER_H_INCLUDED #define RIPPLE_SHAMAP_TAGGEDPOINTER_H_INCLUDED -#include +#include #include #include @@ -37,7 +37,7 @@ namespace ripple { low bits. When dereferencing the pointer, these low "tag" bits are set to zero. When accessing the tag bits, the high "pointer" bits are set to zero. - The "pointer" part points to to the equivalent to an array of + The "pointer" part points to the equivalent to an array of `SHAMapHash` followed immediately by an array of `shared_ptr`. The sizes of these arrays are determined by the tag. The tag is an index into an array (`boundaries`, diff --git a/src/ripple/shamap/impl/TaggedPointer.ipp b/src/xrpld/shamap/detail/TaggedPointer.ipp similarity index 98% rename from src/ripple/shamap/impl/TaggedPointer.ipp rename to src/xrpld/shamap/detail/TaggedPointer.ipp index 7cdff6b4944..309913c79c0 100644 --- a/src/ripple/shamap/impl/TaggedPointer.ipp +++ b/src/xrpld/shamap/detail/TaggedPointer.ipp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include -#include +#include +#include +#include #include #include @@ -258,7 +258,7 @@ TaggedPointer::getChildIndex(std::uint16_t isBranch, int i) const // of a child in the array is the number of non-empty children // before it. Since `isBranch_` is a bitset of the stored // children, we simply need to mask out (and set to zero) all - // the bits in `isBranch_` equal to to higher than `i` and count + // the bits in `isBranch_` equal to higher than `i` and count // the bits. // mask sets all the bits >=i to zero and all the bits