From 450129cc1621700e0d49bca4710ae8f4fc093e56 Mon Sep 17 00:00:00 2001 From: Vito <5780819+Tapanito@users.noreply.github.com> Date: Tue, 24 Jun 2025 14:49:30 +0200 Subject: [PATCH] improves code readabiliy --- src/test/overlay/base_squelch_test.cpp | 14 ++++++++++---- src/xrpld/overlay/Slot.h | 7 ------- src/xrpld/overlay/detail/Slot.cpp | 5 +++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/test/overlay/base_squelch_test.cpp b/src/test/overlay/base_squelch_test.cpp index a35941840e..56f71fbc42 100644 --- a/src/test/overlay/base_squelch_test.cpp +++ b/src/test/overlay/base_squelch_test.cpp @@ -35,6 +35,7 @@ #include #include +#include #include #include #include @@ -999,7 +1000,8 @@ protected: str << s << " "; if (log) std::cout - << (double)reduce_relay::epoch(now) + << (double)std::chrono::duration_cast( + now.time_since_epoch()) .count() / 1000. << " random, squelched, validator: " << validator.id() @@ -1091,9 +1093,13 @@ protected: event.isSelected_ = network_.overlay().isSelected(*event.key_, event.peer_); auto peers = network_.overlay().getPeers(*event.key_); - auto d = reduce_relay::epoch(now).count() - - reduce_relay::epoch( - peers[event.peer_].lastMessage) + + auto d = + std::chrono::duration_cast( + now.time_since_epoch()) + .count() - + std::chrono::duration_cast( + peers[event.peer_].lastMessage.time_since_epoch()) .count(); mustHandle = event.isSelected_ && diff --git a/src/xrpld/overlay/Slot.h b/src/xrpld/overlay/Slot.h index f827dac6f1..7e21d8cdd2 100644 --- a/src/xrpld/overlay/Slot.h +++ b/src/xrpld/overlay/Slot.h @@ -90,13 +90,6 @@ to_string(SlotState state) } } -template -Unit -epoch(TP const& t) -{ - return std::chrono::duration_cast(t.time_since_epoch()); -} - /** Abstract class. Declares squelch and unsquelch handlers. * OverlayImpl inherits from this class. Motivation is * for easier unit tests to facilitate on the fly diff --git a/src/xrpld/overlay/detail/Slot.cpp b/src/xrpld/overlay/detail/Slot.cpp index 08a8d7dff6..a93f732105 100644 --- a/src/xrpld/overlay/detail/Slot.cpp +++ b/src/xrpld/overlay/detail/Slot.cpp @@ -315,8 +315,9 @@ bool Slots::reduceRelayReady() { if (!reduceRelayReady_) - reduceRelayReady_ = reduce_relay::epoch( - clock_.now()) > reduce_relay::WAIT_ON_BOOTUP; + reduceRelayReady_ = + std::chrono::duration_cast( + clock_.now().time_since_epoch()) > reduce_relay::WAIT_ON_BOOTUP; return reduceRelayReady_; }