test(e2e): thread opts through TokenContractTest + NestedContractTest and migrate to FAST_E2E_SETUP_OPTS

Author: spalladino

yarn-project/end-to-end/src/e2e_nested_contract/importer.test.ts

@@ -1,6 +1,7 @@
 import { ImportTestContract } from '@aztec/noir-test-contracts.js/ImportTest';
 import { TestContract } from '@aztec/noir-test-contracts.js/Test';
 
+import { FAST_E2E_SETUP_OPTS } from '../fixtures/fixtures.js';
 import { NestedContractTest } from './nested_contract_test.js';
 
 describe('e2e_nested_contract manual', () => {
@@ -10,7 +11,7 @@ describe('e2e_nested_contract manual', () => {
   let { wallet, logger, defaultAccountAddress } = t;
 
   beforeAll(async () => {
-    await t.setup();
+    await t.setup({ ...FAST_E2E_SETUP_OPTS });
     ({ wallet, logger, defaultAccountAddress } = t);
   });
 

yarn-project/end-to-end/src/e2e_nested_contract/manual_private_call.test.ts

@@ -1,11 +1,12 @@
+import { FAST_E2E_SETUP_OPTS } from '../fixtures/fixtures.js';
 import { NestedContractTest } from './nested_contract_test.js';
 
 describe('e2e_nested_contract manual', () => {
   const t = new NestedContractTest('manual');
   let { parentContract, childContract, defaultAccountAddress } = t;
 
   beforeAll(async () => {
-    await t.setup();
+    await t.setup({ ...FAST_E2E_SETUP_OPTS });
     await t.applyManual();
     ({ parentContract, childContract, defaultAccountAddress } = t);
   });

yarn-project/end-to-end/src/e2e_nested_contract/manual_private_enqueue.test.ts

@@ -3,6 +3,7 @@ import { Fr } from '@aztec/aztec.js/fields';
 import { ChildContract } from '@aztec/noir-test-contracts.js/Child';
 import { ParentContract } from '@aztec/noir-test-contracts.js/Parent';
 
+import { FAST_E2E_SETUP_OPTS } from '../fixtures/fixtures.js';
 import { NestedContractTest } from './nested_contract_test.js';
 
 describe('e2e_nested_contract manual_enqueue', () => {
@@ -14,7 +15,7 @@ describe('e2e_nested_contract manual_enqueue', () => {
 
   beforeAll(async () => {
     // We don't deploy contracts in beforeAll because every test requires a fresh setup
-    await t.setup();
+    await t.setup({ ...FAST_E2E_SETUP_OPTS });
     ({ wallet, defaultAccountAddress, aztecNode } = t);
   });
 

yarn-project/end-to-end/src/e2e_nested_contract/manual_public.test.ts

@@ -4,6 +4,7 @@ import { Fr } from '@aztec/aztec.js/fields';
 import { toBigIntBE } from '@aztec/foundation/bigint-buffer';
 import { serializeToBuffer } from '@aztec/foundation/serialize';
 
+import { FAST_E2E_SETUP_OPTS } from '../fixtures/fixtures.js';
 import { NestedContractTest } from './nested_contract_test.js';
 
 describe('e2e_nested_contract manual', () => {
@@ -14,7 +15,7 @@ describe('e2e_nested_contract manual', () => {
     aztecNode.getPublicStorageAt('latest', child.address, new Fr(1));
 
   beforeAll(async () => {
-    await t.setup();
+    await t.setup({ ...FAST_E2E_SETUP_OPTS });
     await t.applyManual();
     ({ wallet, parentContract, childContract, defaultAccountAddress, aztecNode } = t);
   });

yarn-project/end-to-end/src/e2e_nested_contract/nested_contract_test.ts

@@ -7,6 +7,7 @@ import { ParentContract } from '@aztec/noir-test-contracts.js/Parent';
 
 import {
   type EndToEndContext,
+  type SetupOptions,
   deployAccounts,
   publicDeployAccounts,
   setup,
@@ -50,9 +51,10 @@ export class NestedContractTest {
     await publicDeployAccounts(this.wallet, [this.defaultAccountAddress]);
   }
 
-  async setup() {
+  async setup(opts: Partial<SetupOptions> = {}) {
     this.logger.info('Setting up fresh subsystems');
     this.context = await setup(0, {
+      ...opts,
       fundSponsoredFPC: true,
       skipAccountDeployment: true,
     });

yarn-project/end-to-end/src/e2e_token_contract/access_control.test.ts

@@ -1,11 +1,12 @@
+import { FAST_E2E_SETUP_OPTS } from '../fixtures/fixtures.js';
 import { TokenContractTest } from './token_contract_test.js';
 
 describe('e2e_token_contract access control', () => {
   const t = new TokenContractTest('access_control');
 
   beforeAll(async () => {
     t.applyBaseSnapshots();
-    await t.setup();
+    await t.setup({ ...FAST_E2E_SETUP_OPTS });
   });
 
   afterAll(async () => {

yarn-project/end-to-end/src/e2e_token_contract/burn.test.ts

@@ -2,7 +2,7 @@ import { computeAuthWitMessageHash } from '@aztec/aztec.js/authorization';
 import { Fr } from '@aztec/aztec.js/fields';
 
 import { sendThroughAuthwitProxy, simulateThroughAuthwitProxy } from '../fixtures/authwit_proxy.js';
-import { DUPLICATE_NULLIFIER_ERROR, U128_UNDERFLOW_ERROR } from '../fixtures/index.js';
+import { DUPLICATE_NULLIFIER_ERROR, FAST_E2E_SETUP_OPTS, U128_UNDERFLOW_ERROR } from '../fixtures/index.js';
 import { TokenContractTest } from './token_contract_test.js';
 
 describe('e2e_token_contract burn', () => {
@@ -12,7 +12,7 @@ describe('e2e_token_contract burn', () => {
   beforeAll(async () => {
     t.applyBaseSnapshots();
     t.applyMintSnapshot();
-    await t.setup();
+    await t.setup({ ...FAST_E2E_SETUP_OPTS });
     // Have to destructure again to ensure we have latest refs.
     ({ asset, wallet, adminAddress, tokenSim, adminAddress, account1Address } = t);
   });

yarn-project/end-to-end/src/e2e_token_contract/minting.test.ts

@@ -1,4 +1,4 @@
-import { U128_OVERFLOW_ERROR } from '../fixtures/fixtures.js';
+import { FAST_E2E_SETUP_OPTS, U128_OVERFLOW_ERROR } from '../fixtures/fixtures.js';
 import { TokenContractTest } from './token_contract_test.js';
 
 describe('e2e_token_contract minting', () => {
@@ -7,7 +7,7 @@ describe('e2e_token_contract minting', () => {
 
   beforeAll(async () => {
     t.applyBaseSnapshots();
-    await t.setup();
+    await t.setup({ ...FAST_E2E_SETUP_OPTS });
     ({ asset, tokenSim, adminAddress, account1Address } = t);
   });
 

yarn-project/end-to-end/src/e2e_token_contract/private_transfer_recursion.test.ts

@@ -1,6 +1,7 @@
 import { BlockNumber } from '@aztec/foundation/branded-types';
 import { TokenContract, type Transfer } from '@aztec/noir-contracts.js/Token';
 
+import { FAST_E2E_SETUP_OPTS } from '../fixtures/fixtures.js';
 import { mintNotes } from '../fixtures/token_utils.js';
 import { TokenContractTest } from './token_contract_test.js';
 
@@ -10,7 +11,7 @@ describe('e2e_token_contract private transfer recursion', () => {
 
   beforeAll(async () => {
     t.applyBaseSnapshots();
-    await t.setup();
+    await t.setup({ ...FAST_E2E_SETUP_OPTS });
     ({ asset, wallet, adminAddress, account1Address, node } = t);
   });
 

yarn-project/end-to-end/src/e2e_token_contract/reading_constants.test.ts

@@ -1,5 +1,6 @@
 import { readFieldCompressedString } from '@aztec/aztec.js/utils';
 
+import { FAST_E2E_SETUP_OPTS } from '../fixtures/fixtures.js';
 import { TokenContractTest } from './token_contract_test.js';
 
 describe('e2e_token_contract reading constants', () => {
@@ -8,7 +9,7 @@ describe('e2e_token_contract reading constants', () => {
 
   beforeAll(async () => {
     t.applyBaseSnapshots();
-    await t.setup();
+    await t.setup({ ...FAST_E2E_SETUP_OPTS });
   });
 
   afterAll(async () => {