ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove conditionals for featureEscrow enabled 31Mar2017

Browse Source
This commit is contained in:
Scott Schurr
2020-02-27 15:31:13 -08:00
parent e93a44fe9b
commit c8282795ef
5 changed files with 28 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -98,9 +98,6 @@ EscrowCreate::calculateMaxSpend(STTx const& tx)
NotTEC
EscrowCreate::preflight (PreflightContext const& ctx)
{
if (! ctx.rules.enabled(featureEscrow))
return temDISABLED;
if (ctx.rules.enabled(fix1543) && ctx.tx.getFlags() & tfUniversalMask)
return temINVALID_FLAG;
@@ -300,9 +297,6 @@ checkCondition (Slice f, Slice c)
NotTEC
EscrowFinish::preflight (PreflightContext const& ctx)
{
if (! ctx.rules.enabled(featureEscrow))
return temDISABLED;
if (ctx.rules.enabled(fix1543) && ctx.tx.getFlags() & tfUniversalMask)
return temINVALID_FLAG;
@@ -518,9 +512,6 @@ EscrowFinish::doApply()
NotTEC
EscrowCancel::preflight (PreflightContext const& ctx)
{
if (! ctx.rules.enabled(featureEscrow))
return temDISABLED;
if (ctx.rules.enabled(fix1543) && ctx.tx.getFlags() & tfUniversalMask)
return temINVALID_FLAG;

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

@@ -372,7 +372,7 @@ extern uint256 const featureFlowCross;
extern uint256 const retiredCryptoConditions;
extern uint256 const retiredTickSize;
extern uint256 const retiredFix1368;
extern uint256 const featureEscrow;
extern uint256 const retiredEscrow;
extern uint256 const featureCryptoConditionsSuite;
extern uint256 const fix1373;
extern uint256 const featureEnforceInvariants;

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

@@ -163,7 +163,7 @@ uint256 const featureFlowCross = *getRegisteredFeature("FlowCross");
uint256 const retiredCryptoConditions = *getRegisteredFeature("CryptoConditions");
uint256 const retiredTickSize = *getRegisteredFeature("TickSize");
uint256 const retiredFix1368 = *getRegisteredFeature("fix1368");
uint256 const featureEscrow = *getRegisteredFeature("Escrow");
uint256 const retiredEscrow = *getRegisteredFeature("Escrow");
uint256 const featureCryptoConditionsSuite = *getRegisteredFeature("CryptoConditionsSuite");
uint256 const fix1373 = *getRegisteredFeature("fix1373");
uint256 const featureEnforceInvariants = *getRegisteredFeature("EnforceInvariants");