Merge pull request #2341 from ethereum/merge-ssz-tests
Merge SSZ-static tests
This commit is contained in:
commit
488bf2c4a0
|
@ -9,7 +9,8 @@ from eth2spec.debug import random_value, encode
|
||||||
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
|
||||||
from eth2spec.altair import spec as spec_altair
|
from eth2spec.altair import spec as spec_altair
|
||||||
from eth2spec.test.helpers.constants import ALTAIR, TESTGEN_FORKS, MINIMAL, MAINNET
|
from eth2spec.merge import spec as spec_merge
|
||||||
|
from eth2spec.test.helpers.constants import ALTAIR, MERGE, TESTGEN_FORKS, MINIMAL, MAINNET
|
||||||
from eth2spec.utils.ssz.ssz_typing import Container
|
from eth2spec.utils.ssz.ssz_typing import Container
|
||||||
from eth2spec.utils.ssz.ssz_impl import (
|
from eth2spec.utils.ssz.ssz_impl import (
|
||||||
hash_tree_root,
|
hash_tree_root,
|
||||||
|
@ -64,6 +65,7 @@ def create_provider(fork_name, config_name: str, seed: int, mode: random_value.R
|
||||||
config_util.prepare_config(configs_path, config_name)
|
config_util.prepare_config(configs_path, config_name)
|
||||||
reload(spec_phase0)
|
reload(spec_phase0)
|
||||||
reload(spec_altair)
|
reload(spec_altair)
|
||||||
|
reload(spec_merge)
|
||||||
return config_name
|
return config_name
|
||||||
|
|
||||||
def cases_fn() -> Iterable[gen_typing.TestCase]:
|
def cases_fn() -> Iterable[gen_typing.TestCase]:
|
||||||
|
@ -71,6 +73,8 @@ def create_provider(fork_name, config_name: str, seed: int, mode: random_value.R
|
||||||
spec = spec_phase0
|
spec = spec_phase0
|
||||||
if fork_name == ALTAIR:
|
if fork_name == ALTAIR:
|
||||||
spec = spec_altair
|
spec = spec_altair
|
||||||
|
elif fork_name == MERGE:
|
||||||
|
spec = spec_merge
|
||||||
|
|
||||||
for (i, (name, ssz_type)) in enumerate(get_spec_ssz_types(spec)):
|
for (i, (name, ssz_type)) in enumerate(get_spec_ssz_types(spec)):
|
||||||
yield from ssz_static_cases(fork_name, seed * 1000 + i, name, ssz_type, mode, chaos, count)
|
yield from ssz_static_cases(fork_name, seed * 1000 + i, name, ssz_type, mode, chaos, count)
|
||||||
|
@ -89,8 +93,8 @@ if __name__ == "__main__":
|
||||||
seed += 1
|
seed += 1
|
||||||
settings.append((seed, MAINNET, random_value.RandomizationMode.mode_random, False, 5))
|
settings.append((seed, MAINNET, random_value.RandomizationMode.mode_random, False, 5))
|
||||||
seed += 1
|
seed += 1
|
||||||
|
# TODO: enable testing for the whole merge spec.
|
||||||
for fork in TESTGEN_FORKS:
|
for fork in TESTGEN_FORKS + (MERGE,):
|
||||||
gen_runner.run_generator("ssz_static", [
|
gen_runner.run_generator("ssz_static", [
|
||||||
create_provider(fork, config_name, seed, mode, chaos, cases_if_random)
|
create_provider(fork, config_name, seed, mode, chaos, cases_if_random)
|
||||||
for (seed, config_name, mode, chaos, cases_if_random) in settings
|
for (seed, config_name, mode, chaos, cases_if_random) in settings
|
||||||
|
|
Loading…
Reference in New Issue