Merge bitcoin/bitcoin#35559: scripted-diff: Rename SteadyClockContext to FakeSteadyClock

855a3fee88 scripted-diff: Rename SteadyClockContext to FakeSteadyClock (Hao Xu)

Pull request description:

  See: https://github.com/bitcoin/bitcoin/pull/35536#issuecomment-4715945494

  `SteadyClockContext` and `FakeNodeClock` are both LimitOne RAII helpers that mock a clock in tests -- the steady clock and the node clock, respectively. Rename the former so the two follow a consistent FakeXClock naming scheme.

ACKs for top commit:
  maflcko:
    lgtm ACK 855a3fee88
  w0xlt:
    ACK 855a3fee88
  sedited:
    ACK 855a3fee88

Tree-SHA512: 72fd8dd3217d19f4b9f587e379a0aea2b7760ca6d61be6c363e7c06757cba40487df8b40cf3d62f9f9256fb4d0373610dd6f62c6e9ef3edde02265fc967a6bdf
This commit is contained in:
merge-script
2026-06-22 10:59:24 +02:00
5 changed files with 9 additions and 9 deletions

View File

@@ -164,7 +164,7 @@ FUZZ_TARGET(p2p_headers_presync, .init = initialize)
FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
// The steady clock is currently only used for logging, so a constant
// time-point seems acceptable for now.
SteadyClockContext steady_ctx{};
FakeSteadyClock steady_ctx{};
ChainstateManager& chainman = *g_testing_setup->m_node.chainman;
CBlockHeader base{chainman.GetParams().GenesisBlock()};

View File

@@ -44,7 +44,7 @@ struct CheckGlobalsImpl {
"The current fuzz target accessed system time.\n\n"
"This is acceptable, but requires the fuzz target to use \n"
"a FakeNodeClock, SteadyClockContext or call \n"
"a FakeNodeClock, FakeSteadyClock or call \n"
"SetMockTime() at the \n" "beginning of processing the \n"
"fuzz input.\n\n"

View File

@@ -222,7 +222,7 @@ private:
const std::vector<TestOp> m_script;
mutable size_t m_script_ptr = 0;
mutable std::chrono::milliseconds m_time_left;
mutable SteadyClockContext m_clock{};
mutable FakeSteadyClock m_clock{};
mutable bool m_connected{false};
mutable CService m_bound;
mutable CNetAddr m_local_ip;

View File

@@ -25,19 +25,19 @@ private:
/// Helper to initialize the global MockableSteadyClock, let a duration elapse,
/// and reset it after use in a test.
class SteadyClockContext : public LimitOne<SteadyClockContext>
class FakeSteadyClock : public LimitOne<FakeSteadyClock>
{
MockableSteadyClock::mock_time_point::duration t{MockableSteadyClock::INITIAL_MOCK_TIME};
public:
/** Initialize with INITIAL_MOCK_TIME. */
explicit SteadyClockContext() { (*this) += 0s; }
explicit FakeSteadyClock() { (*this) += 0s; }
/** Unset mocktime */
~SteadyClockContext() { MockableSteadyClock::ClearMockTime(); }
~FakeSteadyClock() { MockableSteadyClock::ClearMockTime(); }
SteadyClockContext(const SteadyClockContext&) = delete;
SteadyClockContext& operator=(const SteadyClockContext&) = delete;
FakeSteadyClock(const FakeSteadyClock&) = delete;
FakeSteadyClock& operator=(const FakeSteadyClock&) = delete;
/** Change mocktime by the given duration delta */
void operator+=(std::chrono::milliseconds d)

View File

@@ -42,7 +42,7 @@ using SteadyMicroseconds = std::chrono::time_point<std::chrono::steady_clock, st
using SystemClock = std::chrono::system_clock;
/// Version of SteadyClock that is mockable in the context of tests (via
/// SteadyClockContext, or Self::SetMockTime), otherwise the system steady
/// FakeSteadyClock, or Self::SetMockTime), otherwise the system steady
/// clock.
struct MockableSteadyClock : public std::chrono::steady_clock {
using time_point = std::chrono::time_point<MockableSteadyClock>;