Update the clock util

ChainSafe · Mar 15, 2024 · c0887de · c0887de
1 parent 594cb88
commit c0887de
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 15 deletions.
diff --git a/packages/beacon-node/test/mocks/clock.ts b/packages/beacon-node/test/mocks/clock.ts
@@ -1,4 +1,5 @@
 import EventEmitter from "node:events";
+import {Mocked, vi} from "vitest";
 import {computeEpochAtSlot} from "@lodestar/state-transition";
 import {Epoch, Slot} from "@lodestar/types";
 import {IClock} from "../../src/util/clock.js";
@@ -62,3 +63,16 @@ export class ClockStopped extends EventEmitter implements IClock {
     this.slot = slot;
   }
 }
+
+export function getMockedClock(): Mocked<IClock> {
+  return {
+    get currentSlot() {
+      return 0;
+    },
+    get currentEpoch() {
+      return 0;
+    },
+    currentSlotWithGossipDisparity: undefined,
+    isCurrentSlotGivenGossipDisparity: vi.fn(),
+  } as unknown as Mocked<IClock>;
+}
diff --git a/packages/beacon-node/test/mocks/mockedBeaconChain.ts b/packages/beacon-node/test/mocks/mockedBeaconChain.ts
@@ -16,6 +16,7 @@ import {Clock} from "../../src/util/clock.js";
 import {QueuedStateRegenerator} from "../../src/chain/regen/index.js";
 import {ShufflingCache} from "../../src/chain/shufflingCache.js";
 import {getMockedLogger} from "./loggerMock.js";
+import {getMockedClock} from "./clock.js";
 
 export type MockedBeaconChain = Mocked<BeaconChain> & {
   logger: Mocked<Logger>;
@@ -105,25 +106,12 @@ vi.mock("../../src/chain/chain.js", async (importActual) => {
   const BeaconChain = vi.fn().mockImplementation(({clock, genesisTime, config}: MockedBeaconChainOptions) => {
     const logger = getMockedLogger();
 
-    const clk =
-      clock === "real"
-        ? new Clock({config, genesisTime: 0, signal: new AbortController().signal})
-        : {
-            get currentSlot() {
-              return 0;
-            },
-            get currentEpoch() {
-              return 0;
-            },
-            currentSlotWithGossipDisparity: undefined,
-            isCurrentSlotGivenGossipDisparity: vi.fn(),
-          };
-
     return {
       config,
       opts: {},
       genesisTime,
-      clock: clk,
+      clock:
+        clock === "real" ? new Clock({config, genesisTime, signal: new AbortController().signal}) : getMockedClock(),
       forkChoice: getMockedForkChoice(),
       executionEngine: {
         notifyForkchoiceUpdate: vi.fn(),