ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2026-08-22 14:50:54 +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

21
src/test/overlay/compression_test.cpp
View File

@@ -112,16 +112,16 @@ public:
return;
std::vector<std::uint8_t> decompressed;
decompressed.resize(header->uncompressed_size);
decompressed.resize(header->uncompressedSize);
BEAST_EXPECT(header->payload_wire_size == buffer.size() - header->header_size);
BEAST_EXPECT(header->payloadWireSize == buffer.size() - header->headerSize);
ZeroCopyInputStream stream(buffers.data());
stream.Skip(header->header_size);
stream.Skip(header->headerSize);
auto decompressedSize = xrpl::compression::decompress(
stream, header->payload_wire_size, decompressed.data(), header->uncompressed_size);
BEAST_EXPECT(decompressedSize == header->uncompressed_size);
stream, header->payloadWireSize, decompressed.data(), header->uncompressedSize);
BEAST_EXPECT(decompressedSize == header->uncompressedSize);
auto const proto1 = std::make_shared<T>();
BEAST_EXPECT(proto1->ParseFromArray(decompressed.data(), decompressedSize));
@@ -408,9 +408,8 @@ public:
<< enable << "\n";
c.loadFromString(str.str());
auto env = std::make_shared<jtx::Env>(*this);
env->app().config().COMPRESSION = c.COMPRESSION;
env->app().config().VP_REDUCE_RELAY_BASE_SQUELCH_ENABLE =
c.VP_REDUCE_RELAY_BASE_SQUELCH_ENABLE;
env->app().config().compression = c.compression;
env->app().config().vpReduceRelayBaseSquelchEnable = c.vpReduceRelayBaseSquelchEnable;
return env;
};
auto handshake = [&](int outboundEnable, int inboundEnable) {
@@ -419,10 +418,10 @@ public:
auto env = getEnv(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();

44
src/test/overlay/reduce_relay_test.cpp
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())

22
src/test/overlay/short_read_test.cpp
View File

@@ -62,7 +62,7 @@ private:
using endpoint_type = boost::asio::ip::tcp::endpoint;
using address_type = boost::asio::ip::address;
io_context_type io_context_;
io_context_type ioContext_;
boost::optional<boost::asio::executor_work_guard<boost::asio::io_context::executor_type>> work_;
std::thread thread_;
std::shared_ptr<boost::asio::ssl::context> context_;
@@ -185,10 +185,10 @@ private:
, server(server)
, test(server.test_)
, acceptor(
test.io_context_,
test.ioContext_,
endpoint_type(boost::asio::ip::make_address(test::getEnvLocalhostAddr()), 0))
, socket(test.io_context_)
, strand(boost::asio::make_strand(test.io_context_))
, socket(test.ioContext_)
, strand(boost::asio::make_strand(test.ioContext_))
{
acceptor.listen();
server.endpoint_ = acceptor.local_endpoint();
@@ -261,8 +261,8 @@ private:
, test(server.test_)
, socket(std::move(inSocket))
, stream(socket, *test.context_)
, strand(boost::asio::make_strand(test.io_context_))
, timer(test.io_context_)
, strand(boost::asio::make_strand(test.ioContext_))
, timer(test.ioContext_)
{
}
@@ -450,10 +450,10 @@ private:
: Child(client)
, client(client)
, test(client.test_)
, socket(test.io_context_)
, socket(test.ioContext_)
, stream(socket, *test.context_)
, strand(boost::asio::make_strand(test.io_context_))
, timer(test.io_context_)
, strand(boost::asio::make_strand(test.ioContext_))
, timer(test.ioContext_)
, ep(ep)
{
}
@@ -632,10 +632,10 @@ private:
public:
short_read_test()
: work_(io_context_.get_executor())
: work_(ioContext_.get_executor())
, thread_(std::thread([this]() {
beast::setCurrentThreadName("io_context");
this->io_context_.run();
this->ioContext_.run();
}))
, context_(makeSslContext(""))
{

16
src/test/overlay/tx_reduce_relay_test.cpp
View File

@@ -81,10 +81,10 @@ private:
{
c.loadFromString(str.str());
BEAST_EXPECT(c.TX_REDUCE_RELAY_ENABLE == enable);
BEAST_EXPECT(c.TX_REDUCE_RELAY_METRICS == metrics);
BEAST_EXPECT(c.TX_REDUCE_RELAY_MIN_PEERS == min);
BEAST_EXPECT(c.TX_RELAY_PERCENTAGE == pct);
BEAST_EXPECT(c.txReduceRelayEnable == enable);
BEAST_EXPECT(c.txReduceRelayMetrics == metrics);
BEAST_EXPECT(c.txReduceRelayMinPeers == min);
BEAST_EXPECT(c.txRelayPercentage == pct);
if (success)
{
pass();
@@ -173,7 +173,7 @@ private:
std::uint16_t rid_{1};
shared_context context_;
ProtocolVersion protocolVersion_;
boost::beast::multi_buffer read_buf_;
boost::beast::multi_buffer readBuf_;
public:
tx_reduce_relay_test() : context_(makeSslContext("")), protocolVersion_{1, 7}
@@ -232,9 +232,9 @@ private:
testcase(test);
jtx::Env env(*this);
std::vector<std::shared_ptr<PeerTest>> peers;
env.app().config().TX_REDUCE_RELAY_ENABLE = txRREnabled;
env.app().config().TX_REDUCE_RELAY_MIN_PEERS = minPeers;
env.app().config().TX_RELAY_PERCENTAGE = relayPercentage;
env.app().config().txReduceRelayEnable = txRREnabled;
env.app().config().txReduceRelayMinPeers = minPeers;
env.app().config().txRelayPercentage = relayPercentage;
PeerTest::init();
lid_ = 0;
rid_ = 0;