ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

removes unused test parameters

Browse Source
This commit is contained in:
Vito
2025-06-24 17:24:37 +02:00
parent ea8763060c
commit d22a2b82a7
1 changed files with 22 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/test/overlay/base_squelch_test.cpp
View File

@@ -29,9 +29,6 @@
#include <xrpl/basics/random.h> #include <xrpl/basics/random.h>
#include <xrpl/beast/unit_test.h> #include <xrpl/beast/unit_test.h>
#include <xrpl/protocol/SecretKey.h> #include <xrpl/protocol/SecretKey.h>
#include <xrpl/protocol/messages.h>
#include <boost/thread.hpp>
#include <algorithm> #include <algorithm>
#include <chrono> #include <chrono>
@@ -52,12 +49,6 @@ public:
using typename beast::manual_clock<Clock>::duration; using typename beast::manual_clock<Clock>::duration;
using typename beast::manual_clock<Clock>::time_point; using typename beast::manual_clock<Clock>::time_point;
void
reset()
{
this->set(time_point(duration(0)));
}
void void
randAdvance(std::chrono::milliseconds min, std::chrono::milliseconds max) randAdvance(std::chrono::milliseconds min, std::chrono::milliseconds max)
{ {
@@ -238,12 +229,6 @@ public:
return clock_; return clock_;
} }
void
resetClock()
{
clock_ = TestStopwatch{};
}
protected: protected:
TestStopwatch clock_; TestStopwatch clock_;
}; };
@@ -845,12 +830,8 @@ public:
LinkIterCB link, LinkIterCB link,
std::uint16_t nValidators = MAX_VALIDATORS, std::uint16_t nValidators = MAX_VALIDATORS,
std::uint32_t nMessages = MAX_MESSAGES, std::uint32_t nMessages = MAX_MESSAGES,
bool purge = true, bool purge = true)
bool resetClock = true)
{ {
if (resetClock)
overlay_.resetClock();
if (purge) if (purge)
{ {
purgePeers(); purgePeers();
@@ -1185,7 +1166,7 @@ protected:
testPeerUnsquelchedTooSoon(bool log) testPeerUnsquelchedTooSoon(bool log)
{ {
doTest("Peer Unsquelched Too Soon", log, [this](bool log) { doTest("Peer Unsquelched Too Soon", log, [this](bool log) {
BEAST_EXPECT(propagateNoSquelch(log, 1, false, false, false)); BEAST_EXPECT(propagateNoSquelch(log, 1, false, false));
}); });
} }
@@ -1197,13 +1178,13 @@ protected:
{ {
network_.overlay().clock().advance(seconds(601)); network_.overlay().clock().advance(seconds(601));
doTest("Peer Unsquelched", log, [this](bool log) { doTest("Peer Unsquelched", log, [this](bool log) {
BEAST_EXPECT(propagateNoSquelch(log, 2, true, true, false)); BEAST_EXPECT(propagateNoSquelch(log, 2, true, true));
}); });
} }
/** Propagate enough messages to generate one squelch event */ /** Propagate enough messages to generate one squelch event */
bool bool
propagateAndSquelch(bool log, bool purge = true, bool resetClock = true) propagateAndSquelch(bool log, bool purge = true)
{ {
int n = 0; int n = 0;
network_.propagate( network_.propagate(
@@ -1230,8 +1211,7 @@ protected:
}, },
1, 1,
reduce_relay::MAX_MESSAGE_THRESHOLD + 2, reduce_relay::MAX_MESSAGE_THRESHOLD + 2,
purge, purge);
resetClock);
auto selected = network_.overlay().getSelected(network_.validator(0)); auto selected = network_.overlay().getSelected(network_.validator(0));
BEAST_EXPECT( BEAST_EXPECT(
selected.size() == selected.size() ==
@@ -1248,8 +1228,7 @@ protected:
bool log, bool log,
std::uint16_t nMessages, std::uint16_t nMessages,
bool countingState, bool countingState,
bool purge = true, bool purge = true)
bool resetClock = true)
{ {
bool squelched = false; bool squelched = false;
network_.propagate( network_.propagate(
@@ -1265,8 +1244,7 @@ protected:
}, },
1, 1,
nMessages, nMessages,
purge, purge);
resetClock);
auto res = checkCounting(network_.validator(0), countingState); auto res = checkCounting(network_.validator(0), countingState);
return !squelched && res; return !squelched && res;
} }
@@ -1278,9 +1256,9 @@ protected:
testNewPeer(bool log) testNewPeer(bool log)
{ {
doTest("New Peer", log, [this](bool log) { doTest("New Peer", log, [this](bool log) {
BEAST_EXPECT(propagateAndSquelch(log, true, false)); BEAST_EXPECT(propagateAndSquelch(log, true));
network_.addPeer(); network_.addPeer();
BEAST_EXPECT(propagateNoSquelch(log, 1, true, false, false)); BEAST_EXPECT(propagateNoSquelch(log, 1, true, false));
}); });
} }
@@ -1291,7 +1269,7 @@ protected:
{ {
doTest("Selected Peer Disconnects", log, [this](bool log) { doTest("Selected Peer Disconnects", log, [this](bool log) {
network_.overlay().clock().advance(seconds(601)); network_.overlay().clock().advance(seconds(601));
BEAST_EXPECT(propagateAndSquelch(log, true, false)); BEAST_EXPECT(propagateAndSquelch(log, true));
auto id = network_.overlay().getSelectedPeer(network_.validator(0)); auto id = network_.overlay().getSelectedPeer(network_.validator(0));
std::uint16_t unsquelched = 0; std::uint16_t unsquelched = 0;
network_.overlay().deletePeer( network_.overlay().deletePeer(
@@ -1315,7 +1293,7 @@ protected:
{ {
doTest("Selected Peer Stops Relaying", log, [this](bool log) { doTest("Selected Peer Stops Relaying", log, [this](bool log) {
network_.overlay().clock().advance(seconds(601)); network_.overlay().clock().advance(seconds(601));
BEAST_EXPECT(propagateAndSquelch(log, true, false)); BEAST_EXPECT(propagateAndSquelch(log, true));
network_.overlay().clock().advance( network_.overlay().clock().advance(
reduce_relay::IDLED + seconds(1)); reduce_relay::IDLED + seconds(1));
std::uint16_t unsquelched = 0; std::uint16_t unsquelched = 0;
@@ -1341,7 +1319,7 @@ protected:
{ {
doTest("Squelched Peer Disconnects", log, [this](bool log) { doTest("Squelched Peer Disconnects", log, [this](bool log) {
network_.overlay().clock().advance(seconds(601)); network_.overlay().clock().advance(seconds(601));
BEAST_EXPECT(propagateAndSquelch(log, true, false)); BEAST_EXPECT(propagateAndSquelch(log, true));
auto peers = network_.overlay().getPeers(network_.validator(0)); auto peers = network_.overlay().getPeers(network_.validator(0));
auto it = std::find_if(peers.begin(), peers.end(), [&](auto it) { auto it = std::find_if(peers.begin(), peers.end(), [&](auto it) {
return it.second.state == reduce_relay::PeerState::Squelched; return it.second.state == reduce_relay::PeerState::Squelched;
@@ -1495,33 +1473,34 @@ vp_base_squelch_max_selected_peers=2
testBaseSquelchReady(bool log) testBaseSquelchReady(bool log)
{ {
doTest("BaseSquelchReady", log, [&](bool log) { doTest("BaseSquelchReady", log, [&](bool log) {
network_.overlay().resetClock();
auto createSlots = auto createSlots =
[&](bool baseSquelchEnabled) -> reduce_relay::Slots { [&](bool baseSquelchEnabled,
TestStopwatch stopwatch) -> reduce_relay::Slots {
env_.app().config().VP_REDUCE_RELAY_BASE_SQUELCH_ENABLE = env_.app().config().VP_REDUCE_RELAY_BASE_SQUELCH_ENABLE =
baseSquelchEnabled; baseSquelchEnabled;
return reduce_relay::Slots( return reduce_relay::Slots(
env_.app().logs(), env_.app().logs(),
network_.overlay(), network_.overlay(),
env_.app().config(), env_.app().config(),
network_.overlay().clock()); stopwatch);
}; };
TestStopwatch stopwatch;
// base squelching must not be ready if squelching is disabled // base squelching must not be ready if squelching is disabled
BEAST_EXPECT(!createSlots(false).baseSquelchReady()); BEAST_EXPECT(!createSlots(false, stopwatch).baseSquelchReady());
// base squelch must not be ready as not enough time passed from // base squelch must not be ready as not enough time passed from
// bootup // bootup
BEAST_EXPECT(!createSlots(true).baseSquelchReady()); BEAST_EXPECT(!createSlots(true, stopwatch).baseSquelchReady());
network_.overlay().clock().advance( stopwatch.advance(reduce_relay::WAIT_ON_BOOTUP + minutes{1});
reduce_relay::WAIT_ON_BOOTUP + minutes{1});
// base squelch enabled and bootup time passed // base squelch enabled and bootup time passed
BEAST_EXPECT(createSlots(true).baseSquelchReady()); BEAST_EXPECT(createSlots(true, stopwatch).baseSquelchReady());
// even if time passed, base squelching must not be ready if turned // even if time passed, base squelching must not be ready if turned
// off in the config // off in the config
BEAST_EXPECT(!createSlots(false).baseSquelchReady()); BEAST_EXPECT(!createSlots(false, stopwatch).baseSquelchReady());
}); });
} }