From baeaf09ae6e9b4ebdca12565b3f3ff283333304f Mon Sep 17 00:00:00 2001 From: Vito <5780819+Tapanito@users.noreply.github.com> Date: Tue, 31 Mar 2026 18:52:08 +0200 Subject: [PATCH] fix: remove enabled amendments from tests --- src/test/app/AMM_test.cpp | 4 +-- src/test/app/Batch_test.cpp | 3 +- src/test/app/Invariants_test.cpp | 3 +- src/test/app/LoanBroker_test.cpp | 4 +-- src/test/app/Loan_test.cpp | 4 +-- src/test/app/Vault_test.cpp | 42 +++++++++++++-------------- src/test/rpc/GatewayBalances_test.cpp | 2 +- 7 files changed, 27 insertions(+), 35 deletions(-) diff --git a/src/test/app/AMM_test.cpp b/src/test/app/AMM_test.cpp index 704ced2b86..703016ff0d 100644 --- a/src/test/app/AMM_test.cpp +++ b/src/test/app/AMM_test.cpp @@ -59,7 +59,7 @@ private: {}, 0, {}, - {testable_amendments() | featureSingleAssetVault}); + {testable_amendments()}); #endif // XRP to IOU, without featureSingleAssetVault @@ -6734,7 +6734,7 @@ private: }; testCase("tecDUPLICATE", testable_amendments() - featureSingleAssetVault); - testCase("terADDRESS_COLLISION", testable_amendments() | featureSingleAssetVault); + testCase("terADDRESS_COLLISION", testable_amendments()); } void diff --git a/src/test/app/Batch_test.cpp b/src/test/app/Batch_test.cpp index a548eb6b49..0a5bff4e4b 100644 --- a/src/test/app/Batch_test.cpp +++ b/src/test/app/Batch_test.cpp @@ -2608,8 +2608,7 @@ class Batch_test : public beast::unit_test::suite using namespace test::jtx; - test::jtx::Env env{ - *this, features | featureSingleAssetVault | featureLendingProtocol | featureMPTokensV1}; + test::jtx::Env env{*this, features}; Account const issuer{"issuer"}; // For simplicity, lender will be the sole actor for the vault & diff --git a/src/test/app/Invariants_test.cpp b/src/test/app/Invariants_test.cpp index 087c8e50f2..c554d6534d 100644 --- a/src/test/app/Invariants_test.cpp +++ b/src/test/app/Invariants_test.cpp @@ -43,8 +43,7 @@ class Invariants_test : public beast::unit_test::suite static FeatureBitset defaultAmendments() { - return xrpl::test::jtx::testable_amendments() | featureInvariantsV1_1 | - featureSingleAssetVault | fixSecurity3_1_3; + return xrpl::test::jtx::testable_amendments() | featureInvariantsV1_1 | fixSecurity3_1_3; } /** Run a specific test case to put the ledger into a state that will be diff --git a/src/test/app/LoanBroker_test.cpp b/src/test/app/LoanBroker_test.cpp index 361f70209f..bc7ef2e295 100644 --- a/src/test/app/LoanBroker_test.cpp +++ b/src/test/app/LoanBroker_test.cpp @@ -10,9 +10,7 @@ class LoanBroker_test : public beast::unit_test::suite { // Ensure that all the features needed for Lending Protocol are included, // even if they are set to unsupported. - FeatureBitset const all{ - jtx::testable_amendments() | featureMPTokensV1 | featureSingleAssetVault | - featureLendingProtocol}; + FeatureBitset const all{jtx::testable_amendments()}; void testDisabled() diff --git a/src/test/app/Loan_test.cpp b/src/test/app/Loan_test.cpp index 4cdc62853c..fa08eeddb1 100644 --- a/src/test/app/Loan_test.cpp +++ b/src/test/app/Loan_test.cpp @@ -20,9 +20,7 @@ class Loan_test : public beast::unit_test::suite protected: // Ensure that all the features needed for Lending Protocol are included, // even if they are set to unsupported. - FeatureBitset const all{ - jtx::testable_amendments() | featureMPTokensV1 | featureSingleAssetVault | - featureLendingProtocol}; + FeatureBitset const all{jtx::testable_amendments()}; std::string const iouCurrency{"IOU"}; diff --git a/src/test/app/Vault_test.cpp b/src/test/app/Vault_test.cpp index 54cc6646b1..d772a40f3b 100644 --- a/src/test/app/Vault_test.cpp +++ b/src/test/app/Vault_test.cpp @@ -502,7 +502,7 @@ class Vault_test : public beast::unit_test::suite auto testCases = [&, this]( std::string prefix, std::function setup) { - Env env{*this, testable_amendments() | featureSingleAssetVault}; + Env env{*this, testable_amendments()}; Vault vault{env}; env.fund(XRP(1000), issuer, owner, depositor, charlie, dave); @@ -555,7 +555,7 @@ class Vault_test : public beast::unit_test::suite struct CaseArgs { - FeatureBitset features = testable_amendments() | featureSingleAssetVault; + FeatureBitset features = testable_amendments(); }; auto testCase = [&, this]( @@ -768,8 +768,7 @@ class Vault_test : public beast::unit_test::suite env(tx, ter{temDISABLED}); } }, - {.features = - (testable_amendments() | featureSingleAssetVault) - featurePermissionedDomains}); + {.features = (testable_amendments()) - featurePermissionedDomains}); testCase([&](Env& env, Account const& issuer, @@ -1080,7 +1079,7 @@ class Vault_test : public beast::unit_test::suite Account const& depositor, Asset const& asset, Vault& vault)> test) { - Env env{*this, testable_amendments() | featureSingleAssetVault}; + Env env{*this, testable_amendments()}; Account issuer{"issuer"}; Account owner{"owner"}; Account depositor{"depositor"}; @@ -1244,8 +1243,7 @@ class Vault_test : public beast::unit_test::suite { { testcase("IOU fail because MPT is disabled"); - Env env{ - *this, (testable_amendments() - featureMPTokensV1) | featureSingleAssetVault}; + Env env{*this, (testable_amendments() - featureMPTokensV1)}; Account issuer{"issuer"}; Account owner{"owner"}; env.fund(XRP(1000), issuer, owner); @@ -1261,7 +1259,7 @@ class Vault_test : public beast::unit_test::suite { testcase("IOU fail create frozen"); - Env env{*this, testable_amendments() | featureSingleAssetVault}; + Env env{*this, testable_amendments()}; Account issuer{"issuer"}; Account owner{"owner"}; env.fund(XRP(1000), issuer, owner); @@ -1279,7 +1277,7 @@ class Vault_test : public beast::unit_test::suite { testcase("IOU fail create no ripling"); - Env env{*this, testable_amendments() | featureSingleAssetVault}; + Env env{*this, testable_amendments()}; Account issuer{"issuer"}; Account owner{"owner"}; env.fund(XRP(1000), issuer, owner); @@ -1296,7 +1294,7 @@ class Vault_test : public beast::unit_test::suite { testcase("IOU no issuer"); - Env env{*this, testable_amendments() | featureSingleAssetVault}; + Env env{*this, testable_amendments()}; Account issuer{"issuer"}; Account owner{"owner"}; env.fund(XRP(1000), owner); @@ -1314,7 +1312,7 @@ class Vault_test : public beast::unit_test::suite { testcase("IOU fail create vault for AMM LPToken"); - Env env{*this, testable_amendments() | featureSingleAssetVault}; + Env env{*this, testable_amendments()}; Account const gw("gateway"); Account const alice("alice"); Account const carol("carol"); @@ -1376,7 +1374,7 @@ class Vault_test : public beast::unit_test::suite Account const& depositor, Asset const& asset, Vault& vault)> test) { - Env env{*this, testable_amendments() | featureSingleAssetVault}; + Env env{*this, testable_amendments()}; Account issuer{"issuer"}; Account owner{"owner"}; Account depositor{"depositor"}; @@ -1435,7 +1433,7 @@ class Vault_test : public beast::unit_test::suite { using namespace test::jtx; - Env env{*this, testable_amendments() | featureSingleAssetVault}; + Env env{*this, testable_amendments()}; Account issuer{"issuer"}; Account owner{"owner"}; Account depositor{"depositor"}; @@ -1548,7 +1546,7 @@ class Vault_test : public beast::unit_test::suite Vault& vault, MPTTester& mptt)> test, CaseArgs args = {}) { - Env env{*this, testable_amendments() | featureSingleAssetVault}; + Env env{*this, testable_amendments()}; Account issuer{"issuer"}; Account owner{"owner"}; Account depositor{"depositor"}; @@ -2172,7 +2170,7 @@ class Vault_test : public beast::unit_test::suite { testcase("MPT shares to a vault"); - Env env{*this, testable_amendments() | featureSingleAssetVault}; + Env env{*this, testable_amendments()}; Account owner{"owner"}; Account issuer{"issuer"}; env.fund(XRP(1000000), owner, issuer); @@ -2267,7 +2265,7 @@ class Vault_test : public beast::unit_test::suite PrettyAsset const& asset, std::function issuanceId)> test, CaseArgs args = {}) { - Env env{*this, testable_amendments() | featureSingleAssetVault}; + Env env{*this, testable_amendments()}; Account const owner{"owner"}; Account const issuer{"issuer"}; Account const charlie{"charlie"}; @@ -2949,7 +2947,7 @@ class Vault_test : public beast::unit_test::suite testcase("private vault"); - Env env{*this, testable_amendments() | featureSingleAssetVault}; + Env env{*this, testable_amendments()}; Account issuer{"issuer"}; Account owner{"owner"}; Account depositor{"depositor"}; @@ -3197,7 +3195,7 @@ class Vault_test : public beast::unit_test::suite testcase("private XRP vault"); - Env env{*this, testable_amendments() | featureSingleAssetVault}; + Env env{*this, testable_amendments()}; Account owner{"owner"}; Account depositor{"depositor"}; Account alice{"charlie"}; @@ -3294,7 +3292,7 @@ class Vault_test : public beast::unit_test::suite using namespace test::jtx; testcase("fail pseudo-account allocation"); - Env env{*this, testable_amendments() | featureSingleAssetVault}; + Env env{*this, testable_amendments()}; Account const owner{"owner"}; Vault vault{env}; env.fund(XRP(1000), owner); @@ -3337,7 +3335,7 @@ class Vault_test : public beast::unit_test::suite auto testCase = [&, this]( std::uint8_t scale, std::function test) { - Env env{*this, testable_amendments() | featureSingleAssetVault}; + Env env{*this, testable_amendments()}; Account const owner{"owner"}; Account const issuer{"issuer"}; Account const depositor{"depositor"}; @@ -4110,7 +4108,7 @@ class Vault_test : public beast::unit_test::suite using namespace test::jtx; testcase("RPC"); - Env env{*this, testable_amendments() | featureSingleAssetVault}; + Env env{*this, testable_amendments()}; Account const owner{"owner"}; Account const issuer{"issuer"}; Vault vault{env}; @@ -4997,7 +4995,7 @@ class Vault_test : public beast::unit_test::suite using namespace test::jtx; - Env env{*this, testable_amendments() | featureSingleAssetVault}; + Env env{*this, testable_amendments()}; Account const owner{"owner"}; Account const issuer{"issuer"}; diff --git a/src/test/rpc/GatewayBalances_test.cpp b/src/test/rpc/GatewayBalances_test.cpp index 0deb1fc627..9075c48138 100644 --- a/src/test/rpc/GatewayBalances_test.cpp +++ b/src/test/rpc/GatewayBalances_test.cpp @@ -231,7 +231,7 @@ public: using namespace jtx; // Ensure MPT is enabled - FeatureBitset features = testable_amendments() | featureMPTokensV1; + FeatureBitset features = testable_amendments(); Env env(*this, features); Account const alice{"alice"};