Revert await-dependencies script

Author: jeffsmale90

packages/delegator-e2e/src/await-dependencies.ts

@@ -11,7 +11,10 @@ import { deployDeleGatorEnvironment } from '@metamask/delegation-toolkit/utils';
 import { ENTRYPOINT_ADDRESS_V07 } from 'permissionless';
 import { writeFile } from 'fs/promises';
 
-const POLL_INTERVAL_MS = 1000;
+const POLL_INTERVAL_MS = 1_000;
+// timeout is 5 minutes, which is sufficiently long to never trigger a false positive
+const TIMEOUT_MS = 5 * 60_000;
+let hasTimedOut = false;
 
 const waitFor = async (name: string, url: string) => {
   let isAvailable: boolean | undefined = undefined;
@@ -32,10 +35,8 @@ const waitFor = async (name: string, url: string) => {
     await client
       .request({ method: 'web3_clientVersion' })
       .then(() => (isAvailable = true))
-      .catch((e: any) => {
-        isAvailable = (e as Error).name !== 'HttpRequestError';
-      });
-  } while (!isAvailable);
+      .catch((_) => (isAvailable = false));
+  } while (!isAvailable && !hasTimedOut);
 
   console.log(`${name} is available`);
 };
@@ -61,14 +62,27 @@ const deployEnvironment = async () => {
 };
 
 (async () => {
+  const startTime = Date.now();
+
+  const timeoutRef = setTimeout(() => (hasTimedOut = true), TIMEOUT_MS);
+
   await waitFor('Blockchain node', nodeUrl);
-  const waitingForDependencies = Promise.all([
+
+  const environment = await deployEnvironment();
+  await writeFile('./.gator-env.json', JSON.stringify(environment, null, 2));
+
+  await Promise.all([
     waitFor('Bundler', bundlerUrl),
     waitFor('Mock paymaster', paymasterUrl),
   ]);
 
-  const environment = await deployEnvironment();
-  await writeFile('./.gator-env.json', JSON.stringify(environment, null, 2));
+  clearTimeout(timeoutRef);
 
-  await waitingForDependencies;
+  if (hasTimedOut) {
+    console.error('Timed out waiting for dependencies');
+    process.exitCode = 1;
+  } else {
+    const duration = Date.now() - startTime;
+    console.log(`Dependencies ready in ${duration}ms`);
+  }
 })();