mirror of
https://github.com/XRPLF/rippled.git
synced 2026-07-27 17:10:46 +00:00
chore: Set ColumnLimit to 120 in clang-format (#6288)
This change updates the ColumnLimit from 80 to 120, and applies clang-format to reformat the code.
This commit is contained in:
@@ -24,9 +24,7 @@ class Version_test : public beast::unit_test::suite
|
||||
auto jrr = env.rpc(
|
||||
"json",
|
||||
"version",
|
||||
"{\"api_version\": " +
|
||||
std::to_string(RPC::apiMaximumSupportedVersion) +
|
||||
"}")[jss::result];
|
||||
"{\"api_version\": " + std::to_string(RPC::apiMaximumSupportedVersion) + "}")[jss::result];
|
||||
BEAST_EXPECT(isCorrectReply(jrr));
|
||||
|
||||
jrr = env.rpc("version")[jss::result];
|
||||
@@ -45,17 +43,13 @@ class Version_test : public beast::unit_test::suite
|
||||
if (re.isMember("error_what"))
|
||||
if (re["error_what"].isString())
|
||||
{
|
||||
return re["error_what"].asString().find(
|
||||
jss::invalid_API_version.c_str()) == 0;
|
||||
return re["error_what"].asString().find(jss::invalid_API_version.c_str()) == 0;
|
||||
}
|
||||
return false;
|
||||
};
|
||||
|
||||
auto re = env.rpc(
|
||||
"json",
|
||||
"version",
|
||||
"{\"api_version\": " +
|
||||
std::to_string(RPC::apiMinimumSupportedVersion - 1) + "}");
|
||||
"json", "version", "{\"api_version\": " + std::to_string(RPC::apiMinimumSupportedVersion - 1) + "}");
|
||||
BEAST_EXPECT(badVersion(re));
|
||||
|
||||
BEAST_EXPECT(env.app().config().BETA_RPC_API);
|
||||
@@ -63,12 +57,7 @@ class Version_test : public beast::unit_test::suite
|
||||
"json",
|
||||
"version",
|
||||
"{\"api_version\": " +
|
||||
std::to_string(
|
||||
std::max(
|
||||
RPC::apiMaximumSupportedVersion.value,
|
||||
RPC::apiBetaVersion.value) +
|
||||
1) +
|
||||
"}");
|
||||
std::to_string(std::max(RPC::apiMaximumSupportedVersion.value, RPC::apiBetaVersion.value) + 1) + "}");
|
||||
BEAST_EXPECT(badVersion(re));
|
||||
|
||||
re = env.rpc("json", "version", "{\"api_version\": \"a\"}");
|
||||
@@ -80,57 +69,38 @@ class Version_test : public beast::unit_test::suite
|
||||
{
|
||||
testcase("test getAPIVersionNumber function");
|
||||
|
||||
unsigned int versionIfUnspecified =
|
||||
RPC::apiVersionIfUnspecified < RPC::apiMinimumSupportedVersion
|
||||
unsigned int versionIfUnspecified = RPC::apiVersionIfUnspecified < RPC::apiMinimumSupportedVersion
|
||||
? RPC::apiInvalidVersion
|
||||
: RPC::apiVersionIfUnspecified;
|
||||
|
||||
Json::Value j_array = Json::Value(Json::arrayValue);
|
||||
Json::Value j_null = Json::Value(Json::nullValue);
|
||||
BEAST_EXPECT(
|
||||
RPC::getAPIVersionNumber(j_array, false) == versionIfUnspecified);
|
||||
BEAST_EXPECT(
|
||||
RPC::getAPIVersionNumber(j_null, false) == versionIfUnspecified);
|
||||
BEAST_EXPECT(RPC::getAPIVersionNumber(j_array, false) == versionIfUnspecified);
|
||||
BEAST_EXPECT(RPC::getAPIVersionNumber(j_null, false) == versionIfUnspecified);
|
||||
|
||||
Json::Value j_object = Json::Value(Json::objectValue);
|
||||
BEAST_EXPECT(
|
||||
RPC::getAPIVersionNumber(j_object, false) == versionIfUnspecified);
|
||||
BEAST_EXPECT(RPC::getAPIVersionNumber(j_object, false) == versionIfUnspecified);
|
||||
j_object[jss::api_version] = RPC::apiVersionIfUnspecified.value;
|
||||
BEAST_EXPECT(
|
||||
RPC::getAPIVersionNumber(j_object, false) == versionIfUnspecified);
|
||||
BEAST_EXPECT(RPC::getAPIVersionNumber(j_object, false) == versionIfUnspecified);
|
||||
|
||||
j_object[jss::api_version] = RPC::apiMinimumSupportedVersion.value;
|
||||
BEAST_EXPECT(
|
||||
RPC::getAPIVersionNumber(j_object, false) ==
|
||||
RPC::apiMinimumSupportedVersion);
|
||||
BEAST_EXPECT(RPC::getAPIVersionNumber(j_object, false) == RPC::apiMinimumSupportedVersion);
|
||||
j_object[jss::api_version] = RPC::apiMaximumSupportedVersion.value;
|
||||
BEAST_EXPECT(
|
||||
RPC::getAPIVersionNumber(j_object, false) ==
|
||||
RPC::apiMaximumSupportedVersion);
|
||||
BEAST_EXPECT(RPC::getAPIVersionNumber(j_object, false) == RPC::apiMaximumSupportedVersion);
|
||||
|
||||
j_object[jss::api_version] = RPC::apiMinimumSupportedVersion - 1;
|
||||
BEAST_EXPECT(
|
||||
RPC::getAPIVersionNumber(j_object, false) ==
|
||||
RPC::apiInvalidVersion);
|
||||
BEAST_EXPECT(RPC::getAPIVersionNumber(j_object, false) == RPC::apiInvalidVersion);
|
||||
j_object[jss::api_version] = RPC::apiMaximumSupportedVersion + 1;
|
||||
BEAST_EXPECT(
|
||||
RPC::getAPIVersionNumber(j_object, false) ==
|
||||
RPC::apiInvalidVersion);
|
||||
BEAST_EXPECT(RPC::getAPIVersionNumber(j_object, false) == RPC::apiInvalidVersion);
|
||||
j_object[jss::api_version] = RPC::apiBetaVersion.value;
|
||||
BEAST_EXPECT(
|
||||
RPC::getAPIVersionNumber(j_object, true) == RPC::apiBetaVersion);
|
||||
BEAST_EXPECT(RPC::getAPIVersionNumber(j_object, true) == RPC::apiBetaVersion);
|
||||
j_object[jss::api_version] = RPC::apiBetaVersion + 1;
|
||||
BEAST_EXPECT(
|
||||
RPC::getAPIVersionNumber(j_object, true) == RPC::apiInvalidVersion);
|
||||
BEAST_EXPECT(RPC::getAPIVersionNumber(j_object, true) == RPC::apiInvalidVersion);
|
||||
|
||||
j_object[jss::api_version] = RPC::apiInvalidVersion.value;
|
||||
BEAST_EXPECT(
|
||||
RPC::getAPIVersionNumber(j_object, false) ==
|
||||
RPC::apiInvalidVersion);
|
||||
BEAST_EXPECT(RPC::getAPIVersionNumber(j_object, false) == RPC::apiInvalidVersion);
|
||||
j_object[jss::api_version] = "a";
|
||||
BEAST_EXPECT(
|
||||
RPC::getAPIVersionNumber(j_object, false) ==
|
||||
RPC::apiInvalidVersion);
|
||||
BEAST_EXPECT(RPC::getAPIVersionNumber(j_object, false) == RPC::apiInvalidVersion);
|
||||
}
|
||||
|
||||
void
|
||||
@@ -155,19 +125,14 @@ class Version_test : public beast::unit_test::suite
|
||||
"\"params\": { "
|
||||
"\"api_version\": " +
|
||||
std::to_string(RPC::apiMaximumSupportedVersion) + "}}";
|
||||
auto re = env.rpc(
|
||||
"json2", '[' + without_api_verion + ", " + with_api_verion + ']');
|
||||
auto re = env.rpc("json2", '[' + without_api_verion + ", " + with_api_verion + ']');
|
||||
|
||||
if (!BEAST_EXPECT(re.isArray()))
|
||||
return;
|
||||
if (!BEAST_EXPECT(re.size() == 2))
|
||||
return;
|
||||
BEAST_EXPECT(
|
||||
re[0u].isMember(jss::result) &&
|
||||
re[0u][jss::result].isMember(jss::version));
|
||||
BEAST_EXPECT(
|
||||
re[1u].isMember(jss::result) &&
|
||||
re[1u][jss::result].isMember(jss::version));
|
||||
BEAST_EXPECT(re[0u].isMember(jss::result) && re[0u][jss::result].isMember(jss::version));
|
||||
BEAST_EXPECT(re[1u].isMember(jss::result) && re[1u][jss::result].isMember(jss::version));
|
||||
}
|
||||
|
||||
void
|
||||
@@ -192,22 +157,14 @@ class Version_test : public beast::unit_test::suite
|
||||
"\"method\": \"version\", "
|
||||
"\"params\": { "
|
||||
"\"api_version\": " +
|
||||
std::to_string(std::max(
|
||||
RPC::apiMaximumSupportedVersion.value,
|
||||
RPC::apiBetaVersion.value) +
|
||||
1) +
|
||||
"}}";
|
||||
auto re = env.rpc(
|
||||
"json2",
|
||||
'[' + without_api_verion + ", " + with_wrong_api_verion + ']');
|
||||
std::to_string(std::max(RPC::apiMaximumSupportedVersion.value, RPC::apiBetaVersion.value) + 1) + "}}";
|
||||
auto re = env.rpc("json2", '[' + without_api_verion + ", " + with_wrong_api_verion + ']');
|
||||
|
||||
if (!BEAST_EXPECT(re.isArray()))
|
||||
return;
|
||||
if (!BEAST_EXPECT(re.size() == 2))
|
||||
return;
|
||||
BEAST_EXPECT(
|
||||
re[0u].isMember(jss::result) &&
|
||||
re[0u][jss::result].isMember(jss::version));
|
||||
BEAST_EXPECT(re[0u].isMember(jss::result) && re[0u][jss::result].isMember(jss::version));
|
||||
BEAST_EXPECT(re[1u].isMember(jss::error));
|
||||
}
|
||||
|
||||
@@ -246,20 +203,14 @@ class Version_test : public beast::unit_test::suite
|
||||
if (!BEAST_EXPECT(env.app().config().BETA_RPC_API == true))
|
||||
return;
|
||||
|
||||
auto jrr = env.rpc(
|
||||
"json",
|
||||
"version",
|
||||
"{\"api_version\": " + std::to_string(RPC::apiBetaVersion) +
|
||||
"}")[jss::result];
|
||||
auto jrr =
|
||||
env.rpc("json", "version", "{\"api_version\": " + std::to_string(RPC::apiBetaVersion) + "}")[jss::result];
|
||||
|
||||
if (!BEAST_EXPECT(jrr.isMember(jss::version)))
|
||||
return;
|
||||
if (!BEAST_EXPECT(jrr[jss::version].isMember(jss::first)) &&
|
||||
jrr[jss::version].isMember(jss::last))
|
||||
if (!BEAST_EXPECT(jrr[jss::version].isMember(jss::first)) && jrr[jss::version].isMember(jss::last))
|
||||
return;
|
||||
BEAST_EXPECT(
|
||||
jrr[jss::version][jss::first] ==
|
||||
RPC::apiMinimumSupportedVersion.value);
|
||||
BEAST_EXPECT(jrr[jss::version][jss::first] == RPC::apiMinimumSupportedVersion.value);
|
||||
BEAST_EXPECT(jrr[jss::version][jss::last] == RPC::apiBetaVersion.value);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user