diff --git a/yarn-project/end-to-end/Earthfile b/yarn-project/end-to-end/Earthfile index 4e52cea2c25..1a77fbc2683 100644 --- a/yarn-project/end-to-end/Earthfile +++ b/yarn-project/end-to-end/Earthfile @@ -83,10 +83,8 @@ E2E_TEST: # Define e2e tests e2e-tests: - LOCALLY - WITH DOCKER --load end-to-end=../+end-to-end - RUN docker run --rm -e LOG_LEVEL=silent -e DEBUG=aztec:e2e* end-to-end ./src/e2e - END + FROM ../+end-to-end + RUN yarn test ./src/e2e e2e-sandbox-example: ARG e2e_mode=local diff --git a/yarn-project/end-to-end/package.json b/yarn-project/end-to-end/package.json index a430486bb51..9fe157450d0 100644 --- a/yarn-project/end-to-end/package.json +++ b/yarn-project/end-to-end/package.json @@ -15,7 +15,7 @@ "clean": "rm -rf ./dest .tsbuildinfo", "formatting": "run -T prettier --check ./src \"!src/web/main.js\" && run -T eslint ./src", "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src", - "test": "LOG_LEVEL=${LOG_LEVEL:-silent} DEBUG=${DEBUG:-'aztec:e2e*'} DEBUG_COLORS=1 NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --testTimeout=120000 --forceExit", + "test": "LOG_LEVEL=${LOG_LEVEL:-silent} DEBUG_COLORS=1 NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --testTimeout=120000 --forceExit", "test:integration": "concurrently -k -s first -c reset,dim -n test,anvil \"yarn test:integration:run\" \"anvil\"", "test:integration:run": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --no-cache --runInBand --config jest.integration.config.json" }, diff --git a/yarn-project/end-to-end/package.local.json b/yarn-project/end-to-end/package.local.json index 49ec2d491bc..089811e03e9 100644 --- a/yarn-project/end-to-end/package.local.json +++ b/yarn-project/end-to-end/package.local.json @@ -2,6 +2,6 @@ "scripts": { "build": "yarn clean && tsc -b && webpack", "formatting": "run -T prettier --check ./src \"!src/web/main.js\" && run -T eslint ./src", - "test": "LOG_LEVEL=${LOG_LEVEL:-silent} DEBUG=${DEBUG:-'aztec:e2e*'} DEBUG_COLORS=1 NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --testTimeout=120000 --forceExit" + "test": "LOG_LEVEL=${LOG_LEVEL:-silent} DEBUG_COLORS=1 NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --testTimeout=120000 --forceExit" } } diff --git a/yarn-project/end-to-end/src/e2e_dapp_subscription.test.ts b/yarn-project/end-to-end/src/e2e_dapp_subscription.test.ts index e4865c1ac5a..93095f383b8 100644 --- a/yarn-project/end-to-end/src/e2e_dapp_subscription.test.ts +++ b/yarn-project/end-to-end/src/e2e_dapp_subscription.test.ts @@ -117,7 +117,7 @@ describe('e2e_dapp_subscription', () => { [aliceAddress, sequencerAddress, subscriptionContract.address, bananaFPC.address], [0n, 0n, INITIAL_GAS_BALANCE, INITIAL_GAS_BALANCE], ); - }); + }, 180_000); it('should allow Alice to subscribe by paying privately with bananas', async () => { /** diff --git a/yarn-project/end-to-end/src/fixtures/snapshot_manager.ts b/yarn-project/end-to-end/src/fixtures/snapshot_manager.ts index a7cf971f861..c917320e4b3 100644 --- a/yarn-project/end-to-end/src/fixtures/snapshot_manager.ts +++ b/yarn-project/end-to-end/src/fixtures/snapshot_manager.ts @@ -179,7 +179,7 @@ export class SnapshotManager { const anvil = await retry( async () => { const ethereumHostPort = await getPort(); - aztecNodeConfig.rpcUrl = `http://localhost:${ethereumHostPort}`; + aztecNodeConfig.rpcUrl = `http://127.0.0.1:${ethereumHostPort}`; const anvil = createAnvil({ anvilBinary: './scripts/anvil_kill_wrapper.sh', port: ethereumHostPort }); await anvil.start(); return anvil; diff --git a/yarn-project/end-to-end/src/fixtures/utils.ts b/yarn-project/end-to-end/src/fixtures/utils.ts index 487d3abea2e..5708bb4b5af 100644 --- a/yarn-project/end-to-end/src/fixtures/utils.ts +++ b/yarn-project/end-to-end/src/fixtures/utils.ts @@ -346,7 +346,7 @@ export async function setup( anvil = await retry( async () => { const ethereumHostPort = await getPort(); - config.rpcUrl = `http://localhost:${ethereumHostPort}`; + config.rpcUrl = `http://127.0.0.1:${ethereumHostPort}`; const anvil = createAnvil({ anvilBinary: './scripts/anvil_kill_wrapper.sh', port: ethereumHostPort }); await anvil.start(); return anvil; @@ -398,6 +398,7 @@ export async function setup( const { pxe, wallets } = await setupPXEService(numberOfAccounts, aztecNode!, pxeOpts, logger); if (enableGas) { + logger.verbose('Deploying gas token...'); await deployCanonicalGasToken( new SignerlessWallet(pxe, new DefaultMultiCallEntrypoint(config.chainId, config.version)), );