From c543d4202909508049e1487ee39aa82d50d4e391 Mon Sep 17 00:00:00 2001 From: Denis Angell Date: Mon, 5 Jan 2026 19:00:49 -0500 Subject: [PATCH] change amendment name --- include/xrpl/protocol/detail/features.macro | 2 +- src/test/app/EscrowToken_test.cpp | 6 +++--- src/xrpld/app/tx/detail/Escrow.cpp | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/xrpl/protocol/detail/features.macro b/include/xrpl/protocol/detail/features.macro index 0cbc31f340..4eb251402e 100644 --- a/include/xrpl/protocol/detail/features.macro +++ b/include/xrpl/protocol/detail/features.macro @@ -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) diff --git a/src/test/app/EscrowToken_test.cpp b/src/test/app/EscrowToken_test.cpp index 7aa3c2b77d..f328877b3c 100644 --- a/src/test/app/EscrowToken_test.cpp +++ b/src/test/app/EscrowToken_test.cpp @@ -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); } diff --git a/src/xrpld/app/tx/detail/Escrow.cpp b/src/xrpld/app/tx/detail/Escrow.cpp index ad9ad3521e..bbaf346932 100644 --- a/src/xrpld/app/tx/detail/Escrow.cpp +++ b/src/xrpld/app/tx/detail/Escrow.cpp @@ -1285,10 +1285,10 @@ EscrowCancel::doApply() return escrowUnlockApplyHelper( 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,