Merge c69d5d5 into f9676f1

ChainSafe · Mar 20, 2024 · 4fce2eb · 4fce2eb
2 parents f9676f1 + c69d5d5
commit 4fce2eb
Show file tree

Hide file tree

Showing 8 changed files with 103 additions and 443 deletions.
diff --git a/.github/workflows/test-sim-merge.yml b/.github/workflows/test-sim-merge.yml
@@ -71,39 +71,6 @@ jobs:
           ENGINE_PORT: 8551
           ETH_PORT: 8661
 
-      - name: Pull geth withdrawals
-        run: docker pull $GETH_WITHDRAWALS_IMAGE
-
-      - name: Test Lodestar <> geth withdrawals
-        run: yarn test:sim:withdrawals
-        working-directory: packages/beacon-node
-        env:
-          EL_BINARY_DIR: ${{ env.GETH_WITHDRAWALS_IMAGE }}
-          EL_SCRIPT_DIR: gethdocker
-
-      - name: Pull ethereumjs withdrawals
-        run: docker pull $ETHEREUMJS_WITHDRAWALS_IMAGE
-
-      - name: Test Lodestar <> ethereumjs withdrawals
-        run: yarn test:sim:withdrawals
-        working-directory: packages/beacon-node
-        env:
-          EL_BINARY_DIR: ${{ env.ETHEREUMJS_WITHDRAWALS_IMAGE }}
-          EL_SCRIPT_DIR: ethereumjsdocker
-
-      # Disable nethermind build as the withdrawal test config seems to be no
-      # longer available, enable after grabbing a build which has one
-      #
-      # - name: Pull nethermind withdrawals
-      #   run: docker pull $NETHERMIND_WITHDRAWALS_IMAGE
-
-      # - name: Test Lodestar <> nethermind withdrawals
-      #   run: yarn test:sim:withdrawals
-      #   working-directory: packages/beacon-node
-      #   env:
-      #     EL_BINARY_DIR: ${{ env.NETHERMIND_WITHDRAWALS_IMAGE }}
-      #     EL_SCRIPT_DIR: netherminddocker
-
       # Enable the blob sims when stable images
       # - name: Pull ethereumjs blobs
       #   run: docker pull $ETHEREUMJS_BLOBS_IMAGE

diff --git a/docs/pages/contribution/testing/integration-tests.md b/docs/pages/contribution/testing/integration-tests.md
@@ -2,24 +2,6 @@
 
 The following tests are found in `packages/beacon-node`
 
-#### `test:sim:withdrawals`
-
-This test simulates capella blocks with withdrawals. It tests lodestar against Geth and EthereumJS.
-
-There are two ENV variables that are required to run this test:
-
-- `EL_BINARY_DIR`: the docker image setup to handle the test case
-- `EL_SCRIPT_DIR`: the script that will be used to start the EL client. All of the scripts can be found in `packages/beacon-node/test/scripts/el-interop` and the `EL_SCRIPT_DIR` is the sub-directory name in that root that should be used to run the test.
-
-The command to run this test is:
-
-`EL_BINARY_DIR=g11tech/geth:withdrawals EL_SCRIPT_DIR=gethdocker yarn vitest --run test/sim/withdrawal-interop.test.ts`
-
-The images used by this test during CI are:
-
-- `GETH_WITHDRAWALS_IMAGE: g11tech/geth:withdrawalsfeb8`
-- `ETHEREUMJS_WITHDRAWALS_IMAGE: g11tech/ethereumjs:blobs-b6b63`
-
 #### `test:sim:mergemock`
 
 #### `yarn test:sim:blobs`
diff --git a/packages/beacon-node/package.json b/packages/beacon-node/package.json
@@ -81,7 +81,6 @@
     "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: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",
     "download-spec-tests": "node --loader=ts-node/esm test/spec/downloadTests.ts",
     "test:spec:bls": "vitest --run --config vitest.spec.config.ts --dir test/spec/bls/",