ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2026-06-04 17:27:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Set ColumnLimit to 120 in clang-format (#6288)

Browse Source 
This change updates the ColumnLimit from 80 to 120, and applies clang-format to reformat the code.
This commit is contained in:
Ayaz Salikhov
2026-01-28 18:09:50 +00:00
committed by GitHub
parent 92046785d1
commit 5f638f5553
1016 changed files with 26918 additions and 66660 deletions
Download Patch File Download Diff File Expand all files Collapse all files

419
src/test/rpc/JSONRPC_test.cpp
View File

@@ -63,10 +63,7 @@ static constexpr TxnTestData txnTestArray[] = {
"TransactionType": "Payment"
}
})",
{{"",
"",
"Missing field 'account'.",
"Missing field 'tx_json.Sequence'."}}},
{{"", "", "Missing field 'account'.", "Missing field 'tx_json.Sequence'."}}},
{"Pass in Fee with minimal payment, both Amount and DeliverMax.",
__LINE__,
@@ -83,10 +80,7 @@ static constexpr TxnTestData txnTestArray[] = {
"TransactionType": "Payment"
}
})",
{{"",
"",
"Missing field 'tx_json.Sequence'.",
"Missing field 'tx_json.Sequence'."}}},
{{"", "", "Missing field 'tx_json.Sequence'.", "Missing field 'tx_json.Sequence'."}}},
{"Pass in Sequence, no Amount only DeliverMax",
__LINE__,
@@ -102,10 +96,7 @@ static constexpr TxnTestData txnTestArray[] = {
"TransactionType": "Payment"
}
})",
{{"",
"",
"Missing field 'tx_json.Fee'.",
"Missing field 'tx_json.SigningPubKey'."}}},
{{"", "", "Missing field 'tx_json.Fee'.", "Missing field 'tx_json.SigningPubKey'."}}},
{"Pass in Sequence and Fee with minimal payment, both Amount and "
"DeliverMax.",
@@ -145,10 +136,7 @@ static constexpr TxnTestData txnTestArray[] = {
"TransactionType": "Payment"
}
})",
{{"",
"",
"Missing field 'tx_json.Fee'.",
"Missing field 'tx_json.SigningPubKey'."}}},
{{"", "", "Missing field 'tx_json.Fee'.", "Missing field 'tx_json.SigningPubKey'."}}},
{"Add 'fee_mult_max' and 'fee_div_max' field.",
__LINE__,
@@ -166,10 +154,7 @@ static constexpr TxnTestData txnTestArray[] = {
"TransactionType": "Payment"
}
})",
{{"",
"",
"Missing field 'tx_json.Fee'.",
"Missing field 'tx_json.SigningPubKey'."}}},
{{"", "", "Missing field 'tx_json.Fee'.", "Missing field 'tx_json.SigningPubKey'."}}},
{"fee_mult_max is ignored if 'Fee' is present.",
__LINE__,
@@ -426,10 +411,7 @@ static constexpr TxnTestData txnTestArray[] = {
"TransactionType": "Payment"
}
})",
{{"",
"",
"Missing field 'tx_json.Sequence'.",
"Missing field 'tx_json.Sequence'."}}},
{{"", "", "Missing field 'tx_json.Sequence'.", "Missing field 'tx_json.Sequence'."}}},
{"Not valid to include both 'Paths' and 'build_path'.",
__LINE__,
@@ -478,10 +460,7 @@ static constexpr TxnTestData txnTestArray[] = {
"TransactionType": "Payment"
}
})",
{{"",
"",
"Missing field 'tx_json.Sequence'.",
"Missing field 'tx_json.Sequence'."}}},
{{"", "", "Missing field 'tx_json.Sequence'.", "Missing field 'tx_json.Sequence'."}}},
{"'Amount' may not be XRP for pathfinding, but 'SendMax' may be XRP.",
__LINE__,
@@ -502,10 +481,7 @@ static constexpr TxnTestData txnTestArray[] = {
"TransactionType": "Payment"
}
})",
{{"",
"",
"Missing field 'tx_json.Sequence'.",
"Missing field 'tx_json.Sequence'."}}},
{{"", "", "Missing field 'tx_json.Sequence'.", "Missing field 'tx_json.Sequence'."}}},
{"'secret' must be present.",
__LINE__,
@@ -556,10 +532,7 @@ static constexpr TxnTestData txnTestArray[] = {
"TransactionType": "Payment"
}
})",
{{"",
"",
"Missing field 'tx_json.Sequence'.",
"Missing field 'tx_json.Sequence'."}}},
{{"", "", "Missing field 'tx_json.Sequence'.", "Missing field 'tx_json.Sequence'."}}},
{"Malformed 'seed'.",
__LINE__,
@@ -646,10 +619,7 @@ static constexpr TxnTestData txnTestArray[] = {
"TransactionType": 0
}
})",
{{"",
"",
"Missing field 'tx_json.Sequence'.",
"Missing field 'tx_json.Sequence'."}}},
{{"", "", "Missing field 'tx_json.Sequence'.", "Missing field 'tx_json.Sequence'."}}},
{"'Account' must be present.",
__LINE__,
@@ -700,10 +670,7 @@ static constexpr TxnTestData txnTestArray[] = {
"TransactionType": "Payment"
}
})",
{{"",
"",
"Missing field 'tx_json.Sequence'.",
"Missing field 'tx_json.Sequence'."}}},
{{"", "", "Missing field 'tx_json.Sequence'.", "Missing field 'tx_json.Sequence'."}}},
{"If 'offline' is true then a 'Sequence' field must be supplied.",
__LINE__,
@@ -803,10 +770,7 @@ static constexpr TxnTestData txnTestArray[] = {
"TransactionType": "Payment"
}
})",
{{"",
"",
"Missing field 'tx_json.Sequence'.",
"Missing field 'tx_json.Sequence'."}}},
{{"", "", "Missing field 'tx_json.Sequence'.", "Missing field 'tx_json.Sequence'."}}},
{"The 'Flags' field must be numeric.",
__LINE__,
@@ -841,10 +805,7 @@ static constexpr TxnTestData txnTestArray[] = {
"TransactionType": "Payment"
}
})",
{{"",
"",
"Missing field 'tx_json.Sequence'.",
"Missing field 'tx_json.Sequence'."}}},
{{"", "", "Missing field 'tx_json.Sequence'.", "Missing field 'tx_json.Sequence'."}}},
{"Single-sign a multisigned transaction.",
__LINE__,
@@ -871,10 +832,7 @@ static constexpr TxnTestData txnTestArray[] = {
"TransactionType" : "Payment"
}
})",
{{"Already multisigned.",
"Already multisigned.",
"Secret does not match account.",
""}}},
{{"Already multisigned.", "Already multisigned.", "Secret does not match account.", ""}}},
{"Minimal sign_for.",
__LINE__,
@@ -892,10 +850,7 @@ static constexpr TxnTestData txnTestArray[] = {
"TransactionType": "Payment"
}
})",
{{"Secret does not match account.",
"Secret does not match account.",
"",
"Missing field 'tx_json.Signers'."}}},
{{"Secret does not match account.", "Secret does not match account.", "", "Missing field 'tx_json.Signers'."}}},
{"Minimal offline sign_for.",
__LINE__,
@@ -954,10 +909,7 @@ static constexpr TxnTestData txnTestArray[] = {
"TransactionType": "Payment"
}
})",
{{"Disallowed seed.",
"Disallowed seed.",
"Disallowed seed.",
"Missing field 'tx_json.Signers'."}}},
{{"Disallowed seed.", "Disallowed seed.", "Disallowed seed.", "Missing field 'tx_json.Signers'."}}},
{"Missing 'Account' in sign_for.",
__LINE__,
@@ -1203,10 +1155,7 @@ static constexpr TxnTestData txnTestArray[] = {
"TransactionType" : "Payment"
}
})",
{{"Already multisigned.",
"Already multisigned.",
"Invalid signature.",
"Invalid signature."}}},
{{"Already multisigned.", "Already multisigned.", "Invalid signature.", "Invalid signature."}}},
{"Non-empty 'SigningPubKey' in sign_for.",
__LINE__,
@@ -1362,10 +1311,7 @@ static constexpr TxnTestData txnTestArray[] = {
"TransactionType": "Payment"
}
})",
{{"Missing field 'secret'.",
"Missing field 'secret'.",
"Missing field 'account'.",
""}}},
{{"Missing field 'secret'.", "Missing field 'secret'.", "Missing field 'account'.", ""}}},
{"Minimal submit_multisigned with bad signature.",
__LINE__,
@@ -1390,10 +1336,7 @@ static constexpr TxnTestData txnTestArray[] = {
"TransactionType": "Payment"
}
})",
{{"Missing field 'secret'.",
"Missing field 'secret'.",
"Missing field 'account'.",
"Invalid signature."}}},
{{"Missing field 'secret'.", "Missing field 'secret'.", "Missing field 'account'.", "Invalid signature."}}},
{"Missing tx_json in submit_multisigned.",
__LINE__,
@@ -1409,10 +1352,7 @@ static constexpr TxnTestData txnTestArray[] = {
}
]
})",
{{"Missing field 'secret'.",
"Missing field 'secret'.",
"Missing field 'account'.",
"Missing field 'tx_json'."}}},
{{"Missing field 'secret'.", "Missing field 'secret'.", "Missing field 'account'.", "Missing field 'tx_json'."}}},
{"Missing sequence in submit_multisigned.",
__LINE__,
@@ -1601,10 +1541,7 @@ static constexpr TxnTestData txnTestArray[] = {
"TransactionType": "Payment"
}
})",
{{"Missing field 'secret'.",
"Missing field 'secret'.",
"Missing field 'account'.",
"Source account not found."}}},
{{"Missing field 'secret'.", "Missing field 'secret'.", "Missing field 'account'.", "Source account not found."}}},
{"Missing Fee in submit_multisigned.",
__LINE__,
@@ -2058,10 +1995,7 @@ static constexpr TxnTestData txnTestArray[] = {
"Delegate": "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA"
}
})",
{{"",
"",
"Missing field 'account'.",
"Missing field 'tx_json.Sequence'."}}},
{{"", "", "Missing field 'account'.", "Missing field 'tx_json.Sequence'."}}},
{"Delegate not well formed.",
__LINE__,
@@ -2127,12 +2061,10 @@ public:
{
testcase("bad RPC command");
test::jtx::Env env(*this);
Json::Value const result{
env.rpc("bad_command", R"({"MakingThisUp": 0})")};
Json::Value const result{env.rpc("bad_command", R"({"MakingThisUp": 0})")};
BEAST_EXPECT(result[jss::result][jss::error] == "unknownCmd");
BEAST_EXPECT(
result[jss::result][jss::request][jss::command] == "bad_command");
BEAST_EXPECT(result[jss::result][jss::request][jss::command] == "bad_command");
}
void
@@ -2169,19 +2101,12 @@ public:
jt.jv.removeMember(jss::Fee);
jt.jv.removeMember(jss::TxnSignature);
req[jss::tx_json] = jt.jv;
Json::Value result = checkFee(
req,
Role::ADMIN,
true,
env.app().config(),
feeTrack,
env.app().getTxQ(),
env.app());
Json::Value result =
checkFee(req, Role::ADMIN, true, env.app().config(), feeTrack, env.app().getTxQ(), env.app());
BEAST_EXPECT(result.size() == 0);
BEAST_EXPECT(
req[jss::tx_json].isMember(jss::Fee) &&
req[jss::tx_json][jss::Fee] ==
env.current()->fees().base.jsonClipped());
req[jss::tx_json][jss::Fee] == env.current()->fees().base.jsonClipped());
}
// test signers max size
@@ -2240,19 +2165,12 @@ public:
alice));
req[jss::tx_json] = jt.jv;
Json::Value result = checkFee(
req,
Role::ADMIN,
true,
env.app().config(),
feeTrack,
env.app().getTxQ(),
env.app());
Json::Value result =
checkFee(req, Role::ADMIN, true, env.app().config(), feeTrack, env.app().getTxQ(), env.app());
BEAST_EXPECT(result.size() == 0);
BEAST_EXPECT(
req[jss::tx_json].isMember(jss::Fee) &&
req[jss::tx_json][jss::Fee] ==
env.current()->fees().base.jsonClipped());
req[jss::tx_json][jss::Fee] == env.current()->fees().base.jsonClipped());
}
}
@@ -2261,28 +2179,18 @@ public:
{
testcase("autofill fees");
test::jtx::Env env(*this);
auto const baseFee =
static_cast<int>(env.current()->fees().base.drops());
auto const baseFee = static_cast<int>(env.current()->fees().base.drops());
auto ledger = env.current();
auto const& feeTrack = env.app().getFeeTrack();
{
Json::Value req;
Json::Reader().parse(
"{ \"fee_mult_max\" : 1, \"tx_json\" : { } } ", req);
Json::Value result = checkFee(
req,
Role::ADMIN,
true,
env.app().config(),
feeTrack,
env.app().getTxQ(),
env.app());
Json::Reader().parse("{ \"fee_mult_max\" : 1, \"tx_json\" : { } } ", req);
Json::Value result =
checkFee(req, Role::ADMIN, true, env.app().config(), feeTrack, env.app().getTxQ(), env.app());
BEAST_EXPECT(!RPC::contains_error(result));
BEAST_EXPECT(
req[jss::tx_json].isMember(jss::Fee) &&
req[jss::tx_json][jss::Fee] == baseFee);
BEAST_EXPECT(req[jss::tx_json].isMember(jss::Fee) && req[jss::tx_json][jss::Fee] == baseFee);
}
{
@@ -2291,33 +2199,18 @@ public:
"{ \"fee_mult_max\" : 3, \"fee_div_max\" : 2, "
"\"tx_json\" : { } } ",
req);
Json::Value result = checkFee(
req,
Role::ADMIN,
true,
env.app().config(),
feeTrack,
env.app().getTxQ(),
env.app());
Json::Value result =
checkFee(req, Role::ADMIN, true, env.app().config(), feeTrack, env.app().getTxQ(), env.app());
BEAST_EXPECT(!RPC::contains_error(result));
BEAST_EXPECT(
req[jss::tx_json].isMember(jss::Fee) &&
req[jss::tx_json][jss::Fee] == baseFee);
BEAST_EXPECT(req[jss::tx_json].isMember(jss::Fee) && req[jss::tx_json][jss::Fee] == baseFee);
}
{
Json::Value req;
Json::Reader().parse(
"{ \"fee_mult_max\" : 0, \"tx_json\" : { } } ", req);
Json::Value result = checkFee(
req,
Role::ADMIN,
true,
env.app().config(),
feeTrack,
env.app().getTxQ(),
env.app());
Json::Reader().parse("{ \"fee_mult_max\" : 0, \"tx_json\" : { } } ", req);
Json::Value result =
checkFee(req, Role::ADMIN, true, env.app().config(), feeTrack, env.app().getTxQ(), env.app());
BEAST_EXPECT(RPC::contains_error(result));
BEAST_EXPECT(!req[jss::tx_json].isMember(jss::Fee));
@@ -2331,14 +2224,8 @@ public:
"{ \"fee_mult_max\" : 3, \"fee_div_max\" : 6, "
"\"tx_json\" : { } } ",
req);
Json::Value result = checkFee(
req,
Role::ADMIN,
true,
env.app().config(),
feeTrack,
env.app().getTxQ(),
env.app());
Json::Value result =
checkFee(req, Role::ADMIN, true, env.app().config(), feeTrack, env.app().getTxQ(), env.app());
BEAST_EXPECT(RPC::contains_error(result));
BEAST_EXPECT(!req[jss::tx_json].isMember(jss::Fee));
@@ -2350,14 +2237,8 @@ public:
"{ \"fee_mult_max\" : 0, \"fee_div_max\" : 2, "
"\"tx_json\" : { } } ",
req);
Json::Value result = checkFee(
req,
Role::ADMIN,
true,
env.app().config(),
feeTrack,
env.app().getTxQ(),
env.app());
Json::Value result =
checkFee(req, Role::ADMIN, true, env.app().config(), feeTrack, env.app().getTxQ(), env.app());
BEAST_EXPECT(RPC::contains_error(result));
BEAST_EXPECT(!req[jss::tx_json].isMember(jss::Fee));
@@ -2369,14 +2250,8 @@ public:
"{ \"fee_mult_max\" : 10, \"fee_div_max\" : 0, "
"\"tx_json\" : { } } ",
req);
Json::Value result = checkFee(
req,
Role::ADMIN,
true,
env.app().config(),
feeTrack,
env.app().getTxQ(),
env.app());
Json::Value result =
checkFee(req, Role::ADMIN, true, env.app().config(), feeTrack, env.app().getTxQ(), env.app());
BEAST_EXPECT(RPC::contains_error(result));
BEAST_EXPECT(!req[jss::tx_json].isMember(jss::Fee));
@@ -2386,22 +2261,14 @@ public:
// transaction with a higher base fee
Json::Value req;
test::jtx::Account const alice("alice");
req[jss::tx_json] =
test::jtx::acctdelete(env.master.human(), alice.human());
Json::Value result = checkFee(
req,
Role::ADMIN,
true,
env.app().config(),
feeTrack,
env.app().getTxQ(),
env.app());
req[jss::tx_json] = test::jtx::acctdelete(env.master.human(), alice.human());
Json::Value result =
checkFee(req, Role::ADMIN, true, env.app().config(), feeTrack, env.app().getTxQ(), env.app());
BEAST_EXPECT(result.size() == 0);
BEAST_EXPECT(
req[jss::tx_json].isMember(jss::Fee) &&
req[jss::tx_json][jss::Fee] ==
env.current()->fees().increment.jsonClipped());
req[jss::tx_json][jss::Fee] == env.current()->fees().increment.jsonClipped());
}
}
@@ -2412,8 +2279,7 @@ public:
using namespace test::jtx;
Env env{*this, envconfig([](std::unique_ptr<Config> cfg) {
cfg->loadFromString("[" SECTION_SIGNING_SUPPORT "]\ntrue");
cfg->section("transaction_queue")
.set("minimum_txn_in_ledger_standalone", "3");
cfg->section("transaction_queue").set("minimum_txn_in_ledger_standalone", "3");
return cfg;
})};
LoadFeeTrack const& feeTrackOuter = env.app().getFeeTrack();
@@ -2427,19 +2293,11 @@ public:
"tx_json" : { }
})",
req);
Json::Value result = checkFee(
req,
Role::ADMIN,
true,
env.app().config(),
feeTrackOuter,
env.app().getTxQ(),
env.app());
Json::Value result =
checkFee(req, Role::ADMIN, true, env.app().config(), feeTrackOuter, env.app().getTxQ(), env.app());
BEAST_EXPECT(!RPC::contains_error(result));
BEAST_EXPECT(
req[jss::tx_json].isMember(jss::Fee) &&
req[jss::tx_json][jss::Fee] == 10);
BEAST_EXPECT(req[jss::tx_json].isMember(jss::Fee) && req[jss::tx_json][jss::Fee] == 10);
}
{
@@ -2451,19 +2309,11 @@ public:
"tx_json" : { }
})",
req);
Json::Value result = checkFee(
req,
Role::ADMIN,
true,
env.app().config(),
feeTrackOuter,
env.app().getTxQ(),
env.app());
Json::Value result =
checkFee(req, Role::ADMIN, true, env.app().config(), feeTrackOuter, env.app().getTxQ(), env.app());
BEAST_EXPECT(!RPC::contains_error(result));
BEAST_EXPECT(
req[jss::tx_json].isMember(jss::Fee) &&
req[jss::tx_json][jss::Fee] == 10);
BEAST_EXPECT(req[jss::tx_json].isMember(jss::Fee) && req[jss::tx_json][jss::Fee] == 10);
}
// put 4 transactions into the open ledger
@@ -2481,19 +2331,11 @@ public:
"tx_json" : { }
})",
req);
Json::Value result = checkFee(
req,
Role::ADMIN,
true,
env.app().config(),
feeTrackOuter,
env.app().getTxQ(),
env.app());
Json::Value result =
checkFee(req, Role::ADMIN, true, env.app().config(), feeTrackOuter, env.app().getTxQ(), env.app());
BEAST_EXPECT(!RPC::contains_error(result));
BEAST_EXPECT(
req[jss::tx_json].isMember(jss::Fee) &&
req[jss::tx_json][jss::Fee] == 8889);
BEAST_EXPECT(req[jss::tx_json].isMember(jss::Fee) && req[jss::tx_json][jss::Fee] == 8889);
}
{
@@ -2505,14 +2347,8 @@ public:
"tx_json" : { }
})",
req);
Json::Value result = checkFee(
req,
Role::ADMIN,
true,
env.app().config(),
feeTrackOuter,
env.app().getTxQ(),
env.app());
Json::Value result =
checkFee(req, Role::ADMIN, true, env.app().config(), feeTrackOuter, env.app().getTxQ(), env.app());
BEAST_EXPECT(RPC::contains_error(result));
BEAST_EXPECT(!req[jss::tx_json].isMember(jss::Fee));
@@ -2528,14 +2364,8 @@ public:
"tx_json" : { }
})",
req);
Json::Value result = checkFee(
req,
Role::ADMIN,
true,
env.app().config(),
feeTrackOuter,
env.app().getTxQ(),
env.app());
Json::Value result =
checkFee(req, Role::ADMIN, true, env.app().config(), feeTrackOuter, env.app().getTxQ(), env.app());
BEAST_EXPECT(RPC::contains_error(result));
BEAST_EXPECT(!req[jss::tx_json].isMember(jss::Fee));
@@ -2551,19 +2381,11 @@ public:
"tx_json" : { }
})",
req);
Json::Value result = checkFee(
req,
Role::ADMIN,
true,
env.app().config(),
feeTrackOuter,
env.app().getTxQ(),
env.app());
Json::Value result =
checkFee(req, Role::ADMIN, true, env.app().config(), feeTrackOuter, env.app().getTxQ(), env.app());
BEAST_EXPECT(!RPC::contains_error(result));
BEAST_EXPECT(
req[jss::tx_json].isMember(jss::Fee) &&
req[jss::tx_json][jss::Fee] == 8889);
BEAST_EXPECT(req[jss::tx_json].isMember(jss::Fee) && req[jss::tx_json][jss::Fee] == 8889);
}
{
@@ -2575,14 +2397,8 @@ public:
"tx_json" : { }
})",
req);
Json::Value result = checkFee(
req,
Role::ADMIN,
true,
env.app().config(),
feeTrackOuter,
env.app().getTxQ(),
env.app());
Json::Value result =
checkFee(req, Role::ADMIN, true, env.app().config(), feeTrackOuter, env.app().getTxQ(), env.app());
BEAST_EXPECT(RPC::contains_error(result));
}
@@ -2596,14 +2412,8 @@ public:
"tx_json" : { }
})",
req);
Json::Value result = checkFee(
req,
Role::ADMIN,
true,
env.app().config(),
feeTrackOuter,
env.app().getTxQ(),
env.app());
Json::Value result =
checkFee(req, Role::ADMIN, true, env.app().config(), feeTrackOuter, env.app().getTxQ(), env.app());
BEAST_EXPECT(RPC::contains_error(result));
}
@@ -2618,14 +2428,8 @@ public:
"tx_json" : { }
})",
req);
Json::Value result = checkFee(
req,
Role::ADMIN,
true,
env.app().config(),
feeTrackOuter,
env.app().getTxQ(),
env.app());
Json::Value result =
checkFee(req, Role::ADMIN, true, env.app().config(), feeTrackOuter, env.app().getTxQ(), env.app());
BEAST_EXPECT(RPC::contains_error(result));
}
@@ -2641,13 +2445,10 @@ public:
auto result = rpcResult[jss::result];
BEAST_EXPECT(!RPC::contains_error(result));
BEAST_EXPECT(
result[jss::tx_json].isMember(jss::Fee) &&
result[jss::tx_json][jss::Fee] == "10");
BEAST_EXPECT(result[jss::tx_json].isMember(jss::Fee) && result[jss::tx_json][jss::Fee] == "10");
BEAST_EXPECT(
result[jss::tx_json].isMember(jss::Sequence) &&
result[jss::tx_json][jss::Sequence].isConvertibleTo(
Json::ValueType::uintValue));
result[jss::tx_json][jss::Sequence].isConvertibleTo(Json::ValueType::uintValue));
}
{
@@ -2669,13 +2470,10 @@ public:
auto result = rpcResult[jss::result];
BEAST_EXPECT(!RPC::contains_error(result));
BEAST_EXPECT(
result[jss::tx_json].isMember(jss::Fee) &&
result[jss::tx_json][jss::Fee] == "7813");
BEAST_EXPECT(result[jss::tx_json].isMember(jss::Fee) && result[jss::tx_json][jss::Fee] == "7813");
BEAST_EXPECT(
result[jss::tx_json].isMember(jss::Sequence) &&
result[jss::tx_json][jss::Sequence].isConvertibleTo(
Json::ValueType::uintValue));
result[jss::tx_json][jss::Sequence].isConvertibleTo(Json::ValueType::uintValue));
env.close();
}
@@ -2697,13 +2495,10 @@ public:
auto result = rpcResult[jss::result];
BEAST_EXPECT(!RPC::contains_error(result));
BEAST_EXPECT(
result[jss::tx_json].isMember(jss::Fee) &&
result[jss::tx_json][jss::Fee] == "47");
BEAST_EXPECT(result[jss::tx_json].isMember(jss::Fee) && result[jss::tx_json][jss::Fee] == "47");
BEAST_EXPECT(
result[jss::tx_json].isMember(jss::Sequence) &&
result[jss::tx_json][jss::Sequence].isConvertibleTo(
Json::ValueType::uintValue));
result[jss::tx_json][jss::Sequence].isConvertibleTo(Json::ValueType::uintValue));
}
{
@@ -2730,13 +2525,10 @@ public:
auto result = rpcResult[jss::result];
BEAST_EXPECT(!RPC::contains_error(result));
BEAST_EXPECT(
result[jss::tx_json].isMember(jss::Fee) &&
result[jss::tx_json][jss::Fee] == "6806");
BEAST_EXPECT(result[jss::tx_json].isMember(jss::Fee) && result[jss::tx_json][jss::Fee] == "6806");
BEAST_EXPECT(
result[jss::tx_json].isMember(jss::Sequence) &&
result[jss::tx_json][jss::Sequence].isConvertibleTo(
Json::ValueType::uintValue));
result[jss::tx_json][jss::Sequence].isConvertibleTo(Json::ValueType::uintValue));
}
}
@@ -2760,19 +2552,13 @@ public:
auto result = rpcResult[jss::result];
BEAST_EXPECT(!RPC::contains_error(result));
BEAST_EXPECT(
result[jss::tx_json].isMember(jss::NetworkID) &&
result[jss::tx_json][jss::NetworkID] == 1025);
BEAST_EXPECT(result[jss::tx_json].isMember(jss::NetworkID) && result[jss::tx_json][jss::NetworkID] == 1025);
}
}
// A function that can be called as though it would process a transaction.
static void
fakeProcessTransaction(
std::shared_ptr<Transaction>&,
bool,
bool,
NetworkOPs::FailHard)
fakeProcessTransaction(std::shared_ptr<Transaction>&, bool, bool, NetworkOPs::FailHard)
{
;
}
@@ -2828,18 +2614,13 @@ public:
Application& app,
ProcessTransactionFn const& processTransaction);
using TestStuff =
std::tuple<signFunc, submitFunc, char const*, unsigned int>;
using TestStuff = std::tuple<signFunc, submitFunc, char const*, unsigned int>;
static TestStuff const testFuncs[] = {
TestStuff{transactionSign, nullptr, "sign", 0},
TestStuff{nullptr, transactionSubmit, "submit", 1},
TestStuff{transactionSignFor, nullptr, "sign_for", 2},
TestStuff{
nullptr,
transactionSubmitMultiSigned,
"submit_multisigned",
3}};
TestStuff{nullptr, transactionSubmitMultiSigned, "submit_multisigned", 3}};
for (auto testFunc : testFuncs)
{
@@ -2849,11 +2630,9 @@ public:
Json::Value req;
Json::Reader().parse(txnTest.json, req);
if (RPC::contains_error(req))
Throw<std::runtime_error>(
"Internal JSONRPC_test error. Bad test JSON.");
Throw<std::runtime_error>("Internal JSONRPC_test error. Bad test JSON.");
static Role const testedRoles[] = {
Role::GUEST, Role::USER, Role::ADMIN, Role::FORBID};
static Role const testedRoles[] = {Role::GUEST, Role::USER, Role::ADMIN, Role::FORBID};
for (Role testRole : testedRoles)
{
@@ -2862,26 +2641,13 @@ public:
if (signFn != nullptr)
{
assert(get<1>(testFunc) == nullptr);
result = signFn(
req,
1,
NetworkOPs::FailHard::yes,
testRole,
1s,
env.app());
result = signFn(req, 1, NetworkOPs::FailHard::yes, testRole, 1s, env.app());
}
else
{
auto const submitFn = get<1>(testFunc);
assert(submitFn != nullptr);
result = submitFn(
req,
1,
NetworkOPs::FailHard::yes,
testRole,
1s,
env.app(),
processTxn);
result = submitFn(req, 1, NetworkOPs::FailHard::yes, testRole, 1s, env.app(), processTxn);
}
std::string errStr;
@@ -2895,9 +2661,8 @@ public:
else
{
std::ostringstream description;
description << txnTest.description << " Called "
<< get<2>(testFunc) << "(). Got \'"
<< errStr << "\'";
description << txnTest.description << " Called " << get<2>(testFunc) << "(). Got \'" << errStr
<< "\'";
fail(description.str(), __FILE__, txnTest.line);
}
}