diff --git a/.circleci/config.yml b/.circleci/config.yml index 7a95cc201..bf8b7ada8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -194,19 +194,6 @@ jobs: command: make citest fork=eip7594 - store_test_results: path: tests/core/pyspec/test-reports - test-eip7732: - docker: - - image: circleci/python:3.9 - working_directory: ~/specs-repo - steps: - - restore_cache: - key: v3-specs-repo-{{ .Branch }}-{{ .Revision }} - - restore_pyspec_cached_venv - - run: - name: Run py-tests - command: make citest fork=eip7732 - - store_test_results: - path: tests/core/pyspec/test-reports table_of_contents: docker: - image: circleci/node:10.16.3 diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index b581338c1..a56270030 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -72,7 +72,7 @@ jobs: needs: [lint,codespell,table_of_contents] strategy: matrix: - version: ["phase0", "altair", "bellatrix", "capella", "deneb", "electra", "whisk", "eip7594", "eip7732"] + version: ["phase0", "altair", "bellatrix", "capella", "deneb", "electra", "whisk", "eip7594"] steps: - name: Checkout repository uses: actions/checkout@v4 diff --git a/tests/core/pyspec/eth2spec/test/helpers/constants.py b/tests/core/pyspec/eth2spec/test/helpers/constants.py index 4267ad21c..3389311c3 100644 --- a/tests/core/pyspec/eth2spec/test/helpers/constants.py +++ b/tests/core/pyspec/eth2spec/test/helpers/constants.py @@ -38,14 +38,13 @@ ALL_PHASES = ( ELECTRA, # Experimental patches EIP7594, - EIP7732, ) # The forks that have light client specs LIGHT_CLIENT_TESTING_FORKS = (*[item for item in MAINNET_FORKS if item != PHASE0],) # The forks that output to the test vectors. -TESTGEN_FORKS = (*MAINNET_FORKS, ELECTRA, EIP7594, WHISK, EIP7732) +TESTGEN_FORKS = (*MAINNET_FORKS, ELECTRA, EIP7594, WHISK) # Forks allowed in the test runner `--fork` flag, to fail fast in case of typos -ALLOWED_TEST_RUNNER_FORKS = (*ALL_PHASES, WHISK) +ALLOWED_TEST_RUNNER_FORKS = (*ALL_PHASES, WHISK, EIP7732) # NOTE: the same definition as in `pysetup/md_doc_paths.py` PREVIOUS_FORK_OF = { @@ -70,7 +69,6 @@ POST_FORK_OF = { BELLATRIX: CAPELLA, CAPELLA: DENEB, DENEB: ELECTRA, - ELECTRA: EIP7732, } ALL_PRE_POST_FORKS = POST_FORK_OF.items()