Move gen_helpers into a module of eth2spec package

tests/core/gen_helpers/gen_base/gen_runner.py → tests/core/pyspec/eth2spec/gen_helpers/gen_base/gen_runner.py

@@ -8,11 +8,11 @@
     YAML,
 )
 
-from gen_base.gen_typing import TestProvider
-
 from eth2spec.test import context
 from eth2spec.test.exceptions import SkippedTest
 
+from .gen_typing import TestProvider
+
 
 # Flag that the runner does NOT run test via pytest
 context.is_pytest = False
@@ -119,10 +119,11 @@ def run_generator(generator_name, test_providers: Iterable[TestProvider]):
 
         print(f"generating tests with config '{config_name}' ...")
         for test_case in tprov.make_cases():
-            case_dir = Path(output_dir) / Path(config_name) / Path(test_case.fork_name) \
-                       / Path(test_case.runner_name) / Path(test_case.handler_name) \
-                       / Path(test_case.suite_name) / Path(test_case.case_name)
-
+            case_dir = (
+                Path(output_dir) / Path(config_name) / Path(test_case.fork_name)
+                / Path(test_case.runner_name) / Path(test_case.handler_name)
+                / Path(test_case.suite_name) / Path(test_case.case_name)
+            )
             if case_dir.exists():
                 if not args.force:
                     print(f'Skipping already existing test: {case_dir}')

tests/core/gen_helpers/gen_from_tests/gen.py → tests/core/pyspec/eth2spec/gen_helpers/gen_from_tests/gen.py

@@ -4,10 +4,10 @@
 
 from eth2spec.config import config_util
 from eth2spec.utils import bls
-
 from eth2spec.test.context import ALL_CONFIGS, TESTGEN_FORKS, SpecForkName, ConfigName
-from gen_base import gen_runner
-from gen_base.gen_typing import TestCase, TestProvider
+
+from eth2spec.gen_helpers.gen_base import gen_runner
+from eth2spec.gen_helpers.gen_base.gen_typing import TestCase, TestProvider
 
 
 def generate_from_tests(runner_name: str, handler_name: str, src: Any,
@@ -56,11 +56,12 @@ def get_provider(create_provider_fn: Callable[[SpecForkName, str, str, ConfigNam
             handler_name=key,
             tests_src_mod_name=mod_name,
             config_name=config_name,
-    )
+        )
 
 
-def get_create_provider_fn(runner_name: str, config_name: ConfigName, specs: Iterable[Any]
-    ) -> Callable[[SpecForkName, str, str, ConfigName], TestProvider]:
+def get_create_provider_fn(
+        runner_name: str, config_name: ConfigName, specs: Iterable[Any]
+) -> Callable[[SpecForkName, str, str, ConfigName], TestProvider]:
     def prepare_fn(configs_path: str) -> str:
         config_util.prepare_config(configs_path, config_name)
         for spec in specs:

tests/generators/README.md

@@ -103,7 +103,7 @@ Write a `main.py` file. The shuffling test generator is a good minimal starting
 ```python
 from eth2spec.phase0 import spec as spec
 from eth_utils import to_tuple
-from gen_base import gen_runner, gen_typing
+from eth2spec.gen_helpers.gen_base import gen_runner, gen_typing
 from preset_loader import loader
 from typing import Iterable
 

tests/generators/bls/main.py

@@ -13,7 +13,7 @@
 
 from eth2spec.utils import bls
 from eth2spec.test.context import PHASE0
-from gen_base import gen_runner, gen_typing
+from eth2spec.gen_helpers.gen_base import gen_runner, gen_typing
 
 
 def to_bytes(i):

tests/generators/bls/requirements.txt

@@ -1,4 +1,2 @@
-py_ecc==5.1.0
-eth-utils==1.6.0
-../../core/gen_helpers
+pytest>=4.4
 ../../../

tests/generators/epoch_processing/main.py

@@ -1,4 +1,4 @@
-from gen_from_tests.gen import run_state_test_generators
+from eth2spec.gen_helpers.gen_from_tests.gen import run_state_test_generators
 from eth2spec.phase0 import spec as spec_phase0
 from eth2spec.lightclient_patch import spec as spec_lightclient_patch
 from eth2spec.phase1 import spec as spec_phase1

tests/generators/epoch_processing/requirements.txt

@@ -1,2 +1,2 @@
-../../core/gen_helpers
-../../../
+pytest>=4.4
+../../../

tests/generators/finality/main.py

@@ -1,4 +1,4 @@
-from gen_from_tests.gen import run_state_test_generators
+from eth2spec.gen_helpers.gen_from_tests.gen import run_state_test_generators
 from eth2spec.phase0 import spec as spec_phase0
 from eth2spec.lightclient_patch import spec as spec_lightclient_patch
 from eth2spec.phase1 import spec as spec_phase1

tests/generators/finality/requirements.txt

@@ -1,2 +1,2 @@
-../../core/gen_helpers
-../../../
+pytest>=4.4
+../../../

tests/generators/genesis/main.py

@@ -3,8 +3,8 @@
 from eth2spec.test.context import PHASE0
 from eth2spec.test.phase0.genesis import test_initialization, test_validity
 
-from gen_base import gen_runner, gen_typing
-from gen_from_tests.gen import generate_from_tests
+from eth2spec.gen_helpers.gen_base import gen_runner, gen_typing
+from eth2spec.gen_helpers.gen_from_tests.gen import generate_from_tests
 from eth2spec.phase0 import spec as spec
 from importlib import reload
 from eth2spec.config import config_util

tests/generators/genesis/requirements.txt

@@ -1,2 +1,2 @@
-../../core/gen_helpers
-../../../
+pytest>=4.4
+../../../

tests/generators/operations/main.py

@@ -1,4 +1,4 @@
-from gen_from_tests.gen import run_state_test_generators
+from eth2spec.gen_helpers.gen_from_tests.gen import run_state_test_generators
 from eth2spec.phase0 import spec as spec_phase0
 from eth2spec.lightclient_patch import spec as spec_lightclient_patch
 from eth2spec.phase1 import spec as spec_phase1

tests/generators/operations/requirements.txt

@@ -1,3 +1,2 @@
-eth-utils==1.6.0
-../../core/gen_helpers
-../../../
+pytest>=4.4
+../../../

tests/generators/rewards/main.py

@@ -1,4 +1,4 @@
-from gen_from_tests.gen import run_state_test_generators
+from eth2spec.gen_helpers.gen_from_tests.gen import run_state_test_generators
 from eth2spec.phase0 import spec as spec_phase0
 from eth2spec.lightclient_patch import spec as spec_lightclient_patch
 from eth2spec.phase1 import spec as spec_phase1

tests/generators/rewards/requirements.txt

@@ -1,2 +1,2 @@
-../../core/gen_helpers
-../../../
+pytest>=4.4
+../../../

tests/generators/sanity/main.py

@@ -1,9 +1,10 @@
-from gen_from_tests.gen import run_state_test_generators
 from eth2spec.phase0 import spec as spec_phase0
 from eth2spec.lightclient_patch import spec as spec_lightclient_patch
 from eth2spec.phase1 import spec as spec_phase1
 from eth2spec.test.context import PHASE0, PHASE1, LIGHTCLIENT_PATCH
 
+from eth2spec.gen_helpers.gen_from_tests.gen import run_state_test_generators
+
 
 specs = (spec_phase0, spec_lightclient_patch, spec_phase1)
 

tests/generators/sanity/requirements.txt

@@ -1,2 +1,2 @@
-../../core/gen_helpers
-../../../
+pytest>=4.4
+../../../

tests/generators/shuffling/main.py

@@ -2,7 +2,7 @@
 from typing import Iterable
 from importlib import reload
 
-from gen_base import gen_runner, gen_typing
+from eth2spec.gen_helpers.gen_base import gen_runner, gen_typing
 
 from eth2spec.config import config_util
 from eth2spec.phase0 import spec as spec

tests/generators/ssz_generic/main.py

@@ -1,5 +1,5 @@
 from typing import Iterable
-from gen_base import gen_runner, gen_typing
+from eth2spec.gen_helpers.gen_base import gen_runner, gen_typing
 import ssz_basic_vector
 import ssz_bitlist
 import ssz_bitvector

tests/generators/ssz_generic/requirements.txt

@@ -1,3 +1,2 @@
-eth-utils==1.6.0
-../../core/gen_helpers
+pytest>=4.4
 ../../../

tests/generators/ssz_static/main.py

@@ -3,7 +3,7 @@
 from importlib import reload
 from inspect import getmembers, isclass
 
-from gen_base import gen_runner, gen_typing
+from eth2spec.gen_helpers.gen_base import gen_runner, gen_typing
 
 from eth2spec.debug import random_value, encode
 from eth2spec.config import config_util

tests/generators/ssz_static/requirements.txt

@@ -1,2 +1,2 @@
-../../core/gen_helpers
-../../../
+pytest>=4.4
+../../../