chore: reconsider life choices

Author: LHerskind

l1-contracts/src/mock/TestERC20.sol

@@ -34,11 +34,8 @@ contract TestERC20 is ERC20, IMintableERC20, Ownable2Step {
   }
 
   function acceptOwnership() public virtual override(Ownable2Step) {
-    address oldOwner = owner();
     address newOwner = pendingOwner();
     super.acceptOwnership();
-
-    removeMinter(oldOwner);
     addMinter(newOwner);
   }
 }

l1-contracts/test/test_erc20/transferOwnership.t.sol

@@ -64,8 +64,6 @@ contract TransferOwnershipTest is TestERC20TestBase {
 
     assertEq(testERC20.owner(), _newOwner);
     assertEq(testERC20.minters(_newOwner), true);
-    if (_newOwner != oldOwner) {
-      assertEq(testERC20.minters(oldOwner), false);
-    }
+    assertEq(testERC20.minters(oldOwner), true);
   }
 }

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

@@ -20,7 +20,8 @@ describe('e2e_epochs/epochs_multi_proof', () => {
   let test: EpochsTestContext;
 
   beforeEach(async () => {
-    test = await EpochsTestContext.setup();
+    // Use longer epochs, as deployments take up more than 4 slots.
+    test = await EpochsTestContext.setup({ aztecEpochDuration: 8 });
     ({ context, rollup, constants, logger, L1_BLOCK_TIME_IN_S } = test);
   });
 

yarn-project/ethereum/src/test/rollup_cheat_codes.ts

@@ -216,6 +216,11 @@ export class RollupCheatCodes {
     action: (owner: Hex, rollup: GetContractReturnType<typeof RollupAbi, ViemPublicClient>) => Promise<void>,
   ) {
     const owner = await this.rollup.read.owner();
+
+    // Since the owner is likely the gov, if we want to directly impersonate and call we gotta make sure that we have
+    // funding to actually execute anything.
+    await this.ethCheatCodes.setBalance(EthAddress.fromString(owner), 10n * 10n ** 18n);
+
     await this.ethCheatCodes.startImpersonating(owner);
     await action(owner, this.rollup);
     await this.ethCheatCodes.stopImpersonating(owner);
@@ -258,9 +263,6 @@ export class RollupCheatCodes {
    */
   public async setProvingCostPerMana(ethValue: bigint) {
     await this.asOwner(async (account, rollup) => {
-      // We are minting funds for the `account` since we seem to sometimes ends up with just a poor account :shrug:.
-      await this.ethCheatCodes.setBalance(EthAddress.fromString(account), 10n * 10n ** 18n);
-
       const hash = await rollup.write.setProvingCostPerMana([ethValue], {
         account,
         chain: this.client.chain,