test: consolidate sim-merge tests (#6344)

* Add new assertions for multi-fork sim tests * Remove redundant sim-merge test * Remove the unused script file and update docs * Fix an edge case for multi-client tests * Remove unused ci tasks * Enable all nodes
ChainSafe · Feb 26, 2024 · e9a3f07 · e9a3f07
1 parent 2bb4ae6
commit e9a3f07
Show file tree

Hide file tree

Showing 10 changed files with 162 additions and 490 deletions.
diff --git a/.github/workflows/test-sim-merge.yml b/.github/workflows/test-sim-merge.yml
@@ -55,28 +55,9 @@ jobs:
       - name: Pull Geth
         run: docker pull $GETH_IMAGE
 
-      - name: Test Lodestar <> Geth interop
-        run: yarn test:sim:merge-interop
-        working-directory: packages/beacon-node
-        env:
-          EL_BINARY_DIR: ${{ env.GETH_IMAGE }}
-          EL_SCRIPT_DIR: gethdocker
-          ENGINE_PORT: 8551
-          ETH_PORT: 8545
-          TX_SCENARIOS: simple
-
       - name: Pull Nethermind
         run: docker pull $NETHERMIND_IMAGE
 
-      - name: Test Lodestar <> Nethermind interop
-        run: yarn test:sim:merge-interop
-        working-directory: packages/beacon-node
-        env:
-          EL_BINARY_DIR: ${{ env.NETHERMIND_IMAGE }}
-          EL_SCRIPT_DIR: netherminddocker
-          ENGINE_PORT: 8551
-          ETH_PORT: 8545
-
       - name: Pull mergemock
         run: docker pull $MERGEMOCK_IMAGE
 

diff --git a/docs/pages/contribution/testing/integration-tests.md b/docs/pages/contribution/testing/integration-tests.md
@@ -20,8 +20,6 @@ The images used by this test during CI are:
 - `GETH_WITHDRAWALS_IMAGE: g11tech/geth:withdrawalsfeb8`
 - `ETHEREUMJS_WITHDRAWALS_IMAGE: g11tech/ethereumjs:blobs-b6b63`
 
-#### `test:sim:merge-interop`
-
 #### `test:sim:mergemock`
 
 #### `yarn test:sim:blobs`
diff --git a/packages/beacon-node/package.json b/packages/beacon-node/package.json
@@ -80,7 +80,6 @@
     "test:unit": "wrapper() { yarn test:unit:minimal $@ && yarn test:unit:mainnet $@; }; wrapper",
     "test:e2e": "LODESTAR_PRESET=minimal vitest --run --segfaultRetry 3 --config vitest.e2e.config.ts --dir test/e2e",
     "test:sim": "vitest --run test/sim/**/*.test.ts",
-    "test:sim:merge-interop": "vitest --run test/sim/merge-interop.test.ts",
     "test:sim:mergemock": "vitest --run test/sim/mergemock.test.ts",
     "test:sim:withdrawals": "vitest --run test/sim/withdrawal-interop.test.ts",
     "test:sim:blobs": "vitest --run test/sim/4844-interop.test.ts",