diff --git a/src/ripple/app/tx/impl/PayChan.cpp b/src/ripple/app/tx/impl/PayChan.cpp index 8659e01435..8191993d8a 100644 --- a/src/ripple/app/tx/impl/PayChan.cpp +++ b/src/ripple/app/tx/impl/PayChan.cpp @@ -173,9 +173,6 @@ closeChannel ( NotTEC PayChanCreate::preflight (PreflightContext const& ctx) { - if (!ctx.rules.enabled (featurePayChan)) - return temDISABLED; - if (ctx.rules.enabled(fix1543) && ctx.tx.getFlags() & tfUniversalMask) return temINVALID_FLAG; @@ -296,9 +293,6 @@ PayChanCreate::doApply() NotTEC PayChanFund::preflight (PreflightContext const& ctx) { - if (!ctx.rules.enabled (featurePayChan)) - return temDISABLED; - if (ctx.rules.enabled(fix1543) && ctx.tx.getFlags() & tfUniversalMask) return temINVALID_FLAG; @@ -390,9 +384,6 @@ PayChanFund::doApply() NotTEC PayChanClaim::preflight (PreflightContext const& ctx) { - if (! ctx.rules.enabled(featurePayChan)) - return temDISABLED; - // 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 diff --git a/src/ripple/protocol/Feature.h b/src/ripple/protocol/Feature.h index 8e9f789a09..f44f7254d6 100644 --- a/src/ripple/protocol/Feature.h +++ b/src/ripple/protocol/Feature.h @@ -365,7 +365,7 @@ foreachFeature(FeatureBitset bs, F&& f) extern uint256 const featureTickets; extern uint256 const featureOwnerPaysFee; -extern uint256 const featurePayChan; +extern uint256 const retiredPayChan; extern uint256 const featureFlow; extern uint256 const featureCompareTakerFlowCross; extern uint256 const featureFlowCross; diff --git a/src/ripple/protocol/impl/Feature.cpp b/src/ripple/protocol/impl/Feature.cpp index ba650a8ff1..96340445a7 100644 --- a/src/ripple/protocol/impl/Feature.cpp +++ b/src/ripple/protocol/impl/Feature.cpp @@ -156,7 +156,7 @@ uint256 bitsetIndexToFeature(size_t i) uint256 const featureTickets = *getRegisteredFeature("Tickets"); uint256 const featureOwnerPaysFee = *getRegisteredFeature("OwnerPaysFee"); -uint256 const featurePayChan = *getRegisteredFeature("PayChan"); +uint256 const retiredPayChan = *getRegisteredFeature("PayChan"); uint256 const featureFlow = *getRegisteredFeature("Flow"); uint256 const featureCompareTakerFlowCross = *getRegisteredFeature("CompareTakerFlowCross"); uint256 const featureFlowCross = *getRegisteredFeature("FlowCross");