ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2026-04-29 15:37:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert some unnecessary changes

Browse Source 
Signed-off-by: JCW <a1q123456@users.noreply.github.com>
This commit is contained in:
JCW
2026-03-12 18:35:21 +00:00
parent b7c61e046f
commit abb800c9c6
7 changed files with 118 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
src/test/app/FeeVote_test.cpp
View File

@@ -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<Ledger>(
create_genesis, rules, fees, std::vector<uint256>{}, env.app().getNodeFamily());
create_genesis,
Rules{env.app().config().features},
env.app().config().FEES.toFees(),
std::vector<uint256>{},
env.app().getNodeFamily());
// Create the next ledger to apply transaction to
ledger = std::make_shared<Ledger>(*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<Ledger>(
create_genesis, rules, fees, std::vector<uint256>{}, env.app().getNodeFamily());
create_genesis,
Rules{env.app().config().features},
env.app().config().FEES.toFees(),
std::vector<uint256>{},
env.app().getNodeFamily());
// Create the next ledger to apply transaction to
ledger = std::make_shared<Ledger>(*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<Ledger>(
create_genesis, rules, fees, std::vector<uint256>{}, env.app().getNodeFamily());
create_genesis,
Rules{env.app().config().features},
env.app().config().FEES.toFees(),
std::vector<uint256>{},
env.app().getNodeFamily());
// Create the next ledger to apply transaction to
ledger = std::make_shared<Ledger>(*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<Ledger>(
create_genesis, rules, fees, std::vector<uint256>{}, env.app().getNodeFamily());
create_genesis,
Rules{env.app().config().features},
env.app().config().FEES.toFees(),
std::vector<uint256>{},
env.app().getNodeFamily());
// Create the next ledger to apply transaction to
ledger = std::make_shared<Ledger>(*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<Ledger>(
create_genesis, rules, fees, std::vector<uint256>{}, env.app().getNodeFamily());
create_genesis,
Rules{env.app().config().features},
env.app().config().FEES.toFees(),
std::vector<uint256>{},
env.app().getNodeFamily());
// Create the next ledger to apply transaction to
ledger = std::make_shared<Ledger>(*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<Ledger>(
create_genesis, rules, fees, std::vector<uint256>{}, env.app().getNodeFamily());
create_genesis,
Rules{env.app().config().features},
env.app().config().FEES.toFees(),
std::vector<uint256>{},
env.app().getNodeFamily());
ledger = std::make_shared<Ledger>(*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<Ledger>(
create_genesis, rules, fees, std::vector<uint256>{}, env.app().getNodeFamily());
create_genesis,
Rules{env.app().config().features},
env.app().config().FEES.toFees(),
std::vector<uint256>{},
env.app().getNodeFamily());
ledger = std::make_shared<Ledger>(*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<Ledger>(
create_genesis, rules, fees, std::vector<uint256>{}, env.app().getNodeFamily());
create_genesis,
Rules{env.app().config().features},
env.app().config().FEES.toFees(),
std::vector<uint256>{},
env.app().getNodeFamily());
ledger = std::make_shared<Ledger>(*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<Ledger>(
create_genesis, rules, fees, std::vector<uint256>{}, env.app().getNodeFamily());
create_genesis,
Rules{env.app().config().features},
env.app().config().FEES.toFees(),
std::vector<uint256>{},
env.app().getNodeFamily());
ledger = std::make_shared<Ledger>(*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<Ledger>(
create_genesis, rules, fees, std::vector<uint256>{}, env.app().getNodeFamily());
create_genesis,
Rules{env.app().config().features},
env.app().config().FEES.toFees(),
std::vector<uint256>{},
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<Ledger>(
create_genesis, rules, fees, std::vector<uint256>{}, env.app().getNodeFamily());
create_genesis,
Rules{env.app().config().features},
env.app().config().FEES.toFees(),
std::vector<uint256>{},
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<Ledger>(
create_genesis, rules, fees, std::vector<uint256>{}, env.app().getNodeFamily());
create_genesis,
Rules{env.app().config().features},
env.app().config().FEES.toFees(),
std::vector<uint256>{},
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

8
src/test/app/LedgerHistory_test.cpp
View File

@@ -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<Ledger>(
create_genesis, rules, fees, std::vector<uint256>{}, env.app().getNodeFamily());
create_genesis,
Rules{env.app().config().features},
env.app().config().FEES.toFees(),
std::vector<uint256>{},
env.app().getNodeFamily());
}
auto res = std::make_shared<Ledger>(*prev, prev->header().closeTime + closeOffset);

10
src/test/app/RCLValidations_test.cpp
View File

@@ -55,11 +55,13 @@ class RCLValidations_test : public beast::unit_test::suite
std::vector<std::shared_ptr<Ledger const>> history;
jtx::Env env(*this);
std::unordered_set<uint256, beast::uhash<>> features;
Rules const rules{features};
Fees const fees{XRPAmount{10}, XRPAmount{10000000}, XRPAmount{2000000}};
Config config;
auto prev = std::make_shared<Ledger const>(
create_genesis, rules, fees, std::vector<uint256>{}, env.app().getNodeFamily());
create_genesis,
Rules{config.features},
config.FEES.toFees(),
std::vector<uint256>{},
env.app().getNodeFamily());
history.push_back(prev);
for (auto i = 0; i < (2 * maxAncestors + 1); ++i)
{

8
src/test/app/Regression_test.cpp
View File

@@ -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<Ledger>(
create_genesis, rules, fees, std::vector<uint256>{}, env.app().getNodeFamily());
create_genesis,
Rules{env.app().config().features},
env.app().config().FEES.toFees(),
std::vector<uint256>{},
env.app().getNodeFamily());
auto expectedDrops = INITIAL_XRP;
BEAST_EXPECT(closed->header().drops == expectedDrops);

22
src/test/consensus/NegativeUNL_test.cpp
View File

@@ -210,10 +210,12 @@ class NegativeUNL_test : public beast::unit_test::suite
jtx::Env env(*this, jtx::testable_amendments());
std::vector<PublicKey> 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<Ledger>(
create_genesis, rules, fees, std::vector<uint256>{}, env.app().getNodeFamily());
create_genesis,
Rules{env.app().config().features},
env.app().config().FEES.toFees(),
std::vector<uint256>{},
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<Ledger>(
create_genesis,
rules,
fees,
Rules{env.app().config().features},
env.app().config().FEES.toFees(),
std::vector<uint256>{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<Ledger>(
create_genesis, rules, fees, std::vector<uint256>{}, env.app().getNodeFamily());
create_genesis,
Rules{env.app().config().features},
env.app().config().FEES.toFees(),
std::vector<uint256>{},
env.app().getNodeFamily());
auto createSTVal = [&](std::pair<PublicKey, SecretKey> const& keys) {
return std::make_shared<STValidation>(

10
src/test/ledger/SkipList_test.cpp
View File

@@ -15,11 +15,13 @@ class SkipList_test : public beast::unit_test::suite
jtx::Env env(*this);
std::vector<std::shared_ptr<Ledger>> history;
{
std::unordered_set<uint256, beast::uhash<>> features;
Rules const rules{features};
Fees const fees{XRPAmount{10}, XRPAmount{10000000}, XRPAmount{2000000}};
Config config;
auto prev = std::make_shared<Ledger>(
create_genesis, rules, fees, std::vector<uint256>{}, env.app().getNodeFamily());
create_genesis,
Rules{config.features},
config.FEES.toFees(),
std::vector<uint256>{},
env.app().getNodeFamily());
history.push_back(prev);
for (auto i = 0; i < 1023; ++i)
{

37
src/test/ledger/View_test.cpp
View File

@@ -112,11 +112,13 @@ class View_test : public beast::unit_test::suite
using namespace jtx;
Env env(*this);
std::unordered_set<uint256, beast::uhash<>> features;
Rules const rules{features};
Fees const fees{XRPAmount{10}, XRPAmount{10000000}, XRPAmount{2000000}};
Config config;
std::shared_ptr<Ledger const> const genesis = std::make_shared<Ledger>(
create_genesis, rules, fees, std::vector<uint256>{}, env.app().getNodeFamily());
create_genesis,
Rules{config.features},
config.FEES.toFees(),
std::vector<uint256>{},
env.app().getNodeFamily());
auto const ledger = std::make_shared<Ledger>(*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<Ledger const> const genesis = std::make_shared<Ledger>(
create_genesis, rules, fees, std::vector<uint256>{}, env.app().getNodeFamily());
create_genesis,
Rules{config.features},
config.FEES.toFees(),
std::vector<uint256>{},
env.app().getNodeFamily());
auto const ledger = std::make_shared<Ledger>(*genesis, env.app().timeKeeper().closeTime());
auto setup = [&ledger](std::vector<int> 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<Ledger const> const genesis = std::make_shared<Ledger>(
create_genesis, rules, fees, std::vector<uint256>{}, env.app().getNodeFamily());
create_genesis,
Rules{config.features},
config.FEES.toFees(),
std::vector<uint256>{},
env.app().getNodeFamily());
auto const ledger = std::make_shared<Ledger>(*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<Ledger const> const genesis = std::make_shared<Ledger>(
create_genesis, rules, fees, std::vector<uint256>{}, env.app().getNodeFamily());
create_genesis,
Rules{config.features},
config.FEES.toFees(),
std::vector<uint256>{},
env.app().getNodeFamily());
auto const ledger =
std::make_shared<Ledger>(*genesis, env.app().timeKeeper().closeTime());
wipe(*ledger);