From 78d771af3670438089730af591bb5adaed386c30 Mon Sep 17 00:00:00 2001
From: Scott Schurr <scott@ripple.com>
Date: Thu, 27 Feb 2020 10:05:07 -0800
Subject: [PATCH] Remove conditionals for featureTickSize enabled 21Feb2017

---
 src/ripple/app/tx/impl/SetAccount.cpp |  3 ---
 src/ripple/protocol/Feature.h         |  2 +-
 src/ripple/protocol/impl/Feature.cpp  |  2 +-
 src/test/app/Offer_test.cpp           | 16 +---------------
 4 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/src/ripple/app/tx/impl/SetAccount.cpp b/src/ripple/app/tx/impl/SetAccount.cpp
index 93c27a616..93e41f680 100644
--- a/src/ripple/app/tx/impl/SetAccount.cpp
+++ b/src/ripple/app/tx/impl/SetAccount.cpp
@@ -132,9 +132,6 @@ SetAccount::preflight (PreflightContext const& ctx)
     // TickSize
     if (tx.isFieldPresent (sfTickSize))
     {
-        if (!ctx.rules.enabled(featureTickSize))
-            return temDISABLED;
-
         auto uTickSize = tx[sfTickSize];
         if (uTickSize &&
             ((uTickSize < Quality::minTickSize) ||
diff --git a/src/ripple/protocol/Feature.h b/src/ripple/protocol/Feature.h
index b4ef485dc..8e9f789a0 100644
--- a/src/ripple/protocol/Feature.h
+++ b/src/ripple/protocol/Feature.h
@@ -370,7 +370,7 @@ extern uint256 const featureFlow;
 extern uint256 const featureCompareTakerFlowCross;
 extern uint256 const featureFlowCross;
 extern uint256 const retiredCryptoConditions;
-extern uint256 const featureTickSize;
+extern uint256 const retiredTickSize;
 extern uint256 const fix1368;
 extern uint256 const featureEscrow;
 extern uint256 const featureCryptoConditionsSuite;
diff --git a/src/ripple/protocol/impl/Feature.cpp b/src/ripple/protocol/impl/Feature.cpp
index fd041fc60..ba650a8ff 100644
--- a/src/ripple/protocol/impl/Feature.cpp
+++ b/src/ripple/protocol/impl/Feature.cpp
@@ -161,7 +161,7 @@ uint256 const featureFlow = *getRegisteredFeature("Flow");
 uint256 const featureCompareTakerFlowCross = *getRegisteredFeature("CompareTakerFlowCross");
 uint256 const featureFlowCross = *getRegisteredFeature("FlowCross");
 uint256 const retiredCryptoConditions = *getRegisteredFeature("CryptoConditions");
-uint256 const featureTickSize = *getRegisteredFeature("TickSize");
+uint256 const retiredTickSize = *getRegisteredFeature("TickSize");
 uint256 const fix1368 = *getRegisteredFeature("fix1368");
 uint256 const featureEscrow = *getRegisteredFeature("Escrow");
 uint256 const featureCryptoConditionsSuite = *getRegisteredFeature("CryptoConditionsSuite");
diff --git a/src/test/app/Offer_test.cpp b/src/test/app/Offer_test.cpp
index 2012e6b11..97596f1d9 100644
--- a/src/test/app/Offer_test.cpp
+++ b/src/test/app/Offer_test.cpp
@@ -4420,20 +4420,6 @@ public:
 
         using namespace jtx;
 
-        // Should be called with TickSize enabled.
-        BEAST_EXPECT(features[featureTickSize]);
-
-        // Try to set tick size without enabling feature
-        {
-            Env env{*this, features - featureTickSize};
-            auto const gw = Account {"gateway"};
-            env.fund (XRP(10000), gw);
-
-            auto txn = noop(gw);
-            txn[sfTickSize.fieldName] = 0;
-            env(txn, ter(temDISABLED));
-        }
-
         // Try to set tick size out of range
         {
             Env env {*this, features};
@@ -4609,7 +4595,7 @@ public:
         testRCSmoketest (features);
         testSelfAuth (features);
         testDeletedOfferIssuer (features);
-        testTickSize (features | featureTickSize);
+        testTickSize (features);
     }
 
     void run () override