ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-04 19:25:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove conditionals for featurePayChan enabled 31Mar2017

Browse Source
This commit is contained in:
Scott Schurr
2020-02-27 12:38:25 -08:00
parent 78d771af36
commit 3e870866e0
3 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/ripple/app/tx/impl/PayChan.cpp
View File

@@ -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

2
src/ripple/protocol/Feature.h
View File

@@ -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;

2
src/ripple/protocol/impl/Feature.cpp
View File

@@ -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");