test: maybe fix e2e test issues

typescript/cli/scripts/run-e2e-test.sh

@@ -3,20 +3,16 @@
 function cleanup() {
   set +e
   pkill -f anvil
-  rm -rf /tmp/anvil1
   rm -rf /tmp/anvil2
   rm -rf /tmp/anvil3
-  rm -f ./test-configs/anvil/chains/anvil1/addresses.yaml
   rm -f ./test-configs/anvil/chains/anvil2/addresses.yaml
   rm -f ./test-configs/anvil/chains/anvil3/addresses.yaml
   set -e
 }
 
 cleanup
 
-echo "Starting anvil1, anvil2 and anvil3 chain for E2E tests"
-# Anvil1 should be used only for core commands e2e testing to avoid interfierence with other e2e tests
-anvil --chain-id 31337 -p 8545 --state /tmp/anvil1/state --gas-price 1 > /dev/null &
+echo "Starting anvil2 and anvil3 chain for E2E tests"
 anvil --chain-id 31338 -p 8555 --state /tmp/anvil2/state --gas-price 1 > /dev/null &
 anvil --chain-id 31347 -p 8600 --state /tmp/anvil3/state --gas-price 1 > /dev/null &
 

typescript/cli/src/tests/warp-deploy.e2e-test.ts

@@ -34,6 +34,7 @@ const WARP_CORE_CONFIG_PATH_2_3 = `${REGISTRY_PATH}/deployments/warp_routes/VAUL
 const TEST_TIMEOUT = 60_000; // Long timeout since these tests can take a while
 describe('WarpDeploy e2e tests', async function () {
   let chain2Addresses: ChainAddresses = {};
+  let chain3Addresses: ChainAddresses = {};
   let token: any;
   let vault: any;
 
@@ -46,7 +47,11 @@ describe('WarpDeploy e2e tests', async function () {
       ANVIL_KEY,
     );
 
-    await deployOrUseExistingCore(CHAIN_NAME_3, CORE_CONFIG_PATH, ANVIL_KEY);
+    chain3Addresses = await deployOrUseExistingCore(
+      CHAIN_NAME_3,
+      CORE_CONFIG_PATH,
+      ANVIL_KEY,
+    );
 
     token = await deployToken(ANVIL_KEY, CHAIN_NAME_2);
     vault = await deploy4626Vault(ANVIL_KEY, CHAIN_NAME_2, token.address);
@@ -81,8 +86,8 @@ describe('WarpDeploy e2e tests', async function () {
       },
       [CHAIN_NAME_3]: {
         type: TokenType.syntheticRebase,
-        mailbox: chain2Addresses.mailbox,
-        owner: chain2Addresses.mailbox,
+        mailbox: chain3Addresses.mailbox,
+        owner: chain3Addresses.mailbox,
         collateralChainName: CHAIN_NAME_2,
       },
     };