From 11842c9e2a1d18227d4c12c6ea5aa0d19fa49656 Mon Sep 17 00:00:00 2001 From: Hsiao-Wei Wang Date: Thu, 6 Apr 2023 20:04:28 +0800 Subject: [PATCH] Update test generators. Move `test_deposit_transition` to `sanity/blocks/` --- tests/core/pyspec/eth2spec/test/eip6110/__init__.py | 0 .../eth2spec/test/eip6110/block_processing/__init__.py | 0 .../core/pyspec/eth2spec/test/eip6110/sanity/__init__.py | 0 .../eth2spec/test/eip6110/sanity/blocks/__init__.py | 1 + .../blocks}/test_deposit_transition.py | 0 tests/generators/operations/main.py | 2 +- tests/generators/sanity/main.py | 8 +++++++- 7 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 tests/core/pyspec/eth2spec/test/eip6110/__init__.py create mode 100644 tests/core/pyspec/eth2spec/test/eip6110/block_processing/__init__.py create mode 100644 tests/core/pyspec/eth2spec/test/eip6110/sanity/__init__.py create mode 100644 tests/core/pyspec/eth2spec/test/eip6110/sanity/blocks/__init__.py rename tests/core/pyspec/eth2spec/test/eip6110/{block_processing => sanity/blocks}/test_deposit_transition.py (100%) diff --git a/tests/core/pyspec/eth2spec/test/eip6110/__init__.py b/tests/core/pyspec/eth2spec/test/eip6110/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/tests/core/pyspec/eth2spec/test/eip6110/block_processing/__init__.py b/tests/core/pyspec/eth2spec/test/eip6110/block_processing/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/tests/core/pyspec/eth2spec/test/eip6110/sanity/__init__.py b/tests/core/pyspec/eth2spec/test/eip6110/sanity/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/tests/core/pyspec/eth2spec/test/eip6110/sanity/blocks/__init__.py b/tests/core/pyspec/eth2spec/test/eip6110/sanity/blocks/__init__.py new file mode 100644 index 000000000..3c0e060f3 --- /dev/null +++ b/tests/core/pyspec/eth2spec/test/eip6110/sanity/blocks/__init__.py @@ -0,0 +1 @@ +from .test_deposit_transition import * # noqa: F401 F403 diff --git a/tests/core/pyspec/eth2spec/test/eip6110/block_processing/test_deposit_transition.py b/tests/core/pyspec/eth2spec/test/eip6110/sanity/blocks/test_deposit_transition.py similarity index 100% rename from tests/core/pyspec/eth2spec/test/eip6110/block_processing/test_deposit_transition.py rename to tests/core/pyspec/eth2spec/test/eip6110/sanity/blocks/test_deposit_transition.py diff --git a/tests/generators/operations/main.py b/tests/generators/operations/main.py index 7b382c838..fc2217917 100644 --- a/tests/generators/operations/main.py +++ b/tests/generators/operations/main.py @@ -1,5 +1,5 @@ from eth2spec.gen_helpers.gen_from_tests.gen import run_state_test_generators, combine_mods -from eth2spec.test.helpers.constants import PHASE0, ALTAIR, BELLATRIX, CAPELLA, DENEB +from eth2spec.test.helpers.constants import PHASE0, ALTAIR, BELLATRIX, CAPELLA, DENEB, EIP6110 if __name__ == "__main__": diff --git a/tests/generators/sanity/main.py b/tests/generators/sanity/main.py index 8a6c7b39c..b9f6d7fbb 100644 --- a/tests/generators/sanity/main.py +++ b/tests/generators/sanity/main.py @@ -1,4 +1,4 @@ -from eth2spec.test.helpers.constants import PHASE0, ALTAIR, BELLATRIX, CAPELLA, DENEB +from eth2spec.test.helpers.constants import PHASE0, ALTAIR, BELLATRIX, CAPELLA, DENEB, EIP6110 from eth2spec.gen_helpers.gen_from_tests.gen import run_state_test_generators, combine_mods @@ -28,12 +28,18 @@ if __name__ == "__main__": ]} deneb_mods = combine_mods(_new_deneb_mods, capella_mods) + _new_eip6110_mods = {key: 'eth2spec.test.eip6110.sanity.' + key for key in [ + 'blocks', + ]} + eip6110_mods = combine_mods(_new_eip6110_mods, deneb_mods) + all_mods = { PHASE0: phase_0_mods, ALTAIR: altair_mods, BELLATRIX: bellatrix_mods, CAPELLA: capella_mods, DENEB: deneb_mods, + EIP6110: eip6110_mods, } run_state_test_generators(runner_name="sanity", all_mods=all_mods)