chore: deflake

Author: alexghr

yarn-project/aztec/src/cli/util.ts

@@ -36,7 +36,7 @@ export function shutdown(logFn: LogFn, exitCode: ExitCode, cb?: Array<() => Prom
 
   logFn('Shutting down...', { exitCode });
   if (cb) {
-    shutdownPromise = Promise.allSettled(cb).then(() => process.exit(exitCode));
+    shutdownPromise = Promise.allSettled(cb.map(fn => fn())).then(() => process.exit(exitCode));
   } else {
     // synchronously shuts down the process
     // no need to set shutdownPromise on this branch of the if statement because no more code will be executed

yarn-project/end-to-end/scripts/docker-compose.yml

@@ -11,6 +11,7 @@ services:
     cpus: 4
     cpuset: ${CPU_LIST:-}
     mem_limit: 8G
+    stop_grace_period: 60s
     volumes:
       - ../../../:/root/aztec-packages
       - ${HOME}/.bb-crs:/root/.bb-crs

yarn-project/end-to-end/src/fixtures/setup.ts

@@ -103,11 +103,6 @@ async function getTelemetryClient(partialConfig: Partial<TelemetryClientConfig>
   }
   return telemetry;
 }
-if (typeof afterAll === 'function') {
-  afterAll(async () => {
-    await telemetry?.stop();
-  });
-}
 
 export const getPrivateKeyFromIndex = (index: number): Buffer | null => {
   const hdAccount = mnemonicToAccount(MNEMONIC, { addressIndex: index });
@@ -675,6 +670,12 @@ export async function setup(
         await tryRmDir(directoryToCleanup, logger);
       } catch (err) {
         logger.error(`Error during e2e test teardown`, err);
+      } finally {
+        try {
+          await telemetryClient?.stop();
+        } catch (err) {
+          logger.error(`Error during telemetry client stop`, err);
+        }
       }
     };
 

yarn-project/simulator/src/public/public_tx_simulator/cpp_public_tx_simulator.ts

@@ -100,7 +100,8 @@ export class CppPublicTxSimulator extends PublicTxSimulator implements PublicTxS
       contractProvider,
       wsCppHandle,
       logLevel,
-      this.log,
+      // TODO: re-enable logging
+      undefined,
       this.cancellationToken,
     );