From abb800c9c6fffd9f8555eb09a74303f431bb7053 Mon Sep 17 00:00:00 2001 From: JCW Date: Thu, 12 Mar 2026 18:35:21 +0000 Subject: [PATCH] Revert some unnecessary changes Signed-off-by: JCW --- src/test/app/FeeVote_test.cpp | 94 ++++++++++++++++--------- src/test/app/LedgerHistory_test.cpp | 8 ++- src/test/app/RCLValidations_test.cpp | 10 +-- src/test/app/Regression_test.cpp | 8 ++- src/test/consensus/NegativeUNL_test.cpp | 22 +++--- src/test/ledger/SkipList_test.cpp | 10 +-- src/test/ledger/View_test.cpp | 37 ++++++---- 7 files changed, 118 insertions(+), 71 deletions(-) diff --git a/src/test/app/FeeVote_test.cpp b/src/test/app/FeeVote_test.cpp index 2c3e3b7d2a..ed254ebd1c 100644 --- a/src/test/app/FeeVote_test.cpp +++ b/src/test/app/FeeVote_test.cpp @@ -249,10 +249,12 @@ class FeeVote_test : public beast::unit_test::suite // Test with XRPFees disabled (legacy format) { jtx::Env env(*this, jtx::testable_amendments() - featureXRPFees); - Rules const rules{env.app().config().features}; - Fees const fees = env.app().config().FEES.toFees(); auto ledger = std::make_shared( - create_genesis, rules, fees, std::vector{}, env.app().getNodeFamily()); + create_genesis, + Rules{env.app().config().features}, + env.app().config().FEES.toFees(), + std::vector{}, + env.app().getNodeFamily()); // Create the next ledger to apply transaction to ledger = std::make_shared(*ledger, env.app().timeKeeper().closeTime()); @@ -277,10 +279,12 @@ class FeeVote_test : public beast::unit_test::suite // Test with XRPFees enabled (new format) { jtx::Env env(*this, jtx::testable_amendments() | featureXRPFees); - Rules const rules{env.app().config().features}; - Fees const fees = env.app().config().FEES.toFees(); auto ledger = std::make_shared( - create_genesis, rules, fees, std::vector{}, env.app().getNodeFamily()); + create_genesis, + Rules{env.app().config().features}, + env.app().config().FEES.toFees(), + std::vector{}, + env.app().getNodeFamily()); // Create the next ledger to apply transaction to ledger = std::make_shared(*ledger, env.app().timeKeeper().closeTime()); @@ -308,10 +312,12 @@ class FeeVote_test : public beast::unit_test::suite { jtx::Env env(*this, jtx::testable_amendments() - featureXRPFees); - Rules const rules{env.app().config().features}; - Fees const fees = env.app().config().FEES.toFees(); auto ledger = std::make_shared( - create_genesis, rules, fees, std::vector{}, env.app().getNodeFamily()); + create_genesis, + Rules{env.app().config().features}, + env.app().config().FEES.toFees(), + std::vector{}, + env.app().getNodeFamily()); // Create the next ledger to apply transaction to ledger = std::make_shared(*ledger, env.app().timeKeeper().closeTime()); @@ -328,10 +334,12 @@ class FeeVote_test : public beast::unit_test::suite { jtx::Env env(*this, jtx::testable_amendments() | featureXRPFees); - Rules const rules{env.app().config().features}; - Fees const fees = env.app().config().FEES.toFees(); auto ledger = std::make_shared( - create_genesis, rules, fees, std::vector{}, env.app().getNodeFamily()); + create_genesis, + Rules{env.app().config().features}, + env.app().config().FEES.toFees(), + std::vector{}, + env.app().getNodeFamily()); // Create the next ledger to apply transaction to ledger = std::make_shared(*ledger, env.app().timeKeeper().closeTime()); @@ -353,10 +361,12 @@ class FeeVote_test : public beast::unit_test::suite testcase("Pseudo Transaction Properties"); jtx::Env env(*this, jtx::testable_amendments()); - Rules const rules{env.app().config().features}; - Fees const fees = env.app().config().FEES.toFees(); auto ledger = std::make_shared( - create_genesis, rules, fees, std::vector{}, env.app().getNodeFamily()); + create_genesis, + Rules{env.app().config().features}, + env.app().config().FEES.toFees(), + std::vector{}, + env.app().getNodeFamily()); // Create the next ledger to apply transaction to ledger = std::make_shared(*ledger, env.app().timeKeeper().closeTime()); @@ -393,7 +403,11 @@ class FeeVote_test : public beast::unit_test::suite Rules const rules{env.app().config().features}; Fees const fees = env.app().config().FEES.toFees(); auto ledger = std::make_shared( - create_genesis, rules, fees, std::vector{}, env.app().getNodeFamily()); + create_genesis, + Rules{env.app().config().features}, + env.app().config().FEES.toFees(), + std::vector{}, + env.app().getNodeFamily()); ledger = std::make_shared(*ledger, env.app().timeKeeper().closeTime()); @@ -436,10 +450,12 @@ class FeeVote_test : public beast::unit_test::suite testcase("Wrong Ledger Sequence"); jtx::Env env(*this, jtx::testable_amendments() | featureXRPFees); - Rules const rules{env.app().config().features}; - Fees const fees = env.app().config().FEES.toFees(); auto ledger = std::make_shared( - create_genesis, rules, fees, std::vector{}, env.app().getNodeFamily()); + create_genesis, + Rules{env.app().config().features}, + env.app().config().FEES.toFees(), + std::vector{}, + env.app().getNodeFamily()); ledger = std::make_shared(*ledger, env.app().timeKeeper().closeTime()); @@ -465,10 +481,12 @@ class FeeVote_test : public beast::unit_test::suite testcase("Partial Field Updates"); jtx::Env env(*this, jtx::testable_amendments() | featureXRPFees); - Rules const rules{env.app().config().features}; - Fees const fees = env.app().config().FEES.toFees(); auto ledger = std::make_shared( - create_genesis, rules, fees, std::vector{}, env.app().getNodeFamily()); + create_genesis, + Rules{env.app().config().features}, + env.app().config().FEES.toFees(), + std::vector{}, + env.app().getNodeFamily()); ledger = std::make_shared(*ledger, env.app().timeKeeper().closeTime()); @@ -509,10 +527,12 @@ class FeeVote_test : public beast::unit_test::suite testcase("Single Invalid Transaction"); jtx::Env env(*this, jtx::testable_amendments() | featureXRPFees); - Rules const rules{env.app().config().features}; - Fees const fees = env.app().config().FEES.toFees(); auto ledger = std::make_shared( - create_genesis, rules, fees, std::vector{}, env.app().getNodeFamily()); + create_genesis, + Rules{env.app().config().features}, + env.app().config().FEES.toFees(), + std::vector{}, + env.app().getNodeFamily()); ledger = std::make_shared(*ledger, env.app().timeKeeper().closeTime()); @@ -548,10 +568,12 @@ class FeeVote_test : public beast::unit_test::suite Env env(*this, testable_amendments() | featureXRPFees); auto feeVote = make_FeeVote(setup, env.app().journal("FeeVote")); - Rules const rules{env.app().config().features}; - Fees const fees = env.app().config().FEES.toFees(); auto ledger = std::make_shared( - create_genesis, rules, fees, std::vector{}, env.app().getNodeFamily()); + create_genesis, + Rules{env.app().config().features}, + env.app().config().FEES.toFees(), + std::vector{}, + env.app().getNodeFamily()); auto sec = randomSecretKey(); auto pub = derivePublicKey(KeyType::secp256k1, sec); @@ -576,10 +598,12 @@ class FeeVote_test : public beast::unit_test::suite Env env(*this, testable_amendments() - featureXRPFees); auto feeVote = make_FeeVote(setup, env.app().journal("FeeVote")); - Rules const rules{env.app().config().features}; - Fees const fees = env.app().config().FEES.toFees(); auto ledger = std::make_shared( - create_genesis, rules, fees, std::vector{}, env.app().getNodeFamily()); + create_genesis, + Rules{env.app().config().features}, + env.app().config().FEES.toFees(), + std::vector{}, + env.app().getNodeFamily()); auto sec = randomSecretKey(); auto pub = derivePublicKey(KeyType::secp256k1, sec); @@ -619,10 +643,12 @@ class FeeVote_test : public beast::unit_test::suite BEAST_EXPECT(env.current()->fees().increment == XRPAmount{50'000'000}); auto feeVote = make_FeeVote(setup, env.app().journal("FeeVote")); - Rules const rules{env.app().config().features}; - Fees const fees = env.app().config().FEES.toFees(); auto ledger = std::make_shared( - create_genesis, rules, fees, std::vector{}, env.app().getNodeFamily()); + create_genesis, + Rules{env.app().config().features}, + env.app().config().FEES.toFees(), + std::vector{}, + env.app().getNodeFamily()); // doVoting requires a flag ledger (every 256th ledger) // We need to create a ledger at sequence 256 to make it a flag ledger diff --git a/src/test/app/LedgerHistory_test.cpp b/src/test/app/LedgerHistory_test.cpp index d25896ae42..dbc20fe8f2 100644 --- a/src/test/app/LedgerHistory_test.cpp +++ b/src/test/app/LedgerHistory_test.cpp @@ -36,10 +36,12 @@ public: if (!prev) { assert(!stx); - Rules const rules{env.app().config().features}; - Fees const fees = env.app().config().FEES.toFees(); return std::make_shared( - create_genesis, rules, fees, std::vector{}, env.app().getNodeFamily()); + create_genesis, + Rules{env.app().config().features}, + env.app().config().FEES.toFees(), + std::vector{}, + env.app().getNodeFamily()); } auto res = std::make_shared(*prev, prev->header().closeTime + closeOffset); diff --git a/src/test/app/RCLValidations_test.cpp b/src/test/app/RCLValidations_test.cpp index da097f5ae6..3e3df9d19d 100644 --- a/src/test/app/RCLValidations_test.cpp +++ b/src/test/app/RCLValidations_test.cpp @@ -55,11 +55,13 @@ class RCLValidations_test : public beast::unit_test::suite std::vector> history; jtx::Env env(*this); - std::unordered_set> features; - Rules const rules{features}; - Fees const fees{XRPAmount{10}, XRPAmount{10000000}, XRPAmount{2000000}}; + Config config; auto prev = std::make_shared( - create_genesis, rules, fees, std::vector{}, env.app().getNodeFamily()); + create_genesis, + Rules{config.features}, + config.FEES.toFees(), + std::vector{}, + env.app().getNodeFamily()); history.push_back(prev); for (auto i = 0; i < (2 * maxAncestors + 1); ++i) { diff --git a/src/test/app/Regression_test.cpp b/src/test/app/Regression_test.cpp index 4f5884c22d..385d417595 100644 --- a/src/test/app/Regression_test.cpp +++ b/src/test/app/Regression_test.cpp @@ -44,10 +44,12 @@ struct Regression_test : public beast::unit_test::suite // The low balance scenario can not deterministically // be reproduced against an open ledger. Make a local // closed ledger and work with it directly. - Rules const rules{env.app().config().features}; - Fees const fees = env.app().config().FEES.toFees(); auto closed = std::make_shared( - create_genesis, rules, fees, std::vector{}, env.app().getNodeFamily()); + create_genesis, + Rules{env.app().config().features}, + env.app().config().FEES.toFees(), + std::vector{}, + env.app().getNodeFamily()); auto expectedDrops = INITIAL_XRP; BEAST_EXPECT(closed->header().drops == expectedDrops); diff --git a/src/test/consensus/NegativeUNL_test.cpp b/src/test/consensus/NegativeUNL_test.cpp index 70d52c7610..c045a721cf 100644 --- a/src/test/consensus/NegativeUNL_test.cpp +++ b/src/test/consensus/NegativeUNL_test.cpp @@ -210,10 +210,12 @@ class NegativeUNL_test : public beast::unit_test::suite jtx::Env env(*this, jtx::testable_amendments()); std::vector publicKeys = createPublicKeys(3); // genesis ledger - Rules const rules{env.app().config().features}; - Fees const fees = env.app().config().FEES.toFees(); auto l = std::make_shared( - create_genesis, rules, fees, std::vector{}, env.app().getNodeFamily()); + create_genesis, + Rules{env.app().config().features}, + env.app().config().FEES.toFees(), + std::vector{}, + env.app().getNodeFamily()); // Record the public keys and ledger sequences of expected negative UNL // validators when we build the ledger history @@ -543,12 +545,10 @@ struct NetworkHistory createLedgerHistory() { static uint256 fake_amendment; // So we have different genesis ledgers - Rules const rules{env.app().config().features}; - Fees const fees = env.app().config().FEES.toFees(); auto l = std::make_shared( create_genesis, - rules, - fees, + Rules{env.app().config().features}, + env.app().config().FEES.toFees(), std::vector{fake_amendment++}, env.app().getNodeFamily()); history.push_back(l); @@ -1661,10 +1661,12 @@ class NegativeUNLVoteFilterValidations_test : public beast::unit_test::suite { testcase("Filter Validations"); jtx::Env env(*this); - Rules const rules{env.app().config().features}; - Fees const fees = env.app().config().FEES.toFees(); auto l = std::make_shared( - create_genesis, rules, fees, std::vector{}, env.app().getNodeFamily()); + create_genesis, + Rules{env.app().config().features}, + env.app().config().FEES.toFees(), + std::vector{}, + env.app().getNodeFamily()); auto createSTVal = [&](std::pair const& keys) { return std::make_shared( diff --git a/src/test/ledger/SkipList_test.cpp b/src/test/ledger/SkipList_test.cpp index 518ee179bf..9a00b1d3fe 100644 --- a/src/test/ledger/SkipList_test.cpp +++ b/src/test/ledger/SkipList_test.cpp @@ -15,11 +15,13 @@ class SkipList_test : public beast::unit_test::suite jtx::Env env(*this); std::vector> history; { - std::unordered_set> features; - Rules const rules{features}; - Fees const fees{XRPAmount{10}, XRPAmount{10000000}, XRPAmount{2000000}}; + Config config; auto prev = std::make_shared( - create_genesis, rules, fees, std::vector{}, env.app().getNodeFamily()); + create_genesis, + Rules{config.features}, + config.FEES.toFees(), + std::vector{}, + env.app().getNodeFamily()); history.push_back(prev); for (auto i = 0; i < 1023; ++i) { diff --git a/src/test/ledger/View_test.cpp b/src/test/ledger/View_test.cpp index 57abcc73cf..19acab103f 100644 --- a/src/test/ledger/View_test.cpp +++ b/src/test/ledger/View_test.cpp @@ -112,11 +112,13 @@ class View_test : public beast::unit_test::suite using namespace jtx; Env env(*this); - std::unordered_set> features; - Rules const rules{features}; - Fees const fees{XRPAmount{10}, XRPAmount{10000000}, XRPAmount{2000000}}; + Config config; std::shared_ptr const genesis = std::make_shared( - create_genesis, rules, fees, std::vector{}, env.app().getNodeFamily()); + create_genesis, + Rules{config.features}, + config.FEES.toFees(), + std::vector{}, + env.app().getNodeFamily()); auto const ledger = std::make_shared(*genesis, env.app().timeKeeper().closeTime()); wipe(*ledger); ReadView& v = *ledger; @@ -377,10 +379,13 @@ class View_test : public beast::unit_test::suite using namespace jtx; Env env(*this); - Rules const rules{env.app().config().features}; - Fees const fees = env.app().config().FEES.toFees(); + Config config; std::shared_ptr const genesis = std::make_shared( - create_genesis, rules, fees, std::vector{}, env.app().getNodeFamily()); + create_genesis, + Rules{config.features}, + config.FEES.toFees(), + std::vector{}, + env.app().getNodeFamily()); auto const ledger = std::make_shared(*genesis, env.app().timeKeeper().closeTime()); auto setup = [&ledger](std::vector const& vec) { @@ -582,10 +587,13 @@ class View_test : public beast::unit_test::suite using namespace jtx; Env env(*this); - Rules const rules{env.app().config().features}; - Fees const fees = env.app().config().FEES.toFees(); + Config config; std::shared_ptr const genesis = std::make_shared( - create_genesis, rules, fees, std::vector{}, env.app().getNodeFamily()); + create_genesis, + Rules{config.features}, + config.FEES.toFees(), + std::vector{}, + env.app().getNodeFamily()); auto const ledger = std::make_shared(*genesis, env.app().timeKeeper().closeTime()); auto setup123 = [&ledger, this]() { // erase middle element @@ -929,10 +937,13 @@ class View_test : public beast::unit_test::suite // erase the item, apply. { Env env(*this); - Rules const rules{env.app().config().features}; - Fees const fees = env.app().config().FEES.toFees(); + Config config; std::shared_ptr const genesis = std::make_shared( - create_genesis, rules, fees, std::vector{}, env.app().getNodeFamily()); + create_genesis, + Rules{config.features}, + config.FEES.toFees(), + std::vector{}, + env.app().getNodeFamily()); auto const ledger = std::make_shared(*genesis, env.app().timeKeeper().closeTime()); wipe(*ledger);