refactor: Retire fixTakerDryOfferRemoval amendment (#5958)

Amendments activated for more than 2 years can be retired. This change retires the fixTakerDryOfferRemoval amendment.

include/xrpl/protocol/detail/features.macro

@@ -101,7 +101,6 @@ XRPL_FIX    (QualityUpperBound,          Supported::yes, VoteBehavior::DefaultYe
 XRPL_FEATURE(DeletableAccounts,          Supported::yes, VoteBehavior::DefaultYes)
 XRPL_FIX    (PayChanRecipientOwnerDir,   Supported::yes, VoteBehavior::DefaultYes)
 XRPL_FIX    (MasterKeyAsRegularKey,      Supported::yes, VoteBehavior::DefaultYes)
-XRPL_FIX    (TakerDryOfferRemoval,       Supported::yes, VoteBehavior::DefaultYes)
 XRPL_FEATURE(MultiSignReserve,           Supported::yes, VoteBehavior::DefaultYes)
 XRPL_FEATURE(DepositPreauth,             Supported::yes, VoteBehavior::DefaultYes)
 XRPL_FIX    (1623,                       Supported::yes, VoteBehavior::DefaultYes)
@@ -144,6 +143,7 @@ XRPL_RETIRE(fix1781)
 XRPL_RETIRE(fixCheckThreading)
 XRPL_RETIRE(fixRmSmallIncreasedQOffers)
 XRPL_RETIRE(fixSTAmountCanonicalize)
+XRPL_RETIRE(fixTakerDryOfferRemoval)
 XRPL_RETIRE(CryptoConditions)
 XRPL_RETIRE(Escrow)
 XRPL_RETIRE(EnforceInvariants)

src/test/app/Offer_test.cpp

@@ -5294,14 +5294,12 @@ public:
     {
         using namespace jtx;
         static FeatureBitset const all{testable_amendments()};
-        static FeatureBitset const takerDryOffer{fixTakerDryOfferRemoval};
         static FeatureBitset const immediateOfferKilled{
             featureImmediateOfferKilled};
         FeatureBitset const fillOrKill{fixFillOrKill};
         FeatureBitset const permDEX{featurePermissionedDEX};
 
-        static std::array<FeatureBitset, 6> const feats{
-            all - takerDryOffer - immediateOfferKilled - permDEX,
+        static std::array<FeatureBitset, 5> const feats{
             all - immediateOfferKilled - permDEX,
             all - immediateOfferKilled - fillOrKill - permDEX,
             all - fillOrKill - permDEX,
@@ -5323,7 +5321,7 @@ public:
     }
 };
 
-class OfferWTakerDryOffer_test : public OfferBaseUtil_test
+class OfferWOSmallQOffers_test : public OfferBaseUtil_test
 {
     void
     run() override
@@ -5332,7 +5330,7 @@ class OfferWTakerDryOffer_test : public OfferBaseUtil_test
     }
 };
 
-class OfferWOSmallQOffers_test : public OfferBaseUtil_test
+class OfferWOFillOrKill_test : public OfferBaseUtil_test
 {
     void
     run() override
@@ -5341,7 +5339,7 @@ class OfferWOSmallQOffers_test : public OfferBaseUtil_test
     }
 };
 
-class OfferWOFillOrKill_test : public OfferBaseUtil_test
+class OfferWOPermDEX_test : public OfferBaseUtil_test
 {
     void
     run() override
@@ -5350,21 +5348,12 @@ class OfferWOFillOrKill_test : public OfferBaseUtil_test
     }
 };
 
-class OfferWOPermDEX_test : public OfferBaseUtil_test
-{
-    void
-    run() override
-    {
-        OfferBaseUtil_test::run(4);
-    }
-};
-
 class OfferAllFeatures_test : public OfferBaseUtil_test
 {
     void
     run() override
     {
-        OfferBaseUtil_test::run(5, true);
+        OfferBaseUtil_test::run(4, true);
     }
 };
 
@@ -5376,7 +5365,6 @@ class Offer_manual_test : public OfferBaseUtil_test
         using namespace jtx;
         FeatureBitset const all{testable_amendments()};
         FeatureBitset const immediateOfferKilled{featureImmediateOfferKilled};
-        FeatureBitset const takerDryOffer{fixTakerDryOfferRemoval};
         FeatureBitset const fillOrKill{fixFillOrKill};
         FeatureBitset const permDEX{featurePermissionedDEX};
 
@@ -5385,13 +5373,10 @@ class Offer_manual_test : public OfferBaseUtil_test
         testAll(all - fillOrKill - permDEX);
         testAll(all - permDEX);
         testAll(all);
-
-        testAll(all - takerDryOffer - permDEX);
     }
 };
 
 BEAST_DEFINE_TESTSUITE_PRIO(OfferBaseUtil, app, ripple, 2);
-BEAST_DEFINE_TESTSUITE_PRIO(OfferWTakerDryOffer, app, ripple, 2);
 BEAST_DEFINE_TESTSUITE_PRIO(OfferWOSmallQOffers, app, ripple, 2);
 BEAST_DEFINE_TESTSUITE_PRIO(OfferWOFillOrKill, app, ripple, 2);
 BEAST_DEFINE_TESTSUITE_PRIO(OfferWOPermDEX, app, ripple, 2);

src/test/rpc/Feature_test.cpp

@@ -144,8 +144,8 @@ class Feature_test : public beast::unit_test::suite
         BEAST_EXPECT(featureToName(featureFlow) == "Flow");
         BEAST_EXPECT(featureToName(featureNegativeUNL) == "NegativeUNL");
         BEAST_EXPECT(
-            featureToName(fixTakerDryOfferRemoval) ==
-            "fixTakerDryOfferRemoval");
+            featureToName(fixIncludeKeyletFields) == "fixIncludeKeyletFields");
+        BEAST_EXPECT(featureToName(featureTokenEscrow) == "TokenEscrow");
     }
 
     void