chore: merge main

dfinity · Jul 30, 2024 · 06721ae · 06721ae
2 parents ed99321 + 7a8580c
commit 06721ae
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/types/rpc.ts b/src/types/rpc.ts
@@ -9,6 +9,8 @@ const JsonRpc = z.literal(JSON_RPC_VERSION_2);
 
 const RpcId = z.union([z.string(), z.number(), z.null()]);
 
+export type RpcIdType = z.infer<typeof RpcId>;
+
 const Rpc = z.object({
   jsonrpc: JsonRpc,
   id: z.optional(RpcId)

diff --git a/src/utils/timeout.utils.spec.ts b/src/utils/timeout.utils.spec.ts
@@ -84,7 +84,7 @@ describe('retryUntilReady', () => {
 
     const promise = retryUntilReady({retries: 3, isReady, fn, intervalInMs});
 
-    await vi.advanceTimersByTimeAsync(intervalInMs * 2 * 3);
+    await vi.advanceTimersByTimeAsync(intervalInMs * 2);
 
     await promise;
 

diff --git a/src/utils/timeout.utils.ts b/src/utils/timeout.utils.ts
@@ -31,5 +31,5 @@ export const retryUntilReady = async ({
 
   await waitForMilliseconds(intervalInMs);
 
-  return await retryUntilReady({retries: remainingRetries, isReady, fn});
+  return await retryUntilReady({retries: remainingRetries, intervalInMs, isReady, fn});
 };