ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-11-20 10:35:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove conditionals for featureTickSize enabled 21Feb2017

Browse Source
This commit is contained in:
Scott Schurr
2020-02-27 10:05:07 -08:00
parent 6bb9dd22e0
commit 78d771af36
4 changed files with 3 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/ripple/app/tx/impl/SetAccount.cpp
View File

@@ -132,9 +132,6 @@ SetAccount::preflight (PreflightContext const& ctx)
// TickSize // TickSize
if (tx.isFieldPresent (sfTickSize)) if (tx.isFieldPresent (sfTickSize))
{ {
if (!ctx.rules.enabled(featureTickSize))
return temDISABLED;
auto uTickSize = tx[sfTickSize]; auto uTickSize = tx[sfTickSize];
if (uTickSize && if (uTickSize &&
((uTickSize < Quality::minTickSize) || ((uTickSize < Quality::minTickSize) ||

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

@@ -370,7 +370,7 @@ extern uint256 const featureFlow;
extern uint256 const featureCompareTakerFlowCross; extern uint256 const featureCompareTakerFlowCross;
extern uint256 const featureFlowCross; extern uint256 const featureFlowCross;
extern uint256 const retiredCryptoConditions; extern uint256 const retiredCryptoConditions;
extern uint256 const featureTickSize; extern uint256 const retiredTickSize;
extern uint256 const fix1368; extern uint256 const fix1368;
extern uint256 const featureEscrow; extern uint256 const featureEscrow;
extern uint256 const featureCryptoConditionsSuite; extern uint256 const featureCryptoConditionsSuite;

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

@@ -161,7 +161,7 @@ uint256 const featureFlow = *getRegisteredFeature("Flow");
uint256 const featureCompareTakerFlowCross = *getRegisteredFeature("CompareTakerFlowCross"); uint256 const featureCompareTakerFlowCross = *getRegisteredFeature("CompareTakerFlowCross");
uint256 const featureFlowCross = *getRegisteredFeature("FlowCross"); uint256 const featureFlowCross = *getRegisteredFeature("FlowCross");
uint256 const retiredCryptoConditions = *getRegisteredFeature("CryptoConditions"); uint256 const retiredCryptoConditions = *getRegisteredFeature("CryptoConditions");
uint256 const featureTickSize = *getRegisteredFeature("TickSize"); uint256 const retiredTickSize = *getRegisteredFeature("TickSize");
uint256 const fix1368 = *getRegisteredFeature("fix1368"); uint256 const fix1368 = *getRegisteredFeature("fix1368");
uint256 const featureEscrow = *getRegisteredFeature("Escrow"); uint256 const featureEscrow = *getRegisteredFeature("Escrow");
uint256 const featureCryptoConditionsSuite = *getRegisteredFeature("CryptoConditionsSuite"); uint256 const featureCryptoConditionsSuite = *getRegisteredFeature("CryptoConditionsSuite");

16
src/test/app/Offer_test.cpp
View File

@@ -4420,20 +4420,6 @@ public:
using namespace jtx; 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 // Try to set tick size out of range
{ {
Env env {*this, features}; Env env {*this, features};
@@ -4609,7 +4595,7 @@ public:
testRCSmoketest (features); testRCSmoketest (features);
testSelfAuth (features); testSelfAuth (features);
testDeletedOfferIssuer (features); testDeletedOfferIssuer (features);
testTickSize (features | featureTickSize); testTickSize (features);
} }
void run () override void run () override