restore BaseTestUtils.delay

packages/base-test-utils/src/index.ts

@@ -1,10 +1,6 @@
 import type { CID } from 'multiformats/cid'
 import { randomCID, StreamID } from '@ceramicnetwork/streamid'
 
-const delay = async function (ms: number) {
-  return new Promise<void>((resolve) => setTimeout(() => resolve(), ms))
-}
-
 export class BaseTestUtils {
   static randomCID(version: 0 | 1 = 1, codec = 0x71, hasher = 0x12): CID {
     return randomCID(version, codec, hasher)
@@ -36,7 +32,7 @@ export class BaseTestUtils {
     const deadline = new Date(startTime.getTime() + timeoutMs)
     let now = startTime
     while (now < deadline) {
-      await delay(100)
+      await BaseTestUtils.delay(100)
       now = new Date()
 
       try {
@@ -57,4 +53,20 @@ export class BaseTestUtils {
     const customMsg = typeof errMsgGenerator == 'string' ? errMsgGenerator : errMsgGenerator()
     throw new Error(baseErrMsg + ': ' + customMsg)
   }
+
+  // TODO: De-dupe this with `delayOrAbort` in abort-signal-utils.ts
+  static async delay(ms: number, signal?: AbortSignal): Promise<void> {
+    return new Promise<void>((resolve, reject) => {
+      const timeout = setTimeout(() => resolve(), ms)
+      if (signal) {
+        const handleAbort = () => {
+          clearTimeout(timeout)
+          signal.removeEventListener('abort', handleAbort)
+          reject(signal.reason)
+        }
+        if (signal.aborted) handleAbort()
+        signal.addEventListener('abort', handleAbort)
+      }
+    })
+  }
 }

packages/common-test-utils/src/index.ts

@@ -5,7 +5,6 @@ import type { StreamState, Stream } from '@ceramicnetwork/common'
 import {
   AdminApi,
   AnchorStatus,
-  delayOrAbort,
   EnvironmentUtils,
   EventType,
   RunningStateLike,
@@ -46,7 +45,7 @@ export class CommonTestUtils {
   }
 
   static async delay(ms: number, signal?: AbortSignal): Promise<void> {
-    return delayOrAbort(ms, signal)
+    return BaseTestUtils.delay(ms, signal)
   }
 
   /**