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

Fix conflicts

This commit is contained in:
Hsiao-Wei Wang 2021-03-12 00:51:31 +08:00
parent c34eae33d0
commit a1e74b2c18
No known key found for this signature in database
GPG Key ID: 1111A8A81778319E
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/core/pyspec/eth2spec/test/altair/unittests/test_helpers.py
View File

@ -1,12 +1,12 @@
from eth2spec.test.context import ( from eth2spec.test.context import (
spec_state_test, spec_state_test,
with_phases, with_phases,
LIGHTCLIENT_PATCH, ALTAIR,
) )
from eth2spec.test.helpers.merkle import build_proof from eth2spec.test.helpers.merkle import build_proof
@with_phases([LIGHTCLIENT_PATCH]) @with_phases([ALTAIR])
@spec_state_test @spec_state_test
def test_next_sync_committee_tree(spec, state): def test_next_sync_committee_tree(spec, state):
state.next_sync_committee: object = spec.SyncCommittee( state.next_sync_committee: object = spec.SyncCommittee(
@ -22,7 +22,7 @@ def test_next_sync_committee_tree(spec, state):
) )
@with_phases([LIGHTCLIENT_PATCH]) @with_phases([ALTAIR])
@spec_state_test @spec_state_test
def test_finality_root_tree(spec, state): def test_finality_root_tree(spec, state):
finality_branch = build_proof(state.get_backing(), spec.FINALIZED_ROOT_INDEX) finality_branch = build_proof(state.get_backing(), spec.FINALIZED_ROOT_INDEX)

8
tests/core/pyspec/eth2spec/test/altair/unittests/test_sync_protocol.py
View File

@ -1,5 +1,5 @@
from eth2spec.test.context import ( from eth2spec.test.context import (
LIGHTCLIENT_PATCH, ALTAIR,
MINIMAL, MINIMAL,
spec_state_test, spec_state_test,
with_configs, with_configs,
@ -20,7 +20,7 @@ from eth2spec.test.helpers.sync_committee import (
from eth2spec.test.helpers.merkle import build_proof from eth2spec.test.helpers.merkle import build_proof
@with_phases([LIGHTCLIENT_PATCH]) @with_phases([ALTAIR])
@spec_state_test @spec_state_test
def test_process_light_client_update_not_updated(spec, state): def test_process_light_client_update_not_updated(spec, state):
pre_snapshot = spec.LightClientSnapshot( pre_snapshot = spec.LightClientSnapshot(
@ -78,7 +78,7 @@ def test_process_light_client_update_not_updated(spec, state):
assert store.snapshot == pre_snapshot assert store.snapshot == pre_snapshot
@with_phases([LIGHTCLIENT_PATCH]) @with_phases([ALTAIR])
@spec_state_test @spec_state_test
@with_configs([MINIMAL], reason="too slow") @with_configs([MINIMAL], reason="too slow")
def test_process_light_client_update_timeout(spec, state): def test_process_light_client_update_timeout(spec, state):
@ -143,7 +143,7 @@ def test_process_light_client_update_timeout(spec, state):
assert store.snapshot.header == update.header assert store.snapshot.header == update.header
@with_phases([LIGHTCLIENT_PATCH]) @with_phases([ALTAIR])
@spec_state_test @spec_state_test
@with_configs([MINIMAL], reason="too slow") @with_configs([MINIMAL], reason="too slow")
def test_process_light_client_update_finality_updated(spec, state): def test_process_light_client_update_finality_updated(spec, state):