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

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

View File

@@ -973,8 +973,7 @@ protected:
auto countingState = network_.overlay().isCountingState(validator);
BEAST_EXPECT(
countingState == false &&
selected.size() ==
env_.app().config().VP_REDUCE_RELAY_SQUELCH_MAX_SELECTED_PEERS);
selected.size() == env_.app().config().vpReduceRelaySquelchMaxSelectedPeers);
}
// Trigger Link Down or Peer Disconnect event
@@ -1163,7 +1162,7 @@ protected:
{
BEAST_EXPECT(
squelched ==
kMaxPeers - env_.app().config().VP_REDUCE_RELAY_SQUELCH_MAX_SELECTED_PEERS);
kMaxPeers - env_.app().config().vpReduceRelaySquelchMaxSelectedPeers);
n++;
}
},
@@ -1172,8 +1171,7 @@ protected:
purge,
resetClock);
auto selected = network_.overlay().getSelected(network_.validator(0));
BEAST_EXPECT(
selected.size() == env_.app().config().VP_REDUCE_RELAY_SQUELCH_MAX_SELECTED_PEERS);
BEAST_EXPECT(selected.size() == env_.app().config().vpReduceRelaySquelchMaxSelectedPeers);
BEAST_EXPECT(n == 1); // only one selection round
auto res = checkCounting(network_.validator(0), false);
BEAST_EXPECT(res);
@@ -1234,7 +1232,7 @@ protected:
id, [&](PublicKey const& key, PeerWPtr const& peer) { unsquelched++; });
BEAST_EXPECT(
unsquelched ==
kMaxPeers - env_.app().config().VP_REDUCE_RELAY_SQUELCH_MAX_SELECTED_PEERS);
kMaxPeers - env_.app().config().vpReduceRelaySquelchMaxSelectedPeers);
BEAST_EXPECT(checkCounting(network_.validator(0), true));
});
}
@@ -1254,7 +1252,7 @@ protected:
auto peers = network_.overlay().getPeers(network_.validator(0));
BEAST_EXPECT(
unsquelched ==
kMaxPeers - env_.app().config().VP_REDUCE_RELAY_SQUELCH_MAX_SELECTED_PEERS);
kMaxPeers - env_.app().config().vpReduceRelaySquelchMaxSelectedPeers);
BEAST_EXPECT(checkCounting(network_.validator(0), true));
});
}
@@ -1293,7 +1291,7 @@ vp_enable=1
)xrpldConfig");
c.loadFromString(toLoad);
BEAST_EXPECT(c.VP_REDUCE_RELAY_BASE_SQUELCH_ENABLE == true);
BEAST_EXPECT(c.vpReduceRelayBaseSquelchEnable == true);
});
doTest("Test Config - squelch disabled (legacy)", log, [&](bool log) {
@@ -1305,7 +1303,7 @@ vp_enable=0
)xrpldConfig");
c.loadFromString(toLoad);
BEAST_EXPECT(c.VP_REDUCE_RELAY_BASE_SQUELCH_ENABLE == false);
BEAST_EXPECT(c.vpReduceRelayBaseSquelchEnable == false);
Config c1;
@@ -1314,7 +1312,7 @@ vp_enable=0
)xrpldConfig";
c1.loadFromString(toLoad);
BEAST_EXPECT(c1.VP_REDUCE_RELAY_BASE_SQUELCH_ENABLE == false);
BEAST_EXPECT(c1.vpReduceRelayBaseSquelchEnable == false);
});
doTest("Test Config - squelch enabled", log, [&](bool log) {
@@ -1326,7 +1324,7 @@ vp_base_squelch_enable=1
)xrpldConfig");
c.loadFromString(toLoad);
BEAST_EXPECT(c.VP_REDUCE_RELAY_BASE_SQUELCH_ENABLE == true);
BEAST_EXPECT(c.vpReduceRelayBaseSquelchEnable == true);
});
doTest("Test Config - squelch disabled", log, [&](bool log) {
@@ -1338,7 +1336,7 @@ vp_base_squelch_enable=0
)xrpldConfig");
c.loadFromString(toLoad);
BEAST_EXPECT(c.VP_REDUCE_RELAY_BASE_SQUELCH_ENABLE == false);
BEAST_EXPECT(c.vpReduceRelayBaseSquelchEnable == false);
});
doTest("Test Config - legacy and new", log, [&](bool log) {
@@ -1378,7 +1376,7 @@ vp_enable=0
)xrpldConfig");
c.loadFromString(toLoad);
BEAST_EXPECT(c.VP_REDUCE_RELAY_SQUELCH_MAX_SELECTED_PEERS == 5);
BEAST_EXPECT(c.vpReduceRelaySquelchMaxSelectedPeers == 5);
Config c1;
@@ -1388,7 +1386,7 @@ vp_base_squelch_max_selected_peers=6
)xrpldConfig";
c1.loadFromString(toLoad);
BEAST_EXPECT(c1.VP_REDUCE_RELAY_SQUELCH_MAX_SELECTED_PEERS == 6);
BEAST_EXPECT(c1.vpReduceRelaySquelchMaxSelectedPeers == 6);
Config c2;
@@ -1421,7 +1419,7 @@ vp_base_squelch_max_selected_peers=2
doTest("BaseSquelchReady", log, [&](bool log) {
ManualClock::reset();
auto createSlots = [&](bool baseSquelchEnabled) -> reduce_relay::Slots<ManualClock> {
env_.app().config().VP_REDUCE_RELAY_BASE_SQUELCH_ENABLE = baseSquelchEnabled;
env_.app().config().vpReduceRelayBaseSquelchEnable = baseSquelchEnabled;
return reduce_relay::Slots<ManualClock>(
env_.app(), network_.overlay(), env_.app().config());
};
@@ -1577,10 +1575,10 @@ vp_base_squelch_max_selected_peers=2
<< "[compression]\n"
<< "1\n";
c.loadFromString(str.str());
env_.app().config().VP_REDUCE_RELAY_BASE_SQUELCH_ENABLE =
c.VP_REDUCE_RELAY_BASE_SQUELCH_ENABLE;
env_.app().config().vpReduceRelayBaseSquelchEnable =
c.vpReduceRelayBaseSquelchEnable;
env_.app().config().COMPRESSION = c.COMPRESSION;
env_.app().config().compression = c.compression;
};
auto handshake = [&](int outboundEnable, int inboundEnable) {
beast::IP::Address const addr = boost::asio::ip::make_address("172.1.1.100");
@@ -1588,10 +1586,10 @@ vp_base_squelch_max_selected_peers=2
setEnv(outboundEnable);
auto request = xrpl::makeRequest(
true,
env_.app().config().COMPRESSION,
env_.app().config().compression,
false,
env_.app().config().TX_REDUCE_RELAY_ENABLE,
env_.app().config().VP_REDUCE_RELAY_BASE_SQUELCH_ENABLE);
env_.app().config().txReduceRelayEnable,
env_.app().config().vpReduceRelayBaseSquelchEnable);
http_request_type httpRequest;
httpRequest.version(request.version());
httpRequest.base() = request.base();
@@ -1626,8 +1624,8 @@ vp_base_squelch_max_selected_peers=2
public:
reduce_relay_test()
: env_(*this, jtx::envconfig([](std::unique_ptr<Config> cfg) {
cfg->VP_REDUCE_RELAY_BASE_SQUELCH_ENABLE = true;
cfg->VP_REDUCE_RELAY_SQUELCH_MAX_SELECTED_PEERS = 6;
cfg->vpReduceRelayBaseSquelchEnable = true;
cfg->vpReduceRelaySquelchMaxSelectedPeers = 6;
return cfg;
}))
, network_(env_.app())