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

style: More clang-tidy identifier renaming (#7290)

Browse Source
This commit is contained in:
Alex Kremer
2026-05-20 22:31:15 +01:00
committed by GitHub
parent 8c0080020f
commit a830ab10ef
160 changed files with 1726 additions and 1746 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
src/test/core/Config_test.cpp
View File

@@ -550,7 +550,7 @@ main
}
BEAST_EXPECT(error.empty());
BEAST_EXPECT(c.NETWORK_ID == 0);
BEAST_EXPECT(c.networkId == 0);
try
{
@@ -563,7 +563,7 @@ main
}
BEAST_EXPECT(error.empty());
BEAST_EXPECT(c.NETWORK_ID == 0);
BEAST_EXPECT(c.networkId == 0);
try
{
@@ -578,7 +578,7 @@ main
}
BEAST_EXPECT(error.empty());
BEAST_EXPECT(c.NETWORK_ID == 255);
BEAST_EXPECT(c.networkId == 255);
try
{
@@ -593,7 +593,7 @@ main
}
BEAST_EXPECT(error.empty());
BEAST_EXPECT(c.NETWORK_ID == 10000);
BEAST_EXPECT(c.networkId == 10000);
}
void
@@ -655,7 +655,7 @@ nHBu9PTL9dn2GuZtdW4U2WzBwffyX9qsQCd9CNU4Z5YG3PQfViM8
c.loadFromString(toLoad);
BEAST_EXPECT(c.legacy("validators_file").empty());
BEAST_EXPECT(c.section(SECTION_VALIDATORS).values().size() == 5);
BEAST_EXPECT(c.VALIDATOR_LIST_THRESHOLD == std::nullopt);
BEAST_EXPECT(c.validatorListThreshold == std::nullopt);
}
{
// load validator list sites and keys from config
@@ -685,7 +685,7 @@ trust-these-validators.gov
"E566");
BEAST_EXPECT(c.section(SECTION_VALIDATOR_LIST_THRESHOLD).values().size() == 1);
BEAST_EXPECT(c.section(SECTION_VALIDATOR_LIST_THRESHOLD).values()[0] == "1");
BEAST_EXPECT(c.VALIDATOR_LIST_THRESHOLD == std::size_t(1));
BEAST_EXPECT(c.validatorListThreshold == std::size_t(1));
}
{
// load validator list sites and keys from config
@@ -715,7 +715,7 @@ trust-these-validators.gov
"E566");
BEAST_EXPECT(c.section(SECTION_VALIDATOR_LIST_THRESHOLD).values().size() == 1);
BEAST_EXPECT(c.section(SECTION_VALIDATOR_LIST_THRESHOLD).values()[0] == "0");
BEAST_EXPECT(c.VALIDATOR_LIST_THRESHOLD == std::nullopt);
BEAST_EXPECT(c.validatorListThreshold == std::nullopt);
}
{
// load should throw if [validator_list_threshold] is greater than
@@ -836,7 +836,7 @@ trust-these-validators.gov
BEAST_EXPECT(c.section(SECTION_VALIDATOR_LIST_SITES).values().size() == 2);
BEAST_EXPECT(c.section(SECTION_VALIDATOR_LIST_KEYS).values().size() == 2);
BEAST_EXPECT(c.section(SECTION_VALIDATOR_LIST_THRESHOLD).values().size() == 1);
BEAST_EXPECT(c.VALIDATOR_LIST_THRESHOLD == 2);
BEAST_EXPECT(c.validatorListThreshold == 2);
}
{
// load from specified [validators_file] file name
@@ -853,7 +853,7 @@ trust-these-validators.gov
BEAST_EXPECT(c.section(SECTION_VALIDATOR_LIST_SITES).values().size() == 2);
BEAST_EXPECT(c.section(SECTION_VALIDATOR_LIST_KEYS).values().size() == 2);
BEAST_EXPECT(c.section(SECTION_VALIDATOR_LIST_THRESHOLD).values().size() == 1);
BEAST_EXPECT(c.VALIDATOR_LIST_THRESHOLD == 2);
BEAST_EXPECT(c.validatorListThreshold == 2);
}
{
// load from specified [validators_file] relative path
@@ -870,7 +870,7 @@ trust-these-validators.gov
BEAST_EXPECT(c.section(SECTION_VALIDATOR_LIST_SITES).values().size() == 2);
BEAST_EXPECT(c.section(SECTION_VALIDATOR_LIST_KEYS).values().size() == 2);
BEAST_EXPECT(c.section(SECTION_VALIDATOR_LIST_THRESHOLD).values().size() == 1);
BEAST_EXPECT(c.VALIDATOR_LIST_THRESHOLD == 2);
BEAST_EXPECT(c.validatorListThreshold == 2);
}
{
// load from validators file in default location
@@ -885,7 +885,7 @@ trust-these-validators.gov
BEAST_EXPECT(c.section(SECTION_VALIDATOR_LIST_SITES).values().size() == 2);
BEAST_EXPECT(c.section(SECTION_VALIDATOR_LIST_KEYS).values().size() == 2);
BEAST_EXPECT(c.section(SECTION_VALIDATOR_LIST_THRESHOLD).values().size() == 1);
BEAST_EXPECT(c.VALIDATOR_LIST_THRESHOLD == 2);
BEAST_EXPECT(c.validatorListThreshold == 2);
}
{
// load from specified [validators_file] instead
@@ -904,7 +904,7 @@ trust-these-validators.gov
BEAST_EXPECT(c.section(SECTION_VALIDATOR_LIST_SITES).values().size() == 2);
BEAST_EXPECT(c.section(SECTION_VALIDATOR_LIST_KEYS).values().size() == 2);
BEAST_EXPECT(c.section(SECTION_VALIDATOR_LIST_THRESHOLD).values().size() == 1);
BEAST_EXPECT(c.VALIDATOR_LIST_THRESHOLD == 2);
BEAST_EXPECT(c.validatorListThreshold == 2);
}
{
@@ -940,7 +940,7 @@ trust-these-validators.gov
BEAST_EXPECT(c.section(SECTION_VALIDATOR_LIST_SITES).values().size() == 4);
BEAST_EXPECT(c.section(SECTION_VALIDATOR_LIST_KEYS).values().size() == 3);
BEAST_EXPECT(c.section(SECTION_VALIDATOR_LIST_THRESHOLD).values().size() == 1);
BEAST_EXPECT(c.VALIDATOR_LIST_THRESHOLD == 2);
BEAST_EXPECT(c.validatorListThreshold == 2);
}
{
// load should throw if [validator_list_threshold] is present both
@@ -1017,7 +1017,7 @@ trust-these-validators.gov
BEAST_EXPECT(!config.quiet());
BEAST_EXPECT(!config.silent());
BEAST_EXPECT(!config.standalone());
BEAST_EXPECT(config.LEDGER_HISTORY == 256);
BEAST_EXPECT(config.ledgerHistory == 256);
BEAST_EXPECT(!config.legacy("database_path").empty());
}
{
@@ -1030,7 +1030,7 @@ trust-these-validators.gov
BEAST_EXPECT(config.quiet());
BEAST_EXPECT(!config.silent());
BEAST_EXPECT(!config.standalone());
BEAST_EXPECT(config.LEDGER_HISTORY == 256);
BEAST_EXPECT(config.ledgerHistory == 256);
BEAST_EXPECT(!config.legacy("database_path").empty());
}
{
@@ -1043,7 +1043,7 @@ trust-these-validators.gov
BEAST_EXPECT(config.quiet());
BEAST_EXPECT(config.silent());
BEAST_EXPECT(!config.standalone());
BEAST_EXPECT(config.LEDGER_HISTORY == 256);
BEAST_EXPECT(config.ledgerHistory == 256);
BEAST_EXPECT(!config.legacy("database_path").empty());
}
{
@@ -1056,7 +1056,7 @@ trust-these-validators.gov
BEAST_EXPECT(config.quiet());
BEAST_EXPECT(config.silent());
BEAST_EXPECT(!config.standalone());
BEAST_EXPECT(config.LEDGER_HISTORY == 256);
BEAST_EXPECT(config.ledgerHistory == 256);
BEAST_EXPECT(!config.legacy("database_path").empty());
}
{
@@ -1069,7 +1069,7 @@ trust-these-validators.gov
BEAST_EXPECT(!config.quiet());
BEAST_EXPECT(!config.silent());
BEAST_EXPECT(config.standalone());
BEAST_EXPECT(config.LEDGER_HISTORY == 0);
BEAST_EXPECT(config.ledgerHistory == 0);
BEAST_EXPECT(config.legacy("database_path").empty() == !explicitPath);
}
{
@@ -1082,7 +1082,7 @@ trust-these-validators.gov
BEAST_EXPECT(config.quiet());
BEAST_EXPECT(!config.silent());
BEAST_EXPECT(config.standalone());
BEAST_EXPECT(config.LEDGER_HISTORY == 0);
BEAST_EXPECT(config.ledgerHistory == 0);
BEAST_EXPECT(config.legacy("database_path").empty() == !explicitPath);
}
{
@@ -1095,7 +1095,7 @@ trust-these-validators.gov
BEAST_EXPECT(config.quiet());
BEAST_EXPECT(config.silent());
BEAST_EXPECT(config.standalone());
BEAST_EXPECT(config.LEDGER_HISTORY == 0);
BEAST_EXPECT(config.ledgerHistory == 0);
BEAST_EXPECT(config.legacy("database_path").empty() == !explicitPath);
}
{
@@ -1108,7 +1108,7 @@ trust-these-validators.gov
BEAST_EXPECT(config.quiet());
BEAST_EXPECT(config.silent());
BEAST_EXPECT(config.standalone());
BEAST_EXPECT(config.LEDGER_HISTORY == 0);
BEAST_EXPECT(config.ledgerHistory == 0);
BEAST_EXPECT(config.legacy("database_path").empty() == !explicitPath);
}
}
@@ -1125,11 +1125,11 @@ trust-these-validators.gov
ParsedPort rpc;
if (!unexcept([&]() { parsePort(rpc, conf["port_rpc"], log); }))
return;
BEAST_EXPECT(rpc.admin_nets_v4.size() + rpc.admin_nets_v6.size() == 2);
BEAST_EXPECT(rpc.adminNetsV4.size() + rpc.adminNetsV6.size() == 2);
ParsedPort wss;
if (!unexcept([&]() { parsePort(wss, conf["port_wss_admin"], log); }))
return;
BEAST_EXPECT(wss.admin_nets_v4.size() + wss.admin_nets_v6.size() == 1);
BEAST_EXPECT(wss.adminNetsV4.size() + wss.adminNetsV6.size() == 1);
}
void
@@ -1245,25 +1245,25 @@ r.ripple.com:51235
BEAST_EXPECT(
cfg.exists(SECTION_IPS_FIXED) && cfg.section(SECTION_IPS_FIXED).lines().size() == 15 &&
cfg.section(SECTION_IPS_FIXED).values().size() == 15);
BEAST_EXPECT(cfg.IPS[0] == "r.ripple.com 51235");
BEAST_EXPECT(cfg.ips[0] == "r.ripple.com 51235");
BEAST_EXPECT(cfg.IPS_FIXED[0] == "s1.ripple.com 51235");
BEAST_EXPECT(cfg.IPS_FIXED[1] == "s2.ripple.com 51235");
BEAST_EXPECT(cfg.IPS_FIXED[2] == "anotherserversansport");
BEAST_EXPECT(cfg.IPS_FIXED[3] == "anotherserverwithport 12");
BEAST_EXPECT(cfg.IPS_FIXED[4] == "1.1.1.1 1");
BEAST_EXPECT(cfg.IPS_FIXED[5] == "1.1.1.1 1");
BEAST_EXPECT(cfg.IPS_FIXED[6] == "12.34.12.123 12345");
BEAST_EXPECT(cfg.IPS_FIXED[7] == "12.34.12.123 12345");
BEAST_EXPECT(cfg.ipsFixed[0] == "s1.ripple.com 51235");
BEAST_EXPECT(cfg.ipsFixed[1] == "s2.ripple.com 51235");
BEAST_EXPECT(cfg.ipsFixed[2] == "anotherserversansport");
BEAST_EXPECT(cfg.ipsFixed[3] == "anotherserverwithport 12");
BEAST_EXPECT(cfg.ipsFixed[4] == "1.1.1.1 1");
BEAST_EXPECT(cfg.ipsFixed[5] == "1.1.1.1 1");
BEAST_EXPECT(cfg.ipsFixed[6] == "12.34.12.123 12345");
BEAST_EXPECT(cfg.ipsFixed[7] == "12.34.12.123 12345");
// all ipv6 should be ignored by colon replacer, howsoever formatted
BEAST_EXPECT(cfg.IPS_FIXED[8] == "::");
BEAST_EXPECT(cfg.IPS_FIXED[9] == "2001:db8::");
BEAST_EXPECT(cfg.IPS_FIXED[10] == "::1");
BEAST_EXPECT(cfg.IPS_FIXED[11] == "::1:12345");
BEAST_EXPECT(cfg.IPS_FIXED[12] == "[::1]:12345");
BEAST_EXPECT(cfg.IPS_FIXED[13] == "2001:db8:3333:4444:5555:6666:7777:8888:12345");
BEAST_EXPECT(cfg.IPS_FIXED[14] == "[2001:db8:3333:4444:5555:6666:7777:8888]:1");
BEAST_EXPECT(cfg.ipsFixed[8] == "::");
BEAST_EXPECT(cfg.ipsFixed[9] == "2001:db8::");
BEAST_EXPECT(cfg.ipsFixed[10] == "::1");
BEAST_EXPECT(cfg.ipsFixed[11] == "::1:12345");
BEAST_EXPECT(cfg.ipsFixed[12] == "[::1]:12345");
BEAST_EXPECT(cfg.ipsFixed[13] == "2001:db8:3333:4444:5555:6666:7777:8888:12345");
BEAST_EXPECT(cfg.ipsFixed[14] == "[2001:db8:3333:4444:5555:6666:7777:8888]:1");
}
void
@@ -1274,51 +1274,51 @@ r.ripple.com:51235
std::string_view line;
std::string_view field;
std::string_view expect;
bool had_comment;
bool hadComment;
};
std::array<TestCommentData, 13> const tests = {
{{.line = "password = aaaa\\#bbbb",
.field = "password",
.expect = "aaaa#bbbb",
.had_comment = false},
.hadComment = false},
{.line = "password = aaaa#bbbb",
.field = "password",
.expect = "aaaa",
.had_comment = true},
.hadComment = true},
{.line = "password = aaaa #bbbb",
.field = "password",
.expect = "aaaa",
.had_comment = true},
.hadComment = true},
// since the value is all comment, this doesn't parse as k=v :
{.line = "password = #aaaa #bbbb",
.field = "",
.expect = "password =",
.had_comment = true},
.hadComment = true},
{.line = "password = aaaa\\# #bbbb",
.field = "password",
.expect = "aaaa#",
.had_comment = true},
.hadComment = true},
{.line = "password = aaaa\\##bbbb",
.field = "password",
.expect = "aaaa#",
.had_comment = true},
{.line = "aaaa#bbbb", .field = "", .expect = "aaaa", .had_comment = true},
{.line = "aaaa\\#bbbb", .field = "", .expect = "aaaa#bbbb", .had_comment = false},
{.line = "aaaa\\##bbbb", .field = "", .expect = "aaaa#", .had_comment = true},
{.line = "aaaa #bbbb", .field = "", .expect = "aaaa", .had_comment = true},
{.line = "1 #comment", .field = "", .expect = "1", .had_comment = true},
{.line = "#whole thing is comment", .field = "", .expect = "", .had_comment = false},
.hadComment = true},
{.line = "aaaa#bbbb", .field = "", .expect = "aaaa", .hadComment = true},
{.line = "aaaa\\#bbbb", .field = "", .expect = "aaaa#bbbb", .hadComment = false},
{.line = "aaaa\\##bbbb", .field = "", .expect = "aaaa#", .hadComment = true},
{.line = "aaaa #bbbb", .field = "", .expect = "aaaa", .hadComment = true},
{.line = "1 #comment", .field = "", .expect = "1", .hadComment = true},
{.line = "#whole thing is comment", .field = "", .expect = "", .hadComment = false},
{.line = " #whole comment with space",
.field = "",
.expect = "",
.had_comment = false}}};
.hadComment = false}}};
for (auto const& t : tests)
{
Section s;
s.append(std::string(t.line));
BEAST_EXPECT(s.hadTrailingComments() == t.had_comment);
BEAST_EXPECT(s.hadTrailingComments() == t.hadComment);
if (t.field.empty())
{
BEAST_EXPECTS(s.legacy() == t.expect, s.legacy());
@@ -1481,7 +1481,7 @@ r.ripple.com:51235
c.loadFromString(toLoad);
if (shouldPass)
{
BEAST_EXPECT(c.AMENDMENT_MAJORITY_TIME.count() == val * sec);
BEAST_EXPECT(c.amendmentMajorityTime.count() == val * sec);
}
else
{
@@ -1512,7 +1512,7 @@ r.ripple.com:51235
{
Config c;
c.loadFromString("[overlay]\nmax_unknown_time=" + value);
return c.MAX_UNKNOWN_TIME;
return c.maxUnknownTime;
}
catch (std::runtime_error const&)
{
@@ -1546,7 +1546,7 @@ r.ripple.com:51235
{
Config c;
c.loadFromString("[overlay]\nmax_diverged_time=" + value);
return c.MAX_DIVERGED_TIME;
return c.maxDivergedTime;
}
catch (std::runtime_error const&)
{

4
src/test/core/Coroutine_test.cpp
View File

@@ -58,7 +58,7 @@ public:
testcase("correct order");
Env env(*this, envconfig([](std::unique_ptr<Config> cfg) {
cfg->FORCE_MULTI_THREAD = true;
cfg->forceMultiThread = true;
return cfg;
}));
@@ -85,7 +85,7 @@ public:
testcase("incorrect order");
Env env(*this, envconfig([](std::unique_ptr<Config> cfg) {
cfg->FORCE_MULTI_THREAD = true;
cfg->forceMultiThread = true;
return cfg;
}));