diff --git a/yarn-project/end-to-end/Earthfile b/yarn-project/end-to-end/Earthfile index 8ff7a7f9aa1..29e8ff64c8f 100644 --- a/yarn-project/end-to-end/Earthfile +++ b/yarn-project/end-to-end/Earthfile @@ -40,7 +40,7 @@ UPLOAD_LOGS: # Define e2e tests e2e-tests: FROM ../+end-to-end - RUN yarn test ./src/e2e + RUN yarn test ./src/e2e & pid=$!; while [ -d /proc/$pid ]; do uptime && free -h; sleep 10; done; wait $pid flakey-e2e-tests: FROM ../+end-to-end diff --git a/yarn-project/end-to-end/src/e2e_blacklist_token_contract/minting.test.ts b/yarn-project/end-to-end/src/e2e_blacklist_token_contract/minting.test.ts index b003195c393..0bef2150bae 100644 --- a/yarn-project/end-to-end/src/e2e_blacklist_token_contract/minting.test.ts +++ b/yarn-project/end-to-end/src/e2e_blacklist_token_contract/minting.test.ts @@ -14,7 +14,7 @@ describe('e2e_blacklist_token_contract mint', () => { await t.setup(); // Have to destructure again to ensure we have latest refs. ({ asset, tokenSim, wallets, blacklisted } = t); - }, 200_000); + }); afterAll(async () => { await t.teardown(); diff --git a/yarn-project/end-to-end/src/e2e_lending_contract.test.ts b/yarn-project/end-to-end/src/e2e_lending_contract.test.ts index 2dd4614f80e..62acc1ab9c6 100644 --- a/yarn-project/end-to-end/src/e2e_lending_contract.test.ts +++ b/yarn-project/end-to-end/src/e2e_lending_contract.test.ts @@ -77,7 +77,7 @@ describe('e2e_lending_contract', () => { new TokenSimulator(collateralAsset, logger, [lendingContract.address, wallet.getAddress()]), new TokenSimulator(stableCoin, logger, [lendingContract.address, wallet.getAddress()]), ); - }, 200_000); + }); afterAll(() => teardown()); diff --git a/yarn-project/end-to-end/src/e2e_ordering.test.ts b/yarn-project/end-to-end/src/e2e_ordering.test.ts index 0f777d7ea2f..66a37afe6e2 100644 --- a/yarn-project/end-to-end/src/e2e_ordering.test.ts +++ b/yarn-project/end-to-end/src/e2e_ordering.test.ts @@ -29,7 +29,7 @@ describe('e2e_ordering', () => { beforeEach(async () => { ({ teardown, pxe, wallet } = await setup()); - }, 200_000); + }); afterEach(() => teardown()); diff --git a/yarn-project/end-to-end/src/e2e_public_cross_chain_messaging/deposits.test.ts b/yarn-project/end-to-end/src/e2e_public_cross_chain_messaging/deposits.test.ts index 566118a99cc..e9c6db05eb1 100644 --- a/yarn-project/end-to-end/src/e2e_public_cross_chain_messaging/deposits.test.ts +++ b/yarn-project/end-to-end/src/e2e_public_cross_chain_messaging/deposits.test.ts @@ -33,7 +33,7 @@ describe('e2e_public_cross_chain_messaging deposits', () => { ownerAddress = crossChainTestHarness.ownerAddress; l2Bridge = crossChainTestHarness.l2Bridge; l2Token = crossChainTestHarness.l2Token; - }, 200_000); + }); afterEach(async () => { await t.teardown(); @@ -106,7 +106,7 @@ describe('e2e_public_cross_chain_messaging deposits', () => { siblingPath, ); expect(await crossChainTestHarness.getL1BalanceOf(ethAccount)).toBe(l1TokenBalance - bridgeAmount + withdrawAmount); - }, 120_000); + }); // docs:end:e2e_public_cross_chain it('Someone else can mint funds to me on my behalf (publicly)', async () => { @@ -157,5 +157,5 @@ describe('e2e_public_cross_chain_messaging deposits', () => { // ensure funds are gone to owner and not user2. await crossChainTestHarness.expectPublicBalanceOnL2(ownerAddress, bridgeAmount); await crossChainTestHarness.expectPublicBalanceOnL2(user2Wallet.getAddress(), 0n); - }, 90_000); + }); }); diff --git a/yarn-project/end-to-end/src/e2e_public_cross_chain_messaging/failure_cases.test.ts b/yarn-project/end-to-end/src/e2e_public_cross_chain_messaging/failure_cases.test.ts index 8e8bb4f1bb9..49d2b5cff34 100644 --- a/yarn-project/end-to-end/src/e2e_public_cross_chain_messaging/failure_cases.test.ts +++ b/yarn-project/end-to-end/src/e2e_public_cross_chain_messaging/failure_cases.test.ts @@ -17,7 +17,7 @@ describe('e2e_public_cross_chain_messaging failures', () => { ({ crossChainTestHarness, user1Wallet, user2Wallet } = t); ethAccount = crossChainTestHarness.ethAccount; l2Bridge = crossChainTestHarness.l2Bridge; - }, 200_000); + }); afterAll(async () => { await t.teardown(); @@ -36,7 +36,7 @@ describe('e2e_public_cross_chain_messaging failures', () => { .methods.exit_to_l1_public(ethAccount, withdrawAmount, EthAddress.ZERO, nonce) .prove(), ).rejects.toThrow('Assertion failed: Message not authorized by account'); - }, 60_000); + }); it("can't claim funds privately which were intended for public deposit from the token portal", async () => { const bridgeAmount = 100n; @@ -64,5 +64,5 @@ describe('e2e_public_cross_chain_messaging failures', () => { await expect( l2Bridge.withWallet(user2Wallet).methods.claim_private(secretHash, bridgeAmount, secret).prove(), ).rejects.toThrow(`No non-nullified L1 to L2 message found for message hash ${wrongMessage.hash().toString()}`); - }, 60_000); + }); }); diff --git a/yarn-project/end-to-end/src/e2e_public_cross_chain_messaging/l1_to_l2.test.ts b/yarn-project/end-to-end/src/e2e_public_cross_chain_messaging/l1_to_l2.test.ts index 9285a56a36d..f8c7f8799ab 100644 --- a/yarn-project/end-to-end/src/e2e_public_cross_chain_messaging/l1_to_l2.test.ts +++ b/yarn-project/end-to-end/src/e2e_public_cross_chain_messaging/l1_to_l2.test.ts @@ -27,7 +27,7 @@ describe('e2e_public_cross_chain_messaging l1_to_l2', () => { aztecNode = crossChainTestHarness.aztecNode; inbox = crossChainTestHarness.inbox; - }, 200_000); + }); afterAll(async () => { await t.teardown(); diff --git a/yarn-project/end-to-end/src/e2e_public_cross_chain_messaging/l2_to_l1.test.ts b/yarn-project/end-to-end/src/e2e_public_cross_chain_messaging/l2_to_l1.test.ts index b43333c5edf..3c13647a7ea 100644 --- a/yarn-project/end-to-end/src/e2e_public_cross_chain_messaging/l2_to_l1.test.ts +++ b/yarn-project/end-to-end/src/e2e_public_cross_chain_messaging/l2_to_l1.test.ts @@ -21,7 +21,7 @@ describe('e2e_public_cross_chain_messaging l2_to_l1', () => { aztecNode = crossChainTestHarness.aztecNode; outbox = crossChainTestHarness.outbox; - }, 200_000); + }); afterAll(async () => { await t.teardown();