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 featureCryptoConditions enabled 03Jan2017

Browse Source
This commit is contained in:
Scott Schurr
2020-02-26 19:20:55 -08:00
parent 1661c84af6
commit 6bb9dd22e0
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -369,7 +369,7 @@ extern uint256 const featurePayChan;
extern uint256 const featureFlow;
extern uint256 const featureCompareTakerFlowCross;
extern uint256 const featureFlowCross;
extern uint256 const featureCryptoConditions;
extern uint256 const retiredCryptoConditions;
extern uint256 const featureTickSize;
extern uint256 const fix1368;
extern uint256 const featureEscrow;

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

@@ -160,7 +160,7 @@ uint256 const featurePayChan = *getRegisteredFeature("PayChan");
uint256 const featureFlow = *getRegisteredFeature("Flow");
uint256 const featureCompareTakerFlowCross = *getRegisteredFeature("CompareTakerFlowCross");
uint256 const featureFlowCross = *getRegisteredFeature("FlowCross");
uint256 const featureCryptoConditions = *getRegisteredFeature("CryptoConditions");
uint256 const retiredCryptoConditions = *getRegisteredFeature("CryptoConditions");
uint256 const featureTickSize = *getRegisteredFeature("TickSize");
uint256 const fix1368 = *getRegisteredFeature("fix1368");
uint256 const featureEscrow = *getRegisteredFeature("Escrow");

24
src/test/rpc/Feature_test.cpp
View File

@@ -59,19 +59,19 @@ class Feature_test : public beast::unit_test::suite
using namespace test::jtx;
Env env {*this};
auto jrr = env.rpc("feature", "CryptoConditions") [jss::result];
auto jrr = env.rpc("feature", "MultiSignReserve") [jss::result];
BEAST_EXPECTS(jrr[jss::status] == jss::success, "status");
jrr.removeMember(jss::status);
BEAST_EXPECT(jrr.size() == 1);
auto feature = *(jrr.begin());
BEAST_EXPECTS(feature[jss::name] == "CryptoConditions", "name");
BEAST_EXPECTS(feature[jss::name] == "MultiSignReserve", "name");
BEAST_EXPECTS(! feature[jss::enabled].asBool(), "enabled");
BEAST_EXPECTS(! feature[jss::vetoed].asBool(), "vetoed");
BEAST_EXPECTS(feature[jss::supported].asBool(), "supported");
// feature names are case-sensitive - expect error here
jrr = env.rpc("feature", "cryptoconditions") [jss::result];
jrr = env.rpc("feature", "multiSignReserve") [jss::result];
BEAST_EXPECT(jrr[jss::error] == "badFeature");
BEAST_EXPECT(jrr[jss::error_message] == "Feature unknown or invalid.");
}
@@ -115,7 +115,7 @@ class Feature_test : public beast::unit_test::suite
using namespace test::jtx;
Env env {*this,
FeatureBitset(featureEscrow, featureCryptoConditions)};
FeatureBitset(featureDepositAuth, featureDepositPreauth)};
auto jrr = env.rpc("feature") [jss::result];
if(! BEAST_EXPECT(jrr.isMember(jss::features)))
@@ -215,40 +215,40 @@ class Feature_test : public beast::unit_test::suite
using namespace test::jtx;
Env env {*this,
FeatureBitset(featureCryptoConditions)};
FeatureBitset(featureMultiSignReserve)};
auto jrr = env.rpc("feature", "CryptoConditions") [jss::result];
auto jrr = env.rpc("feature", "MultiSignReserve") [jss::result];
if(! BEAST_EXPECTS(jrr[jss::status] == jss::success, "status"))
return;
jrr.removeMember(jss::status);
if(! BEAST_EXPECT(jrr.size() == 1))
return;
auto feature = *(jrr.begin());
BEAST_EXPECTS(feature[jss::name] == "CryptoConditions", "name");
BEAST_EXPECTS(feature[jss::name] == "MultiSignReserve", "name");
BEAST_EXPECTS(! feature[jss::vetoed].asBool(), "vetoed");
jrr = env.rpc("feature", "CryptoConditions", "reject") [jss::result];
jrr = env.rpc("feature", "MultiSignReserve", "reject") [jss::result];
if(! BEAST_EXPECTS(jrr[jss::status] == jss::success, "status"))
return;
jrr.removeMember(jss::status);
if(! BEAST_EXPECT(jrr.size() == 1))
return;
feature = *(jrr.begin());
BEAST_EXPECTS(feature[jss::name] == "CryptoConditions", "name");
BEAST_EXPECTS(feature[jss::name] == "MultiSignReserve", "name");
BEAST_EXPECTS(feature[jss::vetoed].asBool(), "vetoed");
jrr = env.rpc("feature", "CryptoConditions", "accept") [jss::result];
jrr = env.rpc("feature", "MultiSignReserve", "accept") [jss::result];
if(! BEAST_EXPECTS(jrr[jss::status] == jss::success, "status"))
return;
jrr.removeMember(jss::status);
if(! BEAST_EXPECT(jrr.size() == 1))
return;
feature = *(jrr.begin());
BEAST_EXPECTS(feature[jss::name] == "CryptoConditions", "name");
BEAST_EXPECTS(feature[jss::name] == "MultiSignReserve", "name");
BEAST_EXPECTS(! feature[jss::vetoed].asBool(), "vetoed");
// anything other than accept or reject is an error
jrr = env.rpc("feature", "CryptoConditions", "maybe");
jrr = env.rpc("feature", "MultiSignReserve", "maybe");
BEAST_EXPECT(jrr[jss::error] == "invalidParams");
BEAST_EXPECT(jrr[jss::error_message] == "Invalid parameters.");
}