ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master (0.70.2) into develop (0.80.0-rc2)

Browse Source
This commit is contained in:
Nik Bougalis
2017-09-22 17:16:17 -07:00
parent cd2d52acdc 7a0fa312ea
commit dd52bdd2c4
736 changed files with 73760 additions and 30382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/test/app/TxQ_test.cpp
View File

@@ -169,7 +169,7 @@ public:
using namespace std::chrono;
Env env(*this, makeConfig({ {"minimum_txn_in_ledger_standalone", "3"} }),
features(featureFeeEscalation));
with_features(featureFeeEscalation));
auto& txq = env.app().getTxQ();
auto alice = Account("alice");
@@ -356,7 +356,7 @@ public:
using namespace std::chrono;
Env env(*this, makeConfig({ { "minimum_txn_in_ledger_standalone", "2" } }),
features(featureFeeEscalation));
with_features(featureFeeEscalation));
auto alice = Account("alice");
auto bob = Account("bob");
@@ -412,7 +412,7 @@ public:
using namespace std::chrono;
Env env(*this, makeConfig({ { "minimum_txn_in_ledger_standalone", "2" } }),
features(featureFeeEscalation));
with_features(featureFeeEscalation));
auto alice = Account("alice");
auto bob = Account("bob");
@@ -520,7 +520,7 @@ public:
using namespace std::chrono;
Env env(*this, makeConfig({ { "minimum_txn_in_ledger_standalone", "2" } }),
features(featureFeeEscalation));
with_features(featureFeeEscalation));
auto alice = Account("alice");
auto bob = Account("bob");
@@ -626,7 +626,7 @@ public:
{
using namespace jtx;
Env env(*this, makeConfig(), features(featureFeeEscalation));
Env env(*this, makeConfig(), with_features(featureFeeEscalation));
auto alice = Account("alice");
auto bob = Account("bob");
@@ -651,7 +651,7 @@ public:
using namespace jtx;
Env env(*this, makeConfig({ { "minimum_txn_in_ledger_standalone", "2" } }),
features(featureFeeEscalation));
with_features(featureFeeEscalation));
auto alice = Account("alice");
auto bob = Account("bob");
@@ -704,12 +704,11 @@ public:
{
using namespace jtx;
Env env(
*this,
Env env(*this,
makeConfig(
{{"minimum_txn_in_ledger_standalone", "3"}},
{{"account_reserve", "200"}, {"owner_reserve", "50"}}),
features(featureFeeEscalation));
with_features(featureFeeEscalation));
auto alice = Account("alice");
auto bob = Account("bob");
@@ -937,7 +936,7 @@ public:
using namespace std::chrono;
Env env(*this, makeConfig({ { "minimum_txn_in_ledger_standalone", "4" } }),
features(featureFeeEscalation));
with_features(featureFeeEscalation));
auto alice = Account("alice");
auto bob = Account("bob");
@@ -1073,7 +1072,7 @@ public:
{
using namespace jtx;
Env env(*this);
Env env(*this, no_features);
auto alice = Account("alice");
@@ -1096,7 +1095,7 @@ public:
using namespace jtx;
Env env(*this, makeConfig({ { "minimum_txn_in_ledger_standalone", "1" } }),
features(featureFeeEscalation));
with_features(featureFeeEscalation));
auto alice = Account("alice");
@@ -1139,7 +1138,7 @@ public:
{ {"minimum_txn_in_ledger_standalone", "2"},
{"target_txn_in_ledger", "4"},
{"maximum_txn_in_ledger", "5"} }),
features(featureFeeEscalation));
with_features(featureFeeEscalation));
auto alice = Account("alice");
auto queued = ter(terQUEUED);
@@ -1169,7 +1168,7 @@ public:
makeConfig(
{{"minimum_txn_in_ledger_standalone", "3"}},
{{"account_reserve", "200"}, {"owner_reserve", "50"}}),
features(featureFeeEscalation));
with_features(featureFeeEscalation));
auto alice = Account("alice");
auto bob = Account("bob");
@@ -1259,7 +1258,7 @@ public:
Env env(*this,
makeConfig({ { "minimum_txn_in_ledger_standalone", "3" } }),
features(featureFeeEscalation), features(featureMultiSign));
with_features(featureFeeEscalation, featureMultiSign));
auto alice = Account("alice");
auto bob = Account("bob");
@@ -1324,7 +1323,7 @@ public:
Env env(*this,
makeConfig({ { "minimum_txn_in_ledger_standalone", "3" } }),
features(featureFeeEscalation), features(featureTickets));
with_features(featureFeeEscalation, featureTickets));
auto alice = Account("alice");
auto charlie = Account("charlie");
@@ -1569,7 +1568,7 @@ public:
{
using namespace jtx;
using namespace std::chrono;
Env env(*this, features(featureTickets));
Env env(*this, with_features(featureTickets));
auto const alice = Account("alice");
env.memoize(alice);
env.memoize("bob");
@@ -1637,7 +1636,7 @@ public:
{
using namespace jtx;
{
Env env(*this, features(featureFeeEscalation));
Env env(*this, with_features(featureFeeEscalation));
auto fee = env.rpc("fee");
@@ -1694,7 +1693,7 @@ public:
}
{
Env env(*this);
Env env(*this, no_features);
auto fee = env.rpc("fee");
@@ -1726,7 +1725,7 @@ public:
Env env(*this, makeConfig({ { "minimum_txn_in_ledger_standalone", "1" },
{"ledgers_in_queue", "10"}, {"maximum_txn_per_account", "20"} }),
features(featureFeeEscalation));
with_features(featureFeeEscalation));
// Alice will recreate the scenario. Bob will block.
auto const alice = Account("alice");
@@ -1801,7 +1800,7 @@ public:
testcase("Autofilled sequence should account for TxQ");
using namespace jtx;
Env env(*this, makeConfig({ {"minimum_txn_in_ledger_standalone", "6"} }),
features(featureFeeEscalation));
with_features(featureFeeEscalation));
Env_ss envs(env);
auto const& txQ = env.app().getTxQ();
@@ -1931,7 +1930,7 @@ public:
{
using namespace jtx;
Env env(*this, makeConfig({ { "minimum_txn_in_ledger_standalone", "3" } }),
features(featureFeeEscalation));
with_features(featureFeeEscalation));
Env_ss envs(env);
Account const alice{ "alice" };
@@ -2201,7 +2200,7 @@ public:
{
using namespace jtx;
Env env(*this, makeConfig({ { "minimum_txn_in_ledger_standalone", "3" } }),
features(featureFeeEscalation));
with_features(featureFeeEscalation));
Env_ss envs(env);
Account const alice{ "alice" };
@@ -2424,7 +2423,7 @@ public:
using namespace jtx;
Env env(*this, makeConfig({ { "minimum_txn_in_ledger_standalone", "3" } }),
features(featureFeeEscalation));
with_features(featureFeeEscalation));
Json::Value stream;
stream[jss::streams] = Json::arrayValue;
@@ -2593,7 +2592,7 @@ public:
Env env(*this,
makeConfig({ { "minimum_txn_in_ledger_standalone", "3" } }),
features(featureFeeEscalation));
with_features(featureFeeEscalation));
auto alice = Account("alice");
auto bob = Account("bob");