From a1e74b2c18a8885dab633c85470b99e7e162afcc Mon Sep 17 00:00:00 2001 From: Hsiao-Wei Wang Date: Fri, 12 Mar 2021 00:51:31 +0800 Subject: [PATCH] Fix conflicts --- .../pyspec/eth2spec/test/altair/unittests/test_helpers.py | 6 +++--- .../eth2spec/test/altair/unittests/test_sync_protocol.py | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/core/pyspec/eth2spec/test/altair/unittests/test_helpers.py b/tests/core/pyspec/eth2spec/test/altair/unittests/test_helpers.py index 48054d088..d89ff6d84 100644 --- a/tests/core/pyspec/eth2spec/test/altair/unittests/test_helpers.py +++ b/tests/core/pyspec/eth2spec/test/altair/unittests/test_helpers.py @@ -1,12 +1,12 @@ from eth2spec.test.context import ( spec_state_test, with_phases, - LIGHTCLIENT_PATCH, + ALTAIR, ) from eth2spec.test.helpers.merkle import build_proof -@with_phases([LIGHTCLIENT_PATCH]) +@with_phases([ALTAIR]) @spec_state_test def test_next_sync_committee_tree(spec, state): 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 def test_finality_root_tree(spec, state): finality_branch = build_proof(state.get_backing(), spec.FINALIZED_ROOT_INDEX) diff --git a/tests/core/pyspec/eth2spec/test/altair/unittests/test_sync_protocol.py b/tests/core/pyspec/eth2spec/test/altair/unittests/test_sync_protocol.py index d65e0ad01..4c9b98e0a 100644 --- a/tests/core/pyspec/eth2spec/test/altair/unittests/test_sync_protocol.py +++ b/tests/core/pyspec/eth2spec/test/altair/unittests/test_sync_protocol.py @@ -1,5 +1,5 @@ from eth2spec.test.context import ( - LIGHTCLIENT_PATCH, + ALTAIR, MINIMAL, spec_state_test, with_configs, @@ -20,7 +20,7 @@ from eth2spec.test.helpers.sync_committee import ( from eth2spec.test.helpers.merkle import build_proof -@with_phases([LIGHTCLIENT_PATCH]) +@with_phases([ALTAIR]) @spec_state_test def test_process_light_client_update_not_updated(spec, state): pre_snapshot = spec.LightClientSnapshot( @@ -78,7 +78,7 @@ def test_process_light_client_update_not_updated(spec, state): assert store.snapshot == pre_snapshot -@with_phases([LIGHTCLIENT_PATCH]) +@with_phases([ALTAIR]) @spec_state_test @with_configs([MINIMAL], reason="too slow") 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 -@with_phases([LIGHTCLIENT_PATCH]) +@with_phases([ALTAIR]) @spec_state_test @with_configs([MINIMAL], reason="too slow") def test_process_light_client_update_finality_updated(spec, state):