chore: Try deflake l1 reorg test (again)

As title says

Author: spalladino

yarn-project/end-to-end/src/e2e_epochs/epochs_l1_reorgs.test.ts

@@ -40,6 +40,7 @@ describe('e2e_epochs/epochs_l1_reorgs', () => {
     test = await EpochsTestContext.setup({
       maxSpeedUpAttempts: 0, // Do not speed up l1 txs, we dont want them to land
       cancelTxOnTimeout: false,
+      aztecEpochDuration: 8, // Bump epoch duration, epoch 0 is finishing before we had a chance to do anything
       ethereumSlotDuration: process.env.L1_BLOCK_TIME ? parseInt(process.env.L1_BLOCK_TIME) : 4, // Got to speed these tests up for CI
     });
     ({ proverDelayer, sequencerDelayer, context, logger, monitor, L1_BLOCK_TIME_IN_S, L2_SLOT_DURATION_IN_S } = test);
@@ -110,8 +111,8 @@ describe('e2e_epochs/epochs_l1_reorgs', () => {
 
       // And check that the old node has processed the reorg as well
       logger.warn(`Testing old node after reorg`);
-      expect(await node.getProvenBlockNumber()).toEqual(0);
-      expect(await node.getBlockNumber()).toBeWithin(currentBlock - 1, currentBlock + 1);
+      await retryUntil(() => node.getProvenBlockNumber().then(b => b === 0), 'prune', L2_SLOT_DURATION_IN_S * 4, 0.1);
+      expect(await node.getBlockNumber()).toBeWithin(monitor.l2BlockNumber - 1, monitor.l2BlockNumber + 1);
 
       logger.warn(`Test succeeded`);
       await newNode.stop();
@@ -123,26 +124,25 @@ describe('e2e_epochs/epochs_l1_reorgs', () => {
       const provenBlock = await test.waitUntilProvenL2BlockNumber(1);
       await retryUntil(() => node.getProvenBlockNumber().then(p => p >= provenBlock), 'node sync', 10, 0.1);
 
+      // Stop the prover node
+      await proverNode.stop();
+
       // Remove the proof from L1 but do not change the block number
       await context.cheatCodes.eth.reorgWithReplacement(1);
       await expect(monitor.run(true).then(m => m.l2ProvenBlockNumber)).resolves.toEqual(0);
 
-      // Create another prover node so it submits a proof
-      await test.createProverNode();
-
-      // Wait until the end of the proof submission window for the first epoch
-      await test.waitUntilLastSlotOfProofSubmissionWindow(0);
-
-      // And expect that the other node has submitted a proof
+      // Create another prover node so it submits a proof and wait until it is submitted
+      const newProverNode = await test.createProverNode();
+      const provenBlockRetry = await test.waitUntilProvenL2BlockNumber(1);
       await expect(monitor.run(true).then(m => m.l2ProvenBlockNumber)).resolves.toBeGreaterThanOrEqual(1);
 
       // Check that the node has followed along
       logger.warn(`Testing old node`);
-      const currentBlock = monitor.l2BlockNumber;
-      expect(await node.getProvenBlockNumber()).toBeGreaterThanOrEqual(1);
-      expect(await node.getBlockNumber()).toBeWithin(currentBlock - 1, currentBlock + 1);
+      await retryUntil(() => node.getProvenBlockNumber().then(b => b >= provenBlockRetry), 'proof sync', 10, 0.1);
+      expect(await node.getBlockNumber()).toBeWithin(monitor.l2BlockNumber - 1, monitor.l2BlockNumber + 1);
 
       logger.warn(`Test succeeded`);
+      await newProverNode.stop();
     });
 
     it('restores L2 blocks if a proof is added due to an L1 reorg', async () => {