From 7989d89b0094d95cab8b0ceab9d24e2ac6b32aeb Mon Sep 17 00:00:00 2001
From: Santiago Palladino <santiago@aztecprotocol.com>
Date: Fri, 19 Apr 2024 13:53:47 -0300
Subject: [PATCH] chore: Fix and reenable e2e account init fees test

Similar fix to #5877. Let's see if this fails on CI now...
---
 ...fees.test.ts => e2e_account_init_fees.test.ts} | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)
 rename yarn-project/end-to-end/src/{flakey_e2e_account_init_fees.test.ts => e2e_account_init_fees.test.ts} (96%)

diff --git a/yarn-project/end-to-end/src/flakey_e2e_account_init_fees.test.ts b/yarn-project/end-to-end/src/e2e_account_init_fees.test.ts
similarity index 96%
rename from yarn-project/end-to-end/src/flakey_e2e_account_init_fees.test.ts
rename to yarn-project/end-to-end/src/e2e_account_init_fees.test.ts
index 9b902e001a4..d8acec1c0d5 100644
--- a/yarn-project/end-to-end/src/flakey_e2e_account_init_fees.test.ts
+++ b/yarn-project/end-to-end/src/e2e_account_init_fees.test.ts
@@ -38,7 +38,7 @@ import { GasPortalTestingHarnessFactory, type IGasBridgingTestHarness } from './
 const TOKEN_NAME = 'BananaCoin';
 const TOKEN_SYMBOL = 'BC';
 const TOKEN_DECIMALS = 18n;
-const BRIDGED_FPC_GAS = 444n;
+const BRIDGED_FPC_GAS = BigInt(10e12);
 
 jest.setTimeout(1000_000);
 
@@ -125,13 +125,8 @@ describe('e2e_fees_account_init', () => {
   afterAll(() => ctx.teardown());
 
   beforeEach(() => {
-    gasSettings = GasSettings.from({
-      gasLimits: { daGas: 2, l1Gas: 2, l2Gas: 2 },
-      teardownGasLimits: { daGas: 1, l1Gas: 1, l2Gas: 1 },
-      maxFeesPerGas: { feePerDaGas: Fr.ONE, feePerL1Gas: Fr.ONE, feePerL2Gas: Fr.ONE },
-      inclusionFee: new Fr(5),
-    });
-    maxFee = 3n * 3n + 5n;
+    gasSettings = GasSettings.default();
+    maxFee = gasSettings.getFeeLimit().toBigInt();
     actualFee = 1n;
     bobsSecretKey = Fr.random();
     bobsPrivateSigningKey = Fq.random();
@@ -168,7 +163,7 @@ describe('e2e_fees_account_init', () => {
     describe('privately through an FPC', () => {
       let mintedPrivateBananas: bigint;
       beforeEach(async () => {
-        mintedPrivateBananas = 42n;
+        mintedPrivateBananas = BigInt(1e12);
 
         // TODO the following sequence of events ends in a timeout
         // 1. pxe.registerRecipient (aka just add the public key so pxe can encrypt notes)
@@ -243,7 +238,7 @@ describe('e2e_fees_account_init', () => {
       let mintedPublicBananas: bigint;
 
       beforeEach(async () => {
-        mintedPublicBananas = 37n;
+        mintedPublicBananas = BigInt(1e12);
         await bananaCoin.methods.mint_public(bobsAddress, mintedPublicBananas).send().wait();
       });