From 9f8d648514128c58798bb0c8fb85de317b750722 Mon Sep 17 00:00:00 2001 From: Scott Schurr Date: Fri, 28 Feb 2020 18:13:17 -0800 Subject: [PATCH] Remove conditionals for fix1512 enabled 14Nov2017 --- src/ripple/app/tx/impl/PayChan.cpp | 6 ------ src/ripple/protocol/Feature.h | 2 +- src/ripple/protocol/impl/Feature.cpp | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/ripple/app/tx/impl/PayChan.cpp b/src/ripple/app/tx/impl/PayChan.cpp index 8191993d8..d64a7bb30 100644 --- a/src/ripple/app/tx/impl/PayChan.cpp +++ b/src/ripple/app/tx/impl/PayChan.cpp @@ -384,12 +384,6 @@ PayChanFund::doApply() NotTEC PayChanClaim::preflight (PreflightContext const& ctx) { - // A search through historic MainNet ledgers by the data team found no - // occurrences of a transaction with the error that fix1512 fixed. That - // means there are no old transactions with that error that we might - // need to replay. So the check for fix1512 is removed. Apr 2018. -// bool const noTecs = ctx.rules.enabled(fix1512); - auto const ret = preflight1 (ctx); if (!isTesSuccess (ret)) return ret; diff --git a/src/ripple/protocol/Feature.h b/src/ripple/protocol/Feature.h index 99e7d2ff1..497bcd1fe 100644 --- a/src/ripple/protocol/Feature.h +++ b/src/ripple/protocol/Feature.h @@ -378,7 +378,7 @@ extern uint256 const retiredFix1373; extern uint256 const retiredEnforceInvariants; extern uint256 const retiredSortedDirectories; extern uint256 const fix1201; -extern uint256 const fix1512; +extern uint256 const retiredFix1512; extern uint256 const fix1513; extern uint256 const retiredFix1523; extern uint256 const retiredFix1528; diff --git a/src/ripple/protocol/impl/Feature.cpp b/src/ripple/protocol/impl/Feature.cpp index 682c760ca..65541fa30 100644 --- a/src/ripple/protocol/impl/Feature.cpp +++ b/src/ripple/protocol/impl/Feature.cpp @@ -169,7 +169,7 @@ uint256 const retiredFix1373 = *getRegisteredFeature("fix1373"); uint256 const retiredEnforceInvariants = *getRegisteredFeature("EnforceInvariants"); uint256 const retiredSortedDirectories = *getRegisteredFeature("SortedDirectories"); uint256 const fix1201 = *getRegisteredFeature("fix1201"); -uint256 const fix1512 = *getRegisteredFeature("fix1512"); +uint256 const retiredFix1512 = *getRegisteredFeature("fix1512"); uint256 const fix1513 = *getRegisteredFeature("fix1513"); uint256 const retiredFix1523 = *getRegisteredFeature("fix1523"); uint256 const retiredFix1528 = *getRegisteredFeature("fix1528");