Remove conditionals for fix1373 enabled 07Jul2017

This commit is contained in:
Scott Schurr
2020-02-28 09:51:53 -08:00
parent c8282795ef
commit a6246b0baa
17 changed files with 34 additions and 335 deletions

View File

@@ -528,9 +528,8 @@ public:
};
using namespace jtx;
auto const sa = supported_amendments();
testAll(sa - fix1373 - featureFlowCross);
testAll(sa - featureFlowCross);
testAll(sa );
testAll(sa - featureFlowCross);
testAll(sa );
}
};

View File

@@ -112,8 +112,7 @@ public:
{
using namespace jtx;
auto const sa = supported_amendments();
test_convert_all_of_an_asset(sa - fix1373 - featureFlowCross);
test_convert_all_of_an_asset(sa - featureFlowCross);
test_convert_all_of_an_asset(sa - featureFlowCross);
test_convert_all_of_an_asset(sa);
}
};

View File

@@ -146,8 +146,7 @@ public:
{
using namespace test::jtx;
auto const sa = supported_amendments();
testXRPDiscrepancy (sa - fix1373 - featureFlowCross);
testXRPDiscrepancy (sa - featureFlowCross);
testXRPDiscrepancy (sa - featureFlowCross);
testXRPDiscrepancy (sa);
}
};

View File

@@ -1304,8 +1304,7 @@ struct Flow_test : public beast::unit_test::suite
using namespace jtx;
auto const sa = supported_amendments();
testWithFeats(sa - fix1373 - featureFlowCross);
testWithFeats(sa - featureFlowCross);
testWithFeats(sa - featureFlowCross);
testWithFeats(sa);
testEmptyStrand(sa);
}
@@ -1317,16 +1316,13 @@ struct Flow_manual_test : public Flow_test
{
using namespace jtx;
auto const all = supported_amendments();
FeatureBitset const f1373{fix1373};
FeatureBitset const flowCross{featureFlowCross};
FeatureBitset const f1513{fix1513};
testWithFeats(all - f1373 - flowCross - f1513);
testWithFeats(all - f1373 - flowCross );
testWithFeats(all - flowCross - f1513);
testWithFeats(all - flowCross );
testWithFeats(all - f1513);
testWithFeats(all );
testWithFeats(all - flowCross - f1513);
testWithFeats(all - flowCross );
testWithFeats(all - f1513);
testWithFeats(all );
testEmptyStrand(all - f1513);
testEmptyStrand(all );

View File

@@ -545,8 +545,7 @@ public:
};
using namespace test::jtx;
auto const sa = supported_amendments();
testAll(sa - fix1373 - featureFlowCross);
testAll(sa - featureFlowCross);
testAll(sa - featureFlowCross);
testAll(sa);
}
};

View File

@@ -4602,14 +4602,13 @@ public:
{
using namespace jtx;
FeatureBitset const all{supported_amendments()};
FeatureBitset const f1373{fix1373};
FeatureBitset const flowCross{featureFlowCross};
FeatureBitset const takerDryOffer{fixTakerDryOfferRemoval};
testAll(all - f1373 - takerDryOffer);
testAll(all - flowCross - takerDryOffer);
testAll(all - flowCross );
testAll(all );
testAll(all - takerDryOffer);
testAll(all - flowCross - takerDryOffer);
testAll(all - flowCross );
testAll(all );
testFalseAssert();
}
};
@@ -4620,21 +4619,16 @@ class Offer_manual_test : public Offer_test
{
using namespace jtx;
FeatureBitset const all{supported_amendments()};
FeatureBitset const f1373{fix1373};
FeatureBitset const flowCross{featureFlowCross};
FeatureBitset const f1513{fix1513};
FeatureBitset const takerDryOffer{fixTakerDryOfferRemoval};
testAll(all - f1373 - flowCross - f1513);
testAll(all - f1373 - flowCross );
testAll(all - f1373 - f1513);
testAll(all - f1373 );
testAll(all - flowCross - f1513);
testAll(all - flowCross );
testAll(all - f1513);
testAll(all );
testAll(all - flowCross - f1513);
testAll(all - flowCross );
testAll(all - f1513);
testAll(all );
testAll(all - f1373 - flowCross - takerDryOffer);
testAll(all - flowCross - takerDryOffer);
}
};

View File

@@ -1050,7 +1050,6 @@ struct PayStrand_test : public beast::unit_test::suite
auto const USD = gw["USD"];
auto const EUR = gw["EUR"];
if (features[fix1373])
{
Env env(*this, features);
env.fund(XRP(10000), alice, bob, gw);
@@ -1147,17 +1146,12 @@ struct PayStrand_test : public beast::unit_test::suite
env(offer(bob, XRP(100), USD(100)), txflags(tfPassive));
env(offer(bob, USD(100), XRP(100)), txflags(tfPassive));
auto const expectedResult = [&] () -> TER {
if (!features[fix1373])
return tesSUCCESS;
return temBAD_PATH_LOOP;
}();
// payment path: USD -> USD/XRP -> XRP/USD
env(pay(alice, carol, USD(100)),
sendmax(USD(100)),
path(~XRP, ~USD),
txflags(tfNoRippleDirect),
ter(expectedResult));
ter(temBAD_PATH_LOOP));
}
{
Env env(*this, features);
@@ -1245,16 +1239,13 @@ struct PayStrand_test : public beast::unit_test::suite
{
using namespace jtx;
auto const sa = supported_amendments();
testToStrand(sa - fix1373 - featureFlowCross);
testToStrand(sa - featureFlowCross);
testToStrand(sa - featureFlowCross);
testToStrand(sa);
testRIPD1373(sa - fix1373 - featureFlowCross);
testRIPD1373(sa - featureFlowCross);
testRIPD1373(sa - featureFlowCross);
testRIPD1373(sa);
testLoop(sa - fix1373 - featureFlowCross);
testLoop(sa - featureFlowCross);
testLoop(sa - featureFlowCross);
testLoop(sa);
testNoAccount(sa);

View File

@@ -70,8 +70,7 @@ struct SetAuth_test : public beast::unit_test::suite
{
using namespace jtx;
auto const sa = supported_amendments();
testAuth(sa - fix1373 - featureFlowCross);
testAuth(sa - featureFlowCross);
testAuth(sa - featureFlowCross);
testAuth(sa);
}
};

View File

@@ -510,8 +510,7 @@ public:
using namespace test::jtx;
auto const sa = supported_amendments();
testWithFeatures(sa - fix1373 - featureFlowCross);
testWithFeatures(sa -featureFlowCross);
testWithFeatures(sa -featureFlowCross);
testWithFeatures(sa);
}
};

View File

@@ -95,8 +95,7 @@ struct BookDirs_test : public beast::unit_test::suite
{
using namespace jtx;
auto const sa = supported_amendments();
test_bookdir(sa - fix1373 - featureFlowCross);
test_bookdir(sa - featureFlowCross);
test_bookdir(sa - featureFlowCross);
test_bookdir(sa);
}
};

View File

@@ -387,8 +387,7 @@ public:
};
using namespace jtx;
auto const sa = supported_amendments();
testAll(sa - fix1373 - featureFlowCross);
testAll(sa - featureFlowCross);
testAll(sa - featureFlowCross);
testAll(sa);
}
};

View File

@@ -154,8 +154,7 @@ public:
{
using namespace jtx;
auto const sa = supported_amendments();
testGWB(sa - fix1373 - featureFlowCross);
testGWB(sa - featureFlowCross);
testGWB(sa - featureFlowCross);
testGWB(sa);
}
};

View File

@@ -269,8 +269,7 @@ public:
};
using namespace jtx;
auto const sa = supported_amendments();
withFeatsTests(sa - fix1373 - featureFlowCross);
withFeatsTests(sa - featureFlowCross);
withFeatsTests(sa - featureFlowCross);
withFeatsTests(sa);
}
};