Refactor FeatureBitset:

* Remove composite helper functions
* Add set difference and Bitset/uint256 operators
* Convert tests to use new feature bitset set difference operator
This commit is contained in:
seelabs
2017-11-28 13:34:11 -05:00
parent 3523cee63d
commit e8d02c1333
29 changed files with 400 additions and 354 deletions

View File

@@ -95,11 +95,10 @@ struct BookDirs_test : public beast::unit_test::suite
void run() override
{
using namespace jtx;
test_bookdir(
supported_features_except (featureFlow, fix1373, featureFlowCross));
test_bookdir(
supported_features_except ( featureFlowCross));
test_bookdir(supported_amendments ());
auto const sa = supported_amendments();
test_bookdir(sa - featureFlow - fix1373 - featureFlowCross);
test_bookdir(sa - featureFlowCross);
test_bookdir(sa);
}
};

View File

@@ -88,7 +88,9 @@ struct Directory_test : public beast::unit_test::suite
{
testcase ("Directory Ordering (without 'SortedDirectories' amendment");
Env env(*this, supported_features_except(featureSortedDirectories));
Env env(
*this,
supported_amendments().reset(featureSortedDirectories));
env.fund(XRP(10000000), alice, bob, gw);
// Insert 400 offers from Alice, then one from Bob:

View File

@@ -378,11 +378,10 @@ public:
testBalanceHook(features);
};
using namespace jtx;
testAll(
supported_features_except (featureFlow, fix1373, featureFlowCross));
testAll(
supported_features_except ( featureFlowCross));
testAll(supported_amendments());
auto const sa = supported_amendments();
testAll(sa - featureFlow - fix1373 - featureFlowCross);
testAll(sa - featureFlowCross);
testAll(sa);
}
};