mirror of
https://github.com/XRPLF/rippled.git
synced 2026-06-06 02:07:07 +00:00
refactor: replace boost::lexical_cast<std::string> with to_string (#5883)
This change replaces boost::lexical_cast<std::string> with to_string in some of the tests to make them more readable. Co-authored-by: Bart Thomee <11445373+bthomee@users.noreply.github.com>
This commit is contained in:
@@ -287,56 +287,39 @@ class LedgerRPC_test : public beast::unit_test::suite
|
||||
// access via the legacy ledger field, keyword index values
|
||||
Json::Value jvParams;
|
||||
jvParams[jss::ledger] = "closed";
|
||||
auto jrr = env.rpc(
|
||||
"json",
|
||||
"ledger",
|
||||
boost::lexical_cast<std::string>(jvParams))[jss::result];
|
||||
auto jrr =
|
||||
env.rpc("json", "ledger", to_string(jvParams))[jss::result];
|
||||
BEAST_EXPECT(jrr.isMember(jss::ledger));
|
||||
BEAST_EXPECT(jrr.isMember(jss::ledger_hash));
|
||||
BEAST_EXPECT(jrr[jss::ledger][jss::ledger_index] == "5");
|
||||
|
||||
jvParams[jss::ledger] = "validated";
|
||||
jrr = env.rpc(
|
||||
"json",
|
||||
"ledger",
|
||||
boost::lexical_cast<std::string>(jvParams))[jss::result];
|
||||
jrr = env.rpc("json", "ledger", to_string(jvParams))[jss::result];
|
||||
BEAST_EXPECT(jrr.isMember(jss::ledger));
|
||||
BEAST_EXPECT(jrr.isMember(jss::ledger_hash));
|
||||
BEAST_EXPECT(jrr[jss::ledger][jss::ledger_index] == "5");
|
||||
|
||||
jvParams[jss::ledger] = "current";
|
||||
jrr = env.rpc(
|
||||
"json",
|
||||
"ledger",
|
||||
boost::lexical_cast<std::string>(jvParams))[jss::result];
|
||||
jrr = env.rpc("json", "ledger", to_string(jvParams))[jss::result];
|
||||
BEAST_EXPECT(jrr.isMember(jss::ledger));
|
||||
BEAST_EXPECT(jrr[jss::ledger][jss::ledger_index] == "6");
|
||||
|
||||
// ask for a bad ledger keyword
|
||||
jvParams[jss::ledger] = "invalid";
|
||||
jrr = env.rpc(
|
||||
"json",
|
||||
"ledger",
|
||||
boost::lexical_cast<std::string>(jvParams))[jss::result];
|
||||
jrr = env.rpc("json", "ledger", to_string(jvParams))[jss::result];
|
||||
BEAST_EXPECT(jrr[jss::error] == "invalidParams");
|
||||
BEAST_EXPECT(jrr[jss::error_message] == "ledgerIndexMalformed");
|
||||
|
||||
// numeric index
|
||||
jvParams[jss::ledger] = 4;
|
||||
jrr = env.rpc(
|
||||
"json",
|
||||
"ledger",
|
||||
boost::lexical_cast<std::string>(jvParams))[jss::result];
|
||||
jrr = env.rpc("json", "ledger", to_string(jvParams))[jss::result];
|
||||
BEAST_EXPECT(jrr.isMember(jss::ledger));
|
||||
BEAST_EXPECT(jrr.isMember(jss::ledger_hash));
|
||||
BEAST_EXPECT(jrr[jss::ledger][jss::ledger_index] == "4");
|
||||
|
||||
// numeric index - out of range
|
||||
jvParams[jss::ledger] = 20;
|
||||
jrr = env.rpc(
|
||||
"json",
|
||||
"ledger",
|
||||
boost::lexical_cast<std::string>(jvParams))[jss::result];
|
||||
jrr = env.rpc("json", "ledger", to_string(jvParams))[jss::result];
|
||||
BEAST_EXPECT(jrr[jss::error] == "lgrNotFound");
|
||||
BEAST_EXPECT(jrr[jss::error_message] == "ledgerNotFound");
|
||||
}
|
||||
@@ -348,29 +331,21 @@ class LedgerRPC_test : public beast::unit_test::suite
|
||||
// access via the ledger_hash field
|
||||
Json::Value jvParams;
|
||||
jvParams[jss::ledger_hash] = hash3;
|
||||
auto jrr = env.rpc(
|
||||
"json",
|
||||
"ledger",
|
||||
boost::lexical_cast<std::string>(jvParams))[jss::result];
|
||||
auto jrr =
|
||||
env.rpc("json", "ledger", to_string(jvParams))[jss::result];
|
||||
BEAST_EXPECT(jrr.isMember(jss::ledger));
|
||||
BEAST_EXPECT(jrr.isMember(jss::ledger_hash));
|
||||
BEAST_EXPECT(jrr[jss::ledger][jss::ledger_index] == "3");
|
||||
|
||||
// extra leading hex chars in hash are not allowed
|
||||
jvParams[jss::ledger_hash] = "DEADBEEF" + hash3;
|
||||
jrr = env.rpc(
|
||||
"json",
|
||||
"ledger",
|
||||
boost::lexical_cast<std::string>(jvParams))[jss::result];
|
||||
jrr = env.rpc("json", "ledger", to_string(jvParams))[jss::result];
|
||||
BEAST_EXPECT(jrr[jss::error] == "invalidParams");
|
||||
BEAST_EXPECT(jrr[jss::error_message] == "ledgerHashMalformed");
|
||||
|
||||
// request with non-string ledger_hash
|
||||
jvParams[jss::ledger_hash] = 2;
|
||||
jrr = env.rpc(
|
||||
"json",
|
||||
"ledger",
|
||||
boost::lexical_cast<std::string>(jvParams))[jss::result];
|
||||
jrr = env.rpc("json", "ledger", to_string(jvParams))[jss::result];
|
||||
BEAST_EXPECT(jrr[jss::error] == "invalidParams");
|
||||
BEAST_EXPECT(jrr[jss::error_message] == "ledgerHashNotString");
|
||||
|
||||
@@ -378,10 +353,7 @@ class LedgerRPC_test : public beast::unit_test::suite
|
||||
jvParams[jss::ledger_hash] =
|
||||
"2E81FC6EC0DD943197EGC7E3FBE9AE30"
|
||||
"7F2775F2F7485BB37307984C3C0F2340";
|
||||
jrr = env.rpc(
|
||||
"json",
|
||||
"ledger",
|
||||
boost::lexical_cast<std::string>(jvParams))[jss::result];
|
||||
jrr = env.rpc("json", "ledger", to_string(jvParams))[jss::result];
|
||||
BEAST_EXPECT(jrr[jss::error] == "invalidParams");
|
||||
BEAST_EXPECT(jrr[jss::error_message] == "ledgerHashMalformed");
|
||||
|
||||
@@ -389,10 +361,7 @@ class LedgerRPC_test : public beast::unit_test::suite
|
||||
jvParams[jss::ledger_hash] =
|
||||
"8C3EEDB3124D92E49E75D81A8826A2E6"
|
||||
"5A75FD71FC3FD6F36FEB803C5F1D812D";
|
||||
jrr = env.rpc(
|
||||
"json",
|
||||
"ledger",
|
||||
boost::lexical_cast<std::string>(jvParams))[jss::result];
|
||||
jrr = env.rpc("json", "ledger", to_string(jvParams))[jss::result];
|
||||
BEAST_EXPECT(jrr[jss::error] == "lgrNotFound");
|
||||
BEAST_EXPECT(jrr[jss::error_message] == "ledgerNotFound");
|
||||
}
|
||||
@@ -401,39 +370,28 @@ class LedgerRPC_test : public beast::unit_test::suite
|
||||
// access via the ledger_index field, keyword index values
|
||||
Json::Value jvParams;
|
||||
jvParams[jss::ledger_index] = "closed";
|
||||
auto jrr = env.rpc(
|
||||
"json",
|
||||
"ledger",
|
||||
boost::lexical_cast<std::string>(jvParams))[jss::result];
|
||||
auto jrr =
|
||||
env.rpc("json", "ledger", to_string(jvParams))[jss::result];
|
||||
BEAST_EXPECT(jrr.isMember(jss::ledger));
|
||||
BEAST_EXPECT(jrr.isMember(jss::ledger_hash));
|
||||
BEAST_EXPECT(jrr[jss::ledger][jss::ledger_index] == "5");
|
||||
BEAST_EXPECT(jrr.isMember(jss::ledger_index));
|
||||
|
||||
jvParams[jss::ledger_index] = "validated";
|
||||
jrr = env.rpc(
|
||||
"json",
|
||||
"ledger",
|
||||
boost::lexical_cast<std::string>(jvParams))[jss::result];
|
||||
jrr = env.rpc("json", "ledger", to_string(jvParams))[jss::result];
|
||||
BEAST_EXPECT(jrr.isMember(jss::ledger));
|
||||
BEAST_EXPECT(jrr.isMember(jss::ledger_hash));
|
||||
BEAST_EXPECT(jrr[jss::ledger][jss::ledger_index] == "5");
|
||||
|
||||
jvParams[jss::ledger_index] = "current";
|
||||
jrr = env.rpc(
|
||||
"json",
|
||||
"ledger",
|
||||
boost::lexical_cast<std::string>(jvParams))[jss::result];
|
||||
jrr = env.rpc("json", "ledger", to_string(jvParams))[jss::result];
|
||||
BEAST_EXPECT(jrr.isMember(jss::ledger));
|
||||
BEAST_EXPECT(jrr[jss::ledger][jss::ledger_index] == "6");
|
||||
BEAST_EXPECT(jrr.isMember(jss::ledger_current_index));
|
||||
|
||||
// ask for a bad ledger keyword
|
||||
jvParams[jss::ledger_index] = "invalid";
|
||||
jrr = env.rpc(
|
||||
"json",
|
||||
"ledger",
|
||||
boost::lexical_cast<std::string>(jvParams))[jss::result];
|
||||
jrr = env.rpc("json", "ledger", to_string(jvParams))[jss::result];
|
||||
BEAST_EXPECT(jrr[jss::error] == "invalidParams");
|
||||
BEAST_EXPECT(jrr[jss::error_message] == "ledgerIndexMalformed");
|
||||
|
||||
@@ -441,10 +399,8 @@ class LedgerRPC_test : public beast::unit_test::suite
|
||||
for (auto i : {1, 2, 3, 4, 5, 6})
|
||||
{
|
||||
jvParams[jss::ledger_index] = i;
|
||||
jrr = env.rpc(
|
||||
"json",
|
||||
"ledger",
|
||||
boost::lexical_cast<std::string>(jvParams))[jss::result];
|
||||
jrr =
|
||||
env.rpc("json", "ledger", to_string(jvParams))[jss::result];
|
||||
BEAST_EXPECT(jrr.isMember(jss::ledger));
|
||||
if (i < 6)
|
||||
BEAST_EXPECT(jrr.isMember(jss::ledger_hash));
|
||||
@@ -454,10 +410,7 @@ class LedgerRPC_test : public beast::unit_test::suite
|
||||
|
||||
// numeric index - out of range
|
||||
jvParams[jss::ledger_index] = 7;
|
||||
jrr = env.rpc(
|
||||
"json",
|
||||
"ledger",
|
||||
boost::lexical_cast<std::string>(jvParams))[jss::result];
|
||||
jrr = env.rpc("json", "ledger", to_string(jvParams))[jss::result];
|
||||
BEAST_EXPECT(jrr[jss::error] == "lgrNotFound");
|
||||
BEAST_EXPECT(jrr[jss::error_message] == "ledgerNotFound");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user