Fix timeout clear

massalabs · Oct 11, 2023 · a3c7dd8 · a3c7dd8
1 parent 6f5a465
commit a3c7dd8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/packages/massa-web3/package.json b/packages/massa-web3/package.json
@@ -16,7 +16,7 @@
         "update-version-major": "npm version major",
         "update-version-minor": "npm version minor",
         "update-version-patch": "npm version patch",
-        "test": "jest",
+        "test": "jest ----detectOpenHandles --forceExit",
         "test:watch": "jest --watch",
         "test:watch:all": "jest --watchAll",
         "test:cov": "jest --coverage",

diff --git a/packages/massa-web3/src/utils/time.ts b/packages/massa-web3/src/utils/time.ts
@@ -23,7 +23,7 @@ export class Timeout {
   }
   private isCleared: boolean;
   private isCalled: boolean;
-  private timeoutHook: NodeJS.Timeout;
+  private timeoutHook: ReturnType<typeof setTimeout>;
 
   /**
    * Clears the timeout so that the callback function is not called.

diff --git a/packages/massa-web3/src/web3/EventPoller.ts b/packages/massa-web3/src/web3/EventPoller.ts
@@ -113,9 +113,9 @@ export class EventPoller extends EventEmitter {
     }
 
     // reset the interval.
-    this.timeoutId = new Timeout(this.pollIntervalMillis, () =>
-      this.callback(),
-    );
+    this.timeoutId = new Timeout(this.pollIntervalMillis, () => {
+      this.callback();
+    });
   }
 
   /**
@@ -133,9 +133,9 @@ export class EventPoller extends EventEmitter {
     if (this.timeoutId) {
       return;
     }
-    this.timeoutId = new Timeout(this.pollIntervalMillis, () =>
-      that.callback(),
-    );
+    this.timeoutId = new Timeout(this.pollIntervalMillis, () => {
+      that.callback();
+    });
   }
 
   /**

diff --git a/packages/massa-web3/test/web3/evenPoller.spec.ts b/packages/massa-web3/test/web3/evenPoller.spec.ts
@@ -147,6 +147,7 @@ describe('EventPoller', () => {
       ).toHaveBeenCalledTimes(1);
 
       jest.useRealTimers();
+      eventPoller.stopPolling();
     });
   });