Fix differences such as LedgerHash that occurred due to NetworkID in ltFeeSettings

This commit is contained in:
tequ
2025-12-01 19:28:23 +09:00
parent b9d966dd32
commit f6fe33103c
6 changed files with 62 additions and 57 deletions

View File

@@ -772,7 +772,7 @@ class Transaction_test : public beast::unit_test::suite
using namespace test::jtx;
using std::to_string;
Env env{*this};
Env env{*this, features};
Account const alice{"alice"};
Account const alie{"alie"};
Account const gw{"gw"};
@@ -821,8 +821,8 @@ class Transaction_test : public beast::unit_test::suite
BEAST_EXPECT(result[jss::result][jss::ledger_index] == 4);
BEAST_EXPECT(
result[jss::result][jss::ledger_hash] ==
"34BBC578F3A4EB6FC6C192C38F99EADD512316B32FA60B425764F1F9602DBB"
"00");
"B41882E20F0EC6228417D28B9AE0F33833645D35F6799DFB782AC97FC4BB51"
"D2");
}
for (auto memberIt = expected.begin(); memberIt != expected.end();
@@ -846,7 +846,7 @@ class Transaction_test : public beast::unit_test::suite
}
void
testBinaryRequest(unsigned apiVersion)
testBinaryRequest(FeatureBitset features, unsigned apiVersion)
{
testcase(
"Test binary request API version " + std::to_string(apiVersion));
@@ -854,16 +854,17 @@ class Transaction_test : public beast::unit_test::suite
using namespace test::jtx;
using std::to_string;
Env env{*this};
Env env{*this, features};
Account const alice{"alice"};
Account const gw{"gw"};
auto const USD{gw["USD"]};
env.fund(XRP(1000000), alice, gw);
std::shared_ptr<STTx const> const txn = env.tx();
BEAST_EXPECT(
to_string(txn->getTransactionID()) ==
"93334A06F509A0E04E908F2E9BA3BD1A00C7B11A91D5EAF20BEF25CE36FCC358");
"3F8BDE5A5F82C4F4708E5E9255B713E303E6E1A371FD5C7A704AFD1387C23981");
env.close();
std::shared_ptr<STObject const> meta =
env.closed()->txRead(txn->getTransactionID()).second;
@@ -897,8 +898,8 @@ class Transaction_test : public beast::unit_test::suite
result[jss::result][jss::meta_blob] == expected_meta_blob);
BEAST_EXPECT(
result[jss::result][jss::ledger_hash] ==
"6BE57FA882745536BF528B09E0BAD3F31FC7CDA0284DDD0E0B97540550"
"FFBECF");
"2D5150E5A5AA436736A732291E437ABF01BC9E206C2DF3C77C4F856915"
"7905AA");
BEAST_EXPECT(
result[jss::result][jss::close_time_iso] ==
"2000-01-01T00:00:10Z");
@@ -918,9 +919,11 @@ public:
run() override
{
using namespace test::jtx;
forAllApiVersions(
std::bind_front(&Transaction_test::testBinaryRequest, this));
forAllApiVersions(std::bind_front(
&Transaction_test::testBinaryRequest,
this,
supported_amendments() - featureXahauGenesis - fixHookAPI20251128));
return;
FeatureBitset const all{supported_amendments()};
testWithFeats(all);
}
@@ -932,8 +935,10 @@ public:
testRangeCTIDRequest(features);
testCTIDValidation(features);
testCTIDRPC(features);
forAllApiVersions(
std::bind_front(&Transaction_test::testRequest, this, features));
forAllApiVersions(std::bind_front(
&Transaction_test::testRequest,
this,
features - featureXahauGenesis - featureTouch));
}
};