mirror of
https://github.com/Xahau/xahaud.git
synced 2025-12-06 17:27:52 +00:00
Unit tests don't enable Tickets or SHAMapV2 by default:
Both Tickets and SHAMapV2 have been around for a while and don't look like they will be enabled on the network soon. So they are removed from the supportedAmendments list. This prevents Env from automatically testing with Tickets or SHAMapV2 enabled, although testing with those features can still be explicitly specified. Drive-by cleanups: o supportedAmendments() returns a const reference rather than a fresh vector on each call. o supportedAmendments() implementation moved from Amendments.cpp to Feature.cpp. Amendments.cpp deleted. o supportedAmendments() declared in Feature.h. All other declarations deleted. o preEnabledAmendments() removed, since it was empty and only used in one place. It will be easy to re-add when it is needed. o jtx::all_features_except() renamed to jtx::supported_features_except(), which is more descriptive. o jtx::all_amendments() renamed to jxt::supported_amendments() o jtx::with_features() renamed to with_only_features() o Env_test.cpp adjusted since featureTickets is no longer automatically enabled for unit tests.
This commit is contained in:
@@ -632,7 +632,7 @@ struct PayStrandAllPairs_test : public beast::unit_test::suite
|
||||
using RippleCalc = ::ripple::path::RippleCalc;
|
||||
|
||||
ExistingElementPool eep;
|
||||
Env env(*this, with_features(fs));
|
||||
Env env(*this, with_only_features(fs));
|
||||
|
||||
auto const closeTime = fix1298Time() +
|
||||
100 * env.closed()->info().closeTimeResolution;
|
||||
@@ -910,7 +910,7 @@ struct PayStrand_test : public beast::unit_test::suite
|
||||
};
|
||||
|
||||
{
|
||||
Env env(*this, with_features(fs));
|
||||
Env env(*this, with_only_features(fs));
|
||||
env.fund(XRP(10000), alice, bob, gw);
|
||||
env.trust(USD(1000), alice, bob);
|
||||
env.trust(EUR(1000), alice, bob);
|
||||
@@ -951,7 +951,7 @@ struct PayStrand_test : public beast::unit_test::suite
|
||||
};
|
||||
|
||||
{
|
||||
Env env(*this, with_features(fs));
|
||||
Env env(*this, with_only_features(fs));
|
||||
env.fund(XRP(10000), alice, bob, carol, gw);
|
||||
|
||||
test(env, USD, boost::none, STPath(), terNO_LINE);
|
||||
@@ -1134,7 +1134,7 @@ struct PayStrand_test : public beast::unit_test::suite
|
||||
// cannot have more than one offer with the same output issue
|
||||
|
||||
using namespace jtx;
|
||||
Env env(*this, with_features(fs));
|
||||
Env env(*this, with_only_features(fs));
|
||||
|
||||
env.fund(XRP(10000), alice, bob, carol, gw);
|
||||
env.trust(USD(10000), alice, bob, carol);
|
||||
@@ -1156,7 +1156,7 @@ struct PayStrand_test : public beast::unit_test::suite
|
||||
}
|
||||
|
||||
{
|
||||
Env env(*this, with_features(fs));
|
||||
Env env(*this, with_only_features(fs));
|
||||
env.fund(XRP(10000), alice, bob, noripple(gw));
|
||||
env.trust(USD(1000), alice, bob);
|
||||
env(pay(gw, alice, USD(100)));
|
||||
@@ -1165,7 +1165,7 @@ struct PayStrand_test : public beast::unit_test::suite
|
||||
|
||||
{
|
||||
// check global freeze
|
||||
Env env(*this, with_features(fs));
|
||||
Env env(*this, with_only_features(fs));
|
||||
env.fund(XRP(10000), alice, bob, gw);
|
||||
env.trust(USD(1000), alice, bob);
|
||||
env(pay(gw, alice, USD(100)));
|
||||
@@ -1190,7 +1190,7 @@ struct PayStrand_test : public beast::unit_test::suite
|
||||
}
|
||||
{
|
||||
// Freeze between gw and alice
|
||||
Env env(*this, with_features(fs));
|
||||
Env env(*this, with_only_features(fs));
|
||||
env.fund(XRP(10000), alice, bob, gw);
|
||||
env.trust(USD(1000), alice, bob);
|
||||
env(pay(gw, alice, USD(100)));
|
||||
@@ -1203,7 +1203,7 @@ struct PayStrand_test : public beast::unit_test::suite
|
||||
// check no auth
|
||||
// An account may require authorization to receive IOUs from an
|
||||
// issuer
|
||||
Env env(*this, with_features(fs));
|
||||
Env env(*this, with_only_features(fs));
|
||||
env.fund(XRP(10000), alice, bob, gw);
|
||||
env(fset(gw, asfRequireAuth));
|
||||
env.trust(USD(1000), alice, bob);
|
||||
@@ -1231,7 +1231,7 @@ struct PayStrand_test : public beast::unit_test::suite
|
||||
}
|
||||
{
|
||||
// Check path with sendMax and node with correct sendMax already set
|
||||
Env env(*this, with_features(fs));
|
||||
Env env(*this, with_only_features(fs));
|
||||
env.fund(XRP(10000), alice, bob, gw);
|
||||
env.trust(USD(1000), alice, bob);
|
||||
env.trust(EUR(1000), alice, bob);
|
||||
@@ -1246,7 +1246,7 @@ struct PayStrand_test : public beast::unit_test::suite
|
||||
|
||||
{
|
||||
// last step xrp from offer
|
||||
Env env(*this, with_features(fs));
|
||||
Env env(*this, with_only_features(fs));
|
||||
env.fund(XRP(10000), alice, bob, gw);
|
||||
env.trust(USD(1000), alice, bob);
|
||||
env(pay(gw, alice, USD(100)));
|
||||
@@ -1287,7 +1287,7 @@ struct PayStrand_test : public beast::unit_test::suite
|
||||
|
||||
if (hasFeature(fix1373, fs))
|
||||
{
|
||||
Env env(*this, with_features(fs));
|
||||
Env env(*this, with_only_features(fs));
|
||||
env.fund(XRP(10000), alice, bob, gw);
|
||||
|
||||
env.trust(USD(1000), alice, bob);
|
||||
@@ -1319,7 +1319,7 @@ struct PayStrand_test : public beast::unit_test::suite
|
||||
}
|
||||
|
||||
{
|
||||
Env env(*this, with_features(fs));
|
||||
Env env(*this, with_only_features(fs));
|
||||
|
||||
env.fund(XRP(10000), alice, bob, carol, gw);
|
||||
env.trust(USD(10000), alice, bob, carol);
|
||||
@@ -1337,7 +1337,7 @@ struct PayStrand_test : public beast::unit_test::suite
|
||||
}
|
||||
|
||||
{
|
||||
Env env(*this, with_features(fs));
|
||||
Env env(*this, with_only_features(fs));
|
||||
|
||||
env.fund(XRP(10000), alice, bob, carol, gw);
|
||||
env.trust(USD(10000), alice, bob, carol);
|
||||
@@ -1371,7 +1371,7 @@ struct PayStrand_test : public beast::unit_test::suite
|
||||
auto const CNY = gw["CNY"];
|
||||
|
||||
{
|
||||
Env env(*this, with_features(fs));
|
||||
Env env(*this, with_only_features(fs));
|
||||
|
||||
env.fund(XRP(10000), alice, bob, carol, gw);
|
||||
env.trust(USD(10000), alice, bob, carol);
|
||||
@@ -1396,7 +1396,7 @@ struct PayStrand_test : public beast::unit_test::suite
|
||||
ter(expectedResult));
|
||||
}
|
||||
{
|
||||
Env env(*this, with_features(fs));
|
||||
Env env(*this, with_only_features(fs));
|
||||
|
||||
env.fund(XRP(10000), alice, bob, carol, gw);
|
||||
env.trust(USD(10000), alice, bob, carol);
|
||||
@@ -1431,7 +1431,7 @@ struct PayStrand_test : public beast::unit_test::suite
|
||||
auto const gw = Account("gw");
|
||||
auto const USD = gw["USD"];
|
||||
|
||||
Env env(*this, with_features(fs));
|
||||
Env env(*this, with_only_features(fs));
|
||||
env.fund(XRP(10000), alice, bob, gw);
|
||||
|
||||
STAmount sendMax{USD.issue(), 100, 1};
|
||||
|
||||
Reference in New Issue
Block a user