@aztec/end-to-end 0.0.1-commit.1142ef1 → 0.0.1-commit.11bf3dd6e

package/src/e2e_nested_contract/nested_contract_test.ts

@@ -6,17 +6,15 @@ import { ChildContract } from '@aztec/noir-test-contracts.js/Child';
 import { ParentContract } from '@aztec/noir-test-contracts.js/Parent';
 
 import {
-  type ISnapshotManager,
-  type SubsystemsContext,
-  createSnapshotManager,
+  type EndToEndContext,
   deployAccounts,
   publicDeployAccounts,
-} from '../fixtures/snapshot_manager.js';
-
-const { E2E_DATA_PATH: dataPath } = process.env;
+  setup,
+  teardown as teardownSubsystems,
+} from '../fixtures/setup.js';
 
 export class NestedContractTest {
-  private snapshotManager: ISnapshotManager;
+  context!: EndToEndContext;
   logger: Logger;
   wallet!: Wallet;
   defaultAccountAddress!: AztecAddress;
@@ -30,67 +28,48 @@ export class NestedContractTest {
     private numberOfAccounts = 1,
   ) {
     this.logger = createLogger(`e2e:e2e_nested_contract:${testName}`);
-    this.snapshotManager = createSnapshotManager(`e2e_nested_contract/${testName}-${numberOfAccounts}`, dataPath);
   }
 
   /**
-   * Adds two state shifts to snapshot manager.
-   * 1. Add 3 accounts.
-   * 2. Publicly deploy accounts
+   * Applies base setup by deploying accounts and publicly deploying them.
    */
-  async applyBaseSnapshots() {
-    await this.snapshotManager.snapshot(
-      'accounts',
-      deployAccounts(this.numberOfAccounts, this.logger),
-      ({ deployedAccounts }, { wallet, aztecNode }) => {
-        this.wallet = wallet;
-        [{ address: this.defaultAccountAddress }] = deployedAccounts;
-        this.aztecNode = aztecNode;
-        return Promise.resolve();
-      },
-    );
+  async applyBaseSetup() {
+    this.logger.info('Deploying accounts');
+    const { deployedAccounts } = await deployAccounts(
+      this.numberOfAccounts,
+      this.logger,
+    )({
+      wallet: this.context.wallet,
+      initialFundedAccounts: this.context.initialFundedAccounts,
+    });
+    this.wallet = this.context.wallet;
+    [{ address: this.defaultAccountAddress }] = deployedAccounts;
+    this.aztecNode = this.context.aztecNodeService;
 
-    await this.snapshotManager.snapshot(
-      'public_deploy',
-      async () => {},
-      async () => {
-        this.logger.verbose(`Public deploy accounts...`);
-        await publicDeployAccounts(this.wallet, [this.defaultAccountAddress]);
-      },
-    );
+    this.logger.info('Public deploy accounts');
+    await publicDeployAccounts(this.wallet, [this.defaultAccountAddress]);
   }
 
   async setup() {
-    await this.snapshotManager.setup();
+    this.logger.info('Setting up fresh subsystems');
+    this.context = await setup(0, {
+      fundSponsoredFPC: true,
+      skipAccountDeployment: true,
+    });
+    await this.applyBaseSetup();
   }
 
   async teardown() {
-    await this.snapshotManager.teardown();
+    await teardownSubsystems(this.context);
   }
 
-  snapshot = <T>(
-    name: string,
-    apply: (context: SubsystemsContext) => Promise<T>,
-    restore: (snapshotData: T, context: SubsystemsContext) => Promise<void> = () => Promise.resolve(),
-  ): Promise<void> => this.snapshotManager.snapshot(name, apply, restore);
-
-  async applyManualSnapshots() {
-    await this.snapshotManager.snapshot(
-      'manual',
-      async () => {
-        const parentContract = await ParentContract.deploy(this.wallet)
-          .send({ from: this.defaultAccountAddress })
-          .deployed();
-        const childContract = await ChildContract.deploy(this.wallet)
-          .send({ from: this.defaultAccountAddress })
-          .deployed();
-        return { parentContractAddress: parentContract.address, childContractAddress: childContract.address };
-      },
-      ({ parentContractAddress, childContractAddress }) => {
-        this.parentContract = ParentContract.at(parentContractAddress, this.wallet);
-        this.childContract = ChildContract.at(childContractAddress, this.wallet);
-        return Promise.resolve();
-      },
-    );
+  async applyManual() {
+    this.logger.info('Deploying parent and child contracts');
+    ({ contract: this.parentContract } = await ParentContract.deploy(this.wallet).send({
+      from: this.defaultAccountAddress,
+    }));
+    ({ contract: this.childContract } = await ChildContract.deploy(this.wallet).send({
+      from: this.defaultAccountAddress,
+    }));
   }
 }

package/src/e2e_p2p/inactivity_slash_test.ts

@@ -58,6 +58,7 @@ export class P2PInactivityTest {
       basePort: BOOT_NODE_UDP_PORT,
       startProverNode: true,
       initialConfig: {
+        anvilSlotsInAnEpoch: 4,
         proverNodeConfig: { proverNodeEpochProvingDelayMs: AZTEC_SLOT_DURATION * 1000 },
         aztecTargetCommitteeSize: COMMITTEE_SIZE,
         aztecSlotDuration: AZTEC_SLOT_DURATION,
@@ -66,7 +67,6 @@ export class P2PInactivityTest {
         listenAddress: '127.0.0.1',
         minTxsPerBlock: 0,
         aztecEpochDuration: EPOCH_DURATION,
-        validatorReexecute: false,
         sentinelEnabled: true,
         slashingQuorum: SLASHING_QUORUM,
         slashingRoundSizeInEpochs: SLASHING_ROUND_SIZE_IN_EPOCHS,
@@ -82,8 +82,8 @@ export class P2PInactivityTest {
   }
 
   public async setup() {
-    await this.test.applyBaseSnapshots();
     await this.test.setup();
+    await this.test.applyBaseSetup();
 
     // Set slashing penalties for inactivity
     const { rollup } = await this.test.getContracts();
@@ -98,7 +98,7 @@ export class P2PInactivityTest {
     this.rollup = rollup;
 
     if (!this.keepInitialNode) {
-      await this.test.ctx.aztecNode.stop();
+      await this.test.ctx.aztecNodeService.stop();
     }
 
     // Create all active nodes
@@ -108,7 +108,7 @@ export class P2PInactivityTest {
       this.test.bootstrapNodeEnr,
       NUM_NODES - this.inactiveNodeCount - Number(this.keepInitialNode),
       BOOT_NODE_UDP_PORT,
-      this.test.prefilledPublicData,
+      this.test.genesis,
       this.dataDir,
       undefined,
       Number(this.keepInitialNode),
@@ -122,14 +122,14 @@ export class P2PInactivityTest {
       this.test.bootstrapNodeEnr,
       this.inactiveNodeCount,
       BOOT_NODE_UDP_PORT,
-      this.test.prefilledPublicData,
+      this.test.genesis,
       this.dataDir,
       undefined,
       NUM_NODES - this.inactiveNodeCount,
     );
 
     this.nodes = [
-      ...(this.keepInitialNode ? [this.test.ctx.aztecNode] : []),
+      ...(this.keepInitialNode ? [this.test.ctx.aztecNodeService] : []),
       ...this.activeNodes,
       ...this.inactiveNodes,
     ];