ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-16 17:15:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into ximinez/fixed-ledger-entries

Browse Source
This commit is contained in:
Ed Hennis
2025-10-22 11:38:53 -04:00
committed by GitHub
parent c86bfa32f7 7c39c810eb
commit bfeb60d3f5
3 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/xrpl/protocol/detail/features.macro
View File

@@ -117,7 +117,6 @@ XRPL_FIX (1543, Supported::yes, VoteBehavior::DefaultYe
XRPL_FIX (1571, Supported::yes, VoteBehavior::DefaultYes) XRPL_FIX (1571, Supported::yes, VoteBehavior::DefaultYes)
XRPL_FEATURE(Checks, Supported::yes, VoteBehavior::DefaultYes) XRPL_FEATURE(Checks, Supported::yes, VoteBehavior::DefaultYes)
XRPL_FEATURE(DepositAuth, Supported::yes, VoteBehavior::DefaultYes) XRPL_FEATURE(DepositAuth, Supported::yes, VoteBehavior::DefaultYes)
XRPL_FIX (1513, Supported::yes, VoteBehavior::DefaultYes)
XRPL_FEATURE(Flow, Supported::yes, VoteBehavior::DefaultYes) XRPL_FEATURE(Flow, Supported::yes, VoteBehavior::DefaultYes)
// The following amendments are obsolete, but must remain supported // The following amendments are obsolete, but must remain supported
@@ -156,3 +155,4 @@ XRPL_RETIRE(fix1512)
XRPL_RETIRE(fix1523) XRPL_RETIRE(fix1523)
XRPL_RETIRE(fix1528) XRPL_RETIRE(fix1528)
XRPL_RETIRE(FlowCross) XRPL_RETIRE(FlowCross)
XRPL_RETIRE(fix1513)

3
src/test/app/Flow_test.cpp
View File

@@ -1346,14 +1346,11 @@ struct Flow_manual_test : public Flow_test
{ {
using namespace jtx; using namespace jtx;
auto const all = testable_amendments(); auto const all = testable_amendments();
FeatureBitset const f1513{fix1513};
FeatureBitset const permDex{featurePermissionedDEX}; FeatureBitset const permDex{featurePermissionedDEX};
testWithFeats(all - f1513 - permDex);
testWithFeats(all - permDex); testWithFeats(all - permDex);
testWithFeats(all); testWithFeats(all);
testEmptyStrand(all - f1513 - permDex);
testEmptyStrand(all - permDex); testEmptyStrand(all - permDex);
testEmptyStrand(all); testEmptyStrand(all);
} }

3
src/test/app/Offer_test.cpp
View File

@@ -5450,13 +5450,12 @@ class Offer_manual_test : public OfferBaseUtil_test
{ {
using namespace jtx; using namespace jtx;
FeatureBitset const all{testable_amendments()}; FeatureBitset const all{testable_amendments()};
FeatureBitset const f1513{fix1513};
FeatureBitset const immediateOfferKilled{featureImmediateOfferKilled}; FeatureBitset const immediateOfferKilled{featureImmediateOfferKilled};
FeatureBitset const takerDryOffer{fixTakerDryOfferRemoval}; FeatureBitset const takerDryOffer{fixTakerDryOfferRemoval};
FeatureBitset const fillOrKill{fixFillOrKill}; FeatureBitset const fillOrKill{fixFillOrKill};
FeatureBitset const permDEX{featurePermissionedDEX}; FeatureBitset const permDEX{featurePermissionedDEX};
testAll(all - f1513 - immediateOfferKilled - permDEX); testAll(all - immediateOfferKilled - permDEX);
testAll(all - immediateOfferKilled - fillOrKill - permDEX); testAll(all - immediateOfferKilled - fillOrKill - permDEX);
testAll(all - fillOrKill - permDEX); testAll(all - fillOrKill - permDEX);
testAll(all - permDEX); testAll(all - permDEX);