fix: eth1 provider error logging (#6863)

ChainSafe · Jul 5, 2024 · 29d1c22 · 29d1c22
1 parent b6e2077
commit 29d1c22
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 6 deletions.
diff --git a/packages/beacon-node/src/eth1/provider/eth1Provider.ts b/packages/beacon-node/src/eth1/provider/eth1Provider.ts
@@ -91,7 +91,7 @@ export class Eth1Provider implements IEth1Provider {
       this.state = Eth1ProviderState.ONLINE;
 
       if (oldState !== Eth1ProviderState.ONLINE) {
-        this.logger?.info("Eth1Provider is back online", {oldState, newState: this.state});
+        this.logger?.info("Eth1 provider is back online", {oldState, newState: this.state});
       }
     });
 
@@ -109,7 +109,7 @@ export class Eth1Provider implements IEth1Provider {
       if (this.state !== Eth1ProviderState.ONLINE) {
         if (isOneMinutePassed()) {
           this.logger?.error(
-            "Eth1Provider faced error",
+            "Eth1 provider error",
             {
               state: this.state,
               lastErrorAt: new Date(Date.now() - isOneMinutePassed.msSinceLastCall).toLocaleTimeString(),

diff --git a/packages/utils/src/waitFor.ts b/packages/utils/src/waitFor.ts
@@ -70,9 +70,13 @@ export function createElapsedTimeTracker({minElapsedTime}: {minElapsedTime: numb
   function elapsedTimeTracker(): boolean {
     const now = Date.now();
     const msSinceLastCall = now - (lastTimeCalled ?? 0);
-    lastTimeCalled = now;
 
-    return msSinceLastCall > minElapsedTime;
+    if (msSinceLastCall > minElapsedTime) {
+      // Do not reset timer if called before timer elapsed
+      lastTimeCalled = now;
+      return true;
+    }
+    return false;
   }
 
   return Object.assign(elapsedTimeTracker, {

diff --git a/packages/utils/test/unit/waitFor.test.ts b/packages/utils/test/unit/waitFor.test.ts
@@ -36,8 +36,8 @@ describe("waitFor", () => {
   });
 });
 
-describe("waitForElapsedTime", () => {
-  it("should true for the first time", () => {
+describe("createElapsedTimeTracker", () => {
+  it("should return true for the first time", () => {
     const callIfTimePassed = createElapsedTimeTracker({minElapsedTime: 1000});
 
     expect(callIfTimePassed()).toBe(true);
@@ -52,6 +52,18 @@ describe("waitForElapsedTime", () => {
     expect(callIfTimePassed()).toBe(true);
   });
 
+  it("should return true after the minElapsedTime has passed with intermediate calls", async () => {
+    const callIfTimePassed = createElapsedTimeTracker({minElapsedTime: 100});
+    callIfTimePassed();
+
+    await sleep(75);
+    // Time has not elapsed yet but it should not reset timer
+    expect(callIfTimePassed()).toBe(false);
+    await sleep(75);
+
+    expect(callIfTimePassed()).toBe(true);
+  });
+
   it("should return false before the minElapsedTime has passed", async () => {
     const callIfTimePassed = createElapsedTimeTracker({minElapsedTime: 100});
     callIfTimePassed();