ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2026-06-05 09:46:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

change amendment name

Browse Source
This commit is contained in:
Denis Angell
2026-01-05 19:00:49 -05:00
parent 0769bbc20a
commit c543d42029
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,7 +16,7 @@
// Add new amendments to the top of this list.
// Keep it sorted in reverse chronological order.
XRPL_FIX (TokenEscrowV2, Supported::yes, VoteBehavior::DefaultNo)
XRPL_FIX (TokenEscrowV1_1, Supported::yes, VoteBehavior::DefaultNo)
XRPL_FEATURE(LendingProtocol, Supported::no, VoteBehavior::DefaultNo)
XRPL_FEATURE(PermissionDelegationV1_1, Supported::no, VoteBehavior::DefaultNo)
XRPL_FIX (DirectoryLimit, Supported::yes, VoteBehavior::DefaultNo)

6
src/test/app/EscrowToken_test.cpp
View File

@@ -937,7 +937,7 @@ struct EscrowToken_test : public beast::unit_test::suite
// Alice cancels her own escrow
auto const expectedResult =
env.current()->rules().enabled(fixTokenEscrowV2)
env.current()->rules().enabled(fixTokenEscrowV1_1)
? ter(tesSUCCESS)
: ter(tefEXCEPTION);
env(escrow::cancel(alice, alice, seq),
@@ -945,7 +945,7 @@ struct EscrowToken_test : public beast::unit_test::suite
expectedResult);
env.close();
if (env.current()->rules().enabled(fixTokenEscrowV2))
if (env.current()->rules().enabled(fixTokenEscrowV1_1))
{
// Verify the escrow was deleted
BEAST_EXPECT(!env.le(keylet::escrow(alice.id(), seq)));
@@ -4086,7 +4086,7 @@ public:
using namespace test::jtx;
FeatureBitset const all{testable_amendments()};
testIOUWithFeats(all);
testIOUWithFeats(all - fixTokenEscrowV2);
testIOUWithFeats(all - fixTokenEscrowV1_1);
testMPTWithFeats(all);
testMPTWithFeats(all - fixTokenEscrowV1);
}

8
src/xrpld/app/tx/detail/Escrow.cpp
View File

@@ -1285,10 +1285,10 @@ EscrowCancel::doApply()
return escrowUnlockApplyHelper<T>(
ctx_.view(),
parityRate,
// fixTokenEscrowV2: Pass account SLE instead of escrow
// SLE
ctx_.view().rules().enabled(fixTokenEscrowV2) ? sle
: slep,
// fixTokenEscrowV1_1: Pass account SLE instead of
// escrow SLE
ctx_.view().rules().enabled(fixTokenEscrowV1_1) ? sle
: slep,
mPriorBalance,
amount,
issuer,