From f97ea9e172e88a7527e7c7fa97e104a90df99a69 Mon Sep 17 00:00:00 2001
From: Hsiao-Wei Wang <hsiaowei.eth@gmail.com>
Date: Tue, 9 Mar 2021 20:55:39 +0800
Subject: [PATCH] Generate basic tests. Still having problem with generating
 `with_custom_state` tests

---
 .../gen_helpers/gen_from_tests/gen.py         | 11 +++++++---
 tests/generators/forks/main.py                | 21 +++++++------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/tests/core/pyspec/eth2spec/gen_helpers/gen_from_tests/gen.py b/tests/core/pyspec/eth2spec/gen_helpers/gen_from_tests/gen.py
index 67d29b194..f04bf46a7 100644
--- a/tests/core/pyspec/eth2spec/gen_helpers/gen_from_tests/gen.py
+++ b/tests/core/pyspec/eth2spec/gen_helpers/gen_from_tests/gen.py
@@ -1,6 +1,6 @@
 from importlib import reload, import_module
 from inspect import getmembers, isfunction
-from typing import Any, Callable, Dict, Iterable
+from typing import Any, Callable, Dict, Iterable, Optional
 
 from eth2spec.config import config_util
 from eth2spec.utils import bls
@@ -11,7 +11,7 @@ from eth2spec.gen_helpers.gen_base.gen_typing import TestCase, TestProvider
 
 
 def generate_from_tests(runner_name: str, handler_name: str, src: Any,
-                        fork_name: SpecForkName, bls_active: bool = True) -> Iterable[TestCase]:
+                        fork_name: SpecForkName, bls_active: bool = True, phase: Optional[str]=None) -> Iterable[TestCase]:
     """
     Generate a list of test cases by running tests from the given src in generator-mode.
     :param runner_name: to categorize the test in general as.
@@ -20,12 +20,17 @@ def generate_from_tests(runner_name: str, handler_name: str, src: Any,
     :param fork_name: to run tests against particular phase and/or fork.
            (if multiple forks are applicable, indicate the last fork)
     :param bls_active: optional, to override BLS switch preference. Defaults to True.
+    :param phase: optional, specific phase name
     :return: an iterable of test cases.
     """
     fn_names = [
         name for (name, _) in getmembers(src, isfunction)
         if name.startswith('test_')
     ]
+
+    if phase is None:
+        phase = fork_name
+
     print("generating test vectors from tests source: %s" % src.__name__)
     for name in fn_names:
         tfn = getattr(src, name)
@@ -42,7 +47,7 @@ def generate_from_tests(runner_name: str, handler_name: str, src: Any,
             suite_name='pyspec_tests',
             case_name=case_name,
             # TODO: with_all_phases and other per-phase tooling, should be replaced with per-fork equivalent.
-            case_fn=lambda: tfn(generator_mode=True, phase=fork_name, bls_active=bls_active)
+            case_fn=lambda: tfn(generator_mode=True, phase=phase, bls_active=bls_active)
         )
 
 
diff --git a/tests/generators/forks/main.py b/tests/generators/forks/main.py
index a32ece712..d39af802a 100644
--- a/tests/generators/forks/main.py
+++ b/tests/generators/forks/main.py
@@ -1,7 +1,7 @@
 from importlib import reload
 from typing import Iterable
 
-from eth2spec.test.context import LIGHTCLIENT_PATCH
+from eth2spec.test.context import PHASE0, LIGHTCLIENT_PATCH, MINIMAL, MAINNET
 from eth2spec.config import config_util
 from eth2spec.test.lightclient_patch.fork import test_fork as test_altair_forks
 from eth2spec.phase0 import spec as spec_phase0
@@ -10,24 +10,20 @@ from eth2spec.gen_helpers.gen_base import gen_runner, gen_typing
 from eth2spec.gen_helpers.gen_from_tests.gen import generate_from_tests
 
 
-pre_specs = {
-    LIGHTCLIENT_PATCH: spec_phase0,
-}
-
-
-def create_provider(fork_name: str, tests_src, config_name: str) -> gen_typing.TestProvider:
+def create_provider(tests_src, config_name: str) -> gen_typing.TestProvider:
 
     def prepare_fn(configs_path: str) -> str:
         config_util.prepare_config(configs_path, config_name)
-        reload(pre_specs[fork_name])
+        reload(spec_phase0)
         return config_name
 
     def cases_fn() -> Iterable[gen_typing.TestCase]:
         return generate_from_tests(
-            runner_name='forks',
-            handler_name='core',
+            runner_name='fork',
+            handler_name='fork',
             src=tests_src,
-            fork_name=fork_name,
+            fork_name=LIGHTCLIENT_PATCH,
+            phase=PHASE0,
         )
 
     return gen_typing.TestProvider(prepare=prepare_fn, make_cases=cases_fn)
@@ -35,6 +31,5 @@ def create_provider(fork_name: str, tests_src, config_name: str) -> gen_typing.T
 
 if __name__ == "__main__":
     gen_runner.run_generator("forks", [
-        create_provider(LIGHTCLIENT_PATCH, test_altair_forks, 'minimal'),
-        create_provider(LIGHTCLIENT_PATCH, test_altair_forks, 'minimal'),
+        create_provider(test_altair_forks, MINIMAL),
     ])