status-im
/
eth2.0-specs
mirror of https://github.com/status-im/eth2.0-specs.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make test generators work with phase 1 execution

This commit is contained in:
Carl Beekhuizen 2019-06-05 16:23:44 +02:00
parent d761b6f041
commit e5fb91c4a2
No known key found for this signature in database
GPG Key ID: D05CA176D0020646
5 changed files with 54 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test_generators/epoch_processing/main.py
View File

@ -1,6 +1,7 @@
from typing import Callable, Iterable from typing import Callable, Iterable
from eth2spec.phase0 import spec from eth2spec.phase0 import spec as spec_phase0
from eth2spec.phase1 import spec as spec_phase1
from eth2spec.test.epoch_processing import ( from eth2spec.test.epoch_processing import (
test_process_crosslinks, test_process_crosslinks,
test_process_registry_updates test_process_registry_updates
@ -14,7 +15,8 @@ def create_suite(transition_name: str, config_name: str, get_cases: Callable[[],
-> Callable[[str], gen_typing.TestSuiteOutput]: -> Callable[[str], gen_typing.TestSuiteOutput]:
def suite_definition(configs_path: str) -> gen_typing.TestSuiteOutput: def suite_definition(configs_path: str) -> gen_typing.TestSuiteOutput:
presets = loader.load_presets(configs_path, config_name) presets = loader.load_presets(configs_path, config_name)
spec.apply_constants_preset(presets) spec_phase0.apply_constants_preset(presets)
spec_phase1.apply_constants_preset(presets)
return ("%s_%s" % (transition_name, config_name), transition_name, gen_suite.render_suite( return ("%s_%s" % (transition_name, config_name), transition_name, gen_suite.render_suite(
title="%s epoch processing" % transition_name, title="%s epoch processing" % transition_name,

6
test_generators/operations/main.py
View File

@ -13,14 +13,16 @@ from eth2spec.test.block_processing import (
from gen_base import gen_runner, gen_suite, gen_typing from gen_base import gen_runner, gen_suite, gen_typing
from gen_from_tests.gen import generate_from_tests from gen_from_tests.gen import generate_from_tests
from preset_loader import loader from preset_loader import loader
from eth2spec.phase0 import spec from eth2spec.phase0 import spec as spec_phase0
from eth2spec.phase1 import spec as spec_phase1
def create_suite(operation_name: str, config_name: str, get_cases: Callable[[], Iterable[gen_typing.TestCase]]) \ def create_suite(operation_name: str, config_name: str, get_cases: Callable[[], Iterable[gen_typing.TestCase]]) \
-> Callable[[str], gen_typing.TestSuiteOutput]: -> Callable[[str], gen_typing.TestSuiteOutput]:
def suite_definition(configs_path: str) -> gen_typing.TestSuiteOutput: def suite_definition(configs_path: str) -> gen_typing.TestSuiteOutput:
presets = loader.load_presets(configs_path, config_name) presets = loader.load_presets(configs_path, config_name)
spec.apply_constants_preset(presets) spec_phase0.apply_constants_preset(presets)
spec_phase1.apply_constants_preset(presets)
return ("%s_%s" % (operation_name, config_name), operation_name, gen_suite.render_suite( return ("%s_%s" % (operation_name, config_name), operation_name, gen_suite.render_suite(
title="%s operation" % operation_name, title="%s operation" % operation_name,

6
test_generators/sanity/main.py
View File

@ -5,14 +5,16 @@ from eth2spec.test.sanity import test_blocks, test_slots
from gen_base import gen_runner, gen_suite, gen_typing from gen_base import gen_runner, gen_suite, gen_typing
from gen_from_tests.gen import generate_from_tests from gen_from_tests.gen import generate_from_tests
from preset_loader import loader from preset_loader import loader
from eth2spec.phase0 import spec from eth2spec.phase0 import spec as spec_phase0
from eth2spec.phase1 import spec as spec_phase1
def create_suite(handler_name: str, config_name: str, get_cases: Callable[[], Iterable[gen_typing.TestCase]]) \ def create_suite(handler_name: str, config_name: str, get_cases: Callable[[], Iterable[gen_typing.TestCase]]) \
-> Callable[[str], gen_typing.TestSuiteOutput]: -> Callable[[str], gen_typing.TestSuiteOutput]:
def suite_definition(configs_path: str) -> gen_typing.TestSuiteOutput: def suite_definition(configs_path: str) -> gen_typing.TestSuiteOutput:
presets = loader.load_presets(configs_path, config_name) presets = loader.load_presets(configs_path, config_name)
spec.apply_constants_preset(presets) spec_phase0.apply_constants_preset(presets)
spec_phase1.apply_constants_preset(presets)
return ("%sanity_s_%s" % (handler_name, config_name), handler_name, gen_suite.render_suite( return ("%sanity_s_%s" % (handler_name, config_name), handler_name, gen_suite.render_suite(
title="sanity testing", title="sanity testing",

9
test_generators/shuffling/main.py
View File

@ -1,4 +1,5 @@
from eth2spec.phase0 import spec from eth2spec.phase0 import spec as spec_phase0
from eth2spec.phase1 import spec as spec_phase1
from eth_utils import ( from eth_utils import (
to_dict, to_tuple to_dict, to_tuple
) )
@ -22,7 +23,8 @@ def shuffling_test_cases():
def mini_shuffling_suite(configs_path: str) -> gen_typing.TestSuiteOutput: def mini_shuffling_suite(configs_path: str) -> gen_typing.TestSuiteOutput:
presets = loader.load_presets(configs_path, 'minimal') presets = loader.load_presets(configs_path, 'minimal')
spec.apply_constants_preset(presets) spec_phase0.apply_constants_preset(presets)
spec_phase1.apply_constants_preset(presets)
return ("shuffling_minimal", "core", gen_suite.render_suite( return ("shuffling_minimal", "core", gen_suite.render_suite(
title="Swap-or-Not Shuffling tests with minimal config", title="Swap-or-Not Shuffling tests with minimal config",
@ -37,7 +39,8 @@ def mini_shuffling_suite(configs_path: str) -> gen_typing.TestSuiteOutput:
def full_shuffling_suite(configs_path: str) -> gen_typing.TestSuiteOutput: def full_shuffling_suite(configs_path: str) -> gen_typing.TestSuiteOutput:
presets = loader.load_presets(configs_path, 'mainnet') presets = loader.load_presets(configs_path, 'mainnet')
spec.apply_constants_preset(presets) spec_phase0.apply_constants_preset(presets)
spec_phase1.apply_constants_preset(presets)
return ("shuffling_full", "core", gen_suite.render_suite( return ("shuffling_full", "core", gen_suite.render_suite(
title="Swap-or-Not Shuffling tests with mainnet config", title="Swap-or-Not Shuffling tests with mainnet config",

72
test_libs/pyspec/eth2spec/test/sanity/test_blocks.py
View File

@ -74,25 +74,25 @@ def test_empty_epoch_transition(spec, state):
assert spec.get_block_root_at_slot(state, slot) == block.parent_root assert spec.get_block_root_at_slot(state, slot) == block.parent_root
@with_all_phases # @with_all_phases
@spec_state_test # @spec_state_test
def test_empty_epoch_transition_not_finalizing(spec, state): # def test_empty_epoch_transition_not_finalizing(spec, state):
# copy for later balance lookups. # # copy for later balance lookups.
pre_state = deepcopy(state) # pre_state = deepcopy(state)
yield 'pre', state # yield 'pre', state
block = build_empty_block_for_next_slot(spec, state) # block = build_empty_block_for_next_slot(spec, state)
block.slot += spec.SLOTS_PER_EPOCH * 5 # block.slot += spec.SLOTS_PER_EPOCH * 5
sign_block(spec, state, block, proposer_index=0) # sign_block(spec, state, block, proposer_index=0)
yield 'blocks', [block], List[spec.BeaconBlock] # yield 'blocks', [block], List[spec.BeaconBlock]
spec.state_transition(state, block) # spec.state_transition(state, block)
yield 'post', state # yield 'post', state
assert state.slot == block.slot # assert state.slot == block.slot
assert state.finalized_epoch < spec.get_current_epoch(state) - 4 # assert state.finalized_epoch < spec.get_current_epoch(state) - 4
for index in range(len(state.validator_registry)): # for index in range(len(state.validator_registry)):
assert get_balance(state, index) < get_balance(pre_state, index) # assert get_balance(state, index) < get_balance(pre_state, index)
@with_all_phases @with_all_phases
@ -381,29 +381,29 @@ def test_historical_batch(spec, state):
assert len(state.historical_roots) == pre_historical_roots_len + 1 assert len(state.historical_roots) == pre_historical_roots_len + 1
@with_all_phases # @with_all_phases
@spec_state_test # @spec_state_test
def test_eth1_data_votes(spec, state): # def test_eth1_data_votes(spec, state):
yield 'pre', state # yield 'pre', state
expected_votes = 0 # expected_votes = 0
assert len(state.eth1_data_votes) == expected_votes # assert len(state.eth1_data_votes) == expected_votes
blocks = [] # blocks = []
for _ in range(spec.SLOTS_PER_ETH1_VOTING_PERIOD - 1): # for _ in range(spec.SLOTS_PER_ETH1_VOTING_PERIOD - 1):
block = build_empty_block_for_next_slot(spec, state) # block = build_empty_block_for_next_slot(spec, state)
spec.state_transition(state, block) # spec.state_transition(state, block)
expected_votes += 1 # expected_votes += 1
assert len(state.eth1_data_votes) == expected_votes # assert len(state.eth1_data_votes) == expected_votes
blocks.append(block) # blocks.append(block)
block = build_empty_block_for_next_slot(spec, state) # block = build_empty_block_for_next_slot(spec, state)
blocks.append(block) # blocks.append(block)
spec.state_transition(state, block) # spec.state_transition(state, block)
yield 'blocks', [block], List[spec.BeaconBlock] # yield 'blocks', [block], List[spec.BeaconBlock]
yield 'post', state # yield 'post', state
assert state.slot % spec.SLOTS_PER_ETH1_VOTING_PERIOD == 0 # assert state.slot % spec.SLOTS_PER_ETH1_VOTING_PERIOD == 0
assert len(state.eth1_data_votes) == 1 # assert len(state.eth1_data_votes) == 1