Enable more rewards and finality tests

This commit is contained in:
Hsiao-Wei Wang 2020-09-04 21:26:16 +08:00
parent a0d646e1e0
commit 916ae9e309
No known key found for this signature in database
GPG Key ID: 95B070122902DEA4
2 changed files with 15 additions and 14 deletions

View File

@ -4,7 +4,7 @@ from importlib import reload
from gen_base import gen_runner, gen_typing from gen_base import gen_runner, gen_typing
from gen_from_tests.gen import generate_from_tests from gen_from_tests.gen import generate_from_tests
from eth2spec.test.context import PHASE0 from eth2spec.test.context import PHASE0, PHASE1
from eth2spec.test.phase0.finality import test_finality from eth2spec.test.phase0.finality import test_finality
from eth2spec.config import config_util from eth2spec.config import config_util
from eth2spec.phase0 import spec as spec_phase0 from eth2spec.phase0 import spec as spec_phase0
@ -12,7 +12,7 @@ from eth2spec.phase1 import spec as spec_phase1
from eth2spec.utils import bls from eth2spec.utils import bls
def create_provider(handler_name: str, tests_src, config_name: str) -> gen_typing.TestProvider: def create_provider(fork_name: str, handler_name: str, tests_src, config_name: str) -> gen_typing.TestProvider:
def prepare_fn(configs_path: str) -> str: def prepare_fn(configs_path: str) -> str:
config_util.prepare_config(configs_path, config_name) config_util.prepare_config(configs_path, config_name)
@ -26,14 +26,18 @@ def create_provider(handler_name: str, tests_src, config_name: str) -> gen_typin
runner_name='finality', runner_name='finality',
handler_name=handler_name, handler_name=handler_name,
src=tests_src, src=tests_src,
fork_name=PHASE0, fork_name=fork_name,
) )
return gen_typing.TestProvider(prepare=prepare_fn, make_cases=cases_fn) return gen_typing.TestProvider(prepare=prepare_fn, make_cases=cases_fn)
if __name__ == "__main__": if __name__ == "__main__":
# No additional phase 1 specific rewards tests, yet.
key = 'finality'
gen_runner.run_generator("finality", [ gen_runner.run_generator("finality", [
create_provider('finality', test_finality, 'minimal'), create_provider(PHASE0, 'finality', test_finality, 'minimal'),
create_provider('finality', test_finality, 'mainnet'), create_provider(PHASE0, 'finality', test_finality, 'mainnet'),
create_provider(PHASE1, 'finality', test_finality, 'minimal'),
create_provider(PHASE1, 'finality', test_finality, 'mainnet'),
]) ])

View File

@ -45,15 +45,12 @@ if __name__ == "__main__":
gen_runner.run_generator(f"rewards", [ gen_runner.run_generator(f"rewards", [
create_provider(PHASE0, key, mod_name, 'minimal') for key, mod_name in phase_0_mods create_provider(PHASE0, key, mod_name, 'minimal') for key, mod_name in phase_0_mods
]) ])
# TODO: disabled for testing gen_runner.run_generator(f"rewards", [
# gen_runner.run_generator(f"rewards", [ create_provider(PHASE0, key, mod_name, 'mainnet') for key, mod_name in phase_0_mods
# create_provider(key, mod_name, 'mainnet') for key, mod_name in phase_0_mods ])
# ])
gen_runner.run_generator(f"rewards", [ gen_runner.run_generator(f"rewards", [
create_provider(PHASE1, key, mod_name, 'minimal') for key, mod_name in phase_1_mods create_provider(PHASE1, key, mod_name, 'minimal') for key, mod_name in phase_1_mods
]) ])
# Disabled for now gen_runner.run_generator(f"rewards", [
# gen_runner.run_generator(f"rewards", [ create_provider(PHASE1, key, mod_name, 'mainnet') for key, mod_name in phase_1_mods
# create_provider(PHASE1, key, mod_name, 'mainnet') for key, mod_name in phase_1_mods ])
# ])