status-im/eth2.0-specs
2
0
Fork 0
mirror of https://github.com/status-im/eth2.0-specs.git synced 2025-02-04 14:54:53 +00:00
Code Issues Projects Releases Wiki Activity

Fix bug in Altair transition tests with missing state root

Browse Source
This commit is contained in:
Alex Stokes 2021-05-25 09:30:38 -07:00
parent f492f3b196
commit 4664ccbc42
No known key found for this signature in database
GPG Key ID: 99B3D88FD6C55A69
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/core/pyspec/eth2spec/test/altair/transition/test_transition.py
View File

@ -1,7 +1,7 @@
import random import random
from eth2spec.test.context import fork_transition_test from eth2spec.test.context import fork_transition_test
from eth2spec.test.helpers.constants import PHASE0, ALTAIR from eth2spec.test.helpers.constants import PHASE0, ALTAIR
from eth2spec.test.helpers.state import state_transition_and_sign_block, next_slot, next_epoch_via_block from eth2spec.test.helpers.state import state_transition_and_sign_block, next_slot, next_epoch_via_signed_block
from eth2spec.test.helpers.block import build_empty_block_for_next_slot, build_empty_block, sign_block from eth2spec.test.helpers.block import build_empty_block_for_next_slot, build_empty_block, sign_block
from eth2spec.test.helpers.attestations import next_slots_with_attestations from eth2spec.test.helpers.attestations import next_slots_with_attestations
@ -261,12 +261,12 @@ def _run_transition_test_with_attestations(state,
assert current_epoch == spec.GENESIS_EPOCH assert current_epoch == spec.GENESIS_EPOCH
# skip genesis epoch to avoid dealing with some edge cases... # skip genesis epoch to avoid dealing with some edge cases...
block = next_epoch_via_block(spec, state) block = next_epoch_via_signed_block(spec, state)
# regular state transition until fork: # regular state transition until fork:
fill_cur_epoch = False fill_cur_epoch = False
fill_prev_epoch = True fill_prev_epoch = True
blocks = [pre_tag(sign_block(spec, state, block))] blocks = [pre_tag(block)]
current_epoch = spec.get_current_epoch(state) current_epoch = spec.get_current_epoch(state)
for _ in range(current_epoch, fork_epoch - 1): for _ in range(current_epoch, fork_epoch - 1):
_, blocks_in_epoch, state = next_slots_with_attestations( _, blocks_in_epoch, state = next_slots_with_attestations(
@ -414,8 +414,8 @@ def test_transition_with_no_attestations_until_after_fork(state, fork_epoch, spe
# continue regular state transition but add attestations # continue regular state transition but add attestations
# for enough epochs to finalize the ``fork_epoch`` # for enough epochs to finalize the ``fork_epoch``
block = next_epoch_via_block(post_spec, state) block = next_epoch_via_signed_block(post_spec, state)
blocks.append(post_tag(sign_block(post_spec, state, block))) blocks.append(post_tag(block))
for _ in range(4): for _ in range(4):
_, blocks_in_epoch, state = next_slots_with_attestations( _, blocks_in_epoch, state = next_slots_with_attestations(
post_spec, post_spec,

12
tests/core/pyspec/eth2spec/test/helpers/state.py
View File

@ -58,11 +58,19 @@ def next_epoch(spec, state):
spec.process_slots(state, slot) spec.process_slots(state, slot)
def next_epoch_via_block(spec, state): def next_epoch_via_block(spec, state, insert_state_root=False):
""" """
Transition to the start slot of the next epoch via a full block transition Transition to the start slot of the next epoch via a full block transition
""" """
return apply_empty_block(spec, state, state.slot + spec.SLOTS_PER_EPOCH - state.slot % spec.SLOTS_PER_EPOCH) block = apply_empty_block(spec, state, state.slot + spec.SLOTS_PER_EPOCH - state.slot % spec.SLOTS_PER_EPOCH)
if insert_state_root:
block.state_root = state.hash_tree_root()
return block
def next_epoch_via_signed_block(spec, state):
block = next_epoch_via_block(spec, state, insert_state_root=True)
return sign_block(spec, state, block)
def get_state_root(spec, state, slot) -> bytes: def get_state_root(spec, state, slot) -> bytes: