From 691cef78e730e886510e0551c4cd62b54966efce Mon Sep 17 00:00:00 2001 From: Santiago Palladino Date: Tue, 10 Dec 2024 15:02:28 -0300 Subject: [PATCH 1/2] chore: Try fix e2e token test --- .../src/fixtures/snapshot_manager.ts | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/yarn-project/end-to-end/src/fixtures/snapshot_manager.ts b/yarn-project/end-to-end/src/fixtures/snapshot_manager.ts index c2ac8ce04c5..d64f0ad1d3c 100644 --- a/yarn-project/end-to-end/src/fixtures/snapshot_manager.ts +++ b/yarn-project/end-to-end/src/fixtures/snapshot_manager.ts @@ -36,7 +36,7 @@ import { MNEMONIC } from './fixtures.js'; import { getACVMConfig } from './get_acvm_config.js'; import { getBBConfig } from './get_bb_config.js'; import { setupL1Contracts } from './setup_l1_contracts.js'; -import { type SetupOptions, createAndSyncProverNode, getPrivateKeyFromIndex } from './utils.js'; +import { type SetupOptions, createAndSyncProverNode, getLogger, getPrivateKeyFromIndex } from './utils.js'; import { getEndToEndTestTelemetryClient } from './with_telemetry_utils.js'; export type SubsystemsContext = { @@ -243,13 +243,23 @@ async function teardown(context: SubsystemsContext | undefined) { if (!context) { return; } - await context.proverNode?.stop(); - await context.aztecNode.stop(); - await context.pxe.stop(); - await context.acvmConfig?.cleanup(); - await context.anvil.stop(); - await context.watcher.stop(); - context.timer?.uninstall(); + try { + getLogger().verbose('Tearing down subsystems...'); + await context.proverNode?.stop(); + await context.aztecNode.stop(); + await context.pxe.stop(); + await context.acvmConfig?.cleanup(); + await context.anvil.stop(); + await context.watcher.stop(); + context.timer?.uninstall(); + } catch (err) { + try { + getLogger().error('Error during teardown', err); + } catch (err2) { + // eslint-disable-next-line no-console + console.error(`Error logging teardown error`, err, err2); + } + } } /** From 819d83c2b331d3c4b9ce82241c980e8775a36541 Mon Sep 17 00:00:00 2001 From: Santiago Palladino Date: Tue, 10 Dec 2024 16:29:00 -0300 Subject: [PATCH 2/2] chore: Do not throw when tearing down context May fix e2e token test. --- yarn-project/end-to-end/src/fixtures/snapshot_manager.ts | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/yarn-project/end-to-end/src/fixtures/snapshot_manager.ts b/yarn-project/end-to-end/src/fixtures/snapshot_manager.ts index d64f0ad1d3c..7a0507a6e63 100644 --- a/yarn-project/end-to-end/src/fixtures/snapshot_manager.ts +++ b/yarn-project/end-to-end/src/fixtures/snapshot_manager.ts @@ -244,7 +244,7 @@ async function teardown(context: SubsystemsContext | undefined) { return; } try { - getLogger().verbose('Tearing down subsystems...'); + getLogger().info('Tearing down subsystems'); await context.proverNode?.stop(); await context.aztecNode.stop(); await context.pxe.stop(); @@ -253,12 +253,7 @@ async function teardown(context: SubsystemsContext | undefined) { await context.watcher.stop(); context.timer?.uninstall(); } catch (err) { - try { - getLogger().error('Error during teardown', err); - } catch (err2) { - // eslint-disable-next-line no-console - console.error(`Error logging teardown error`, err, err2); - } + getLogger().error('Error during teardown', err); } }