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:39:38 +08:00
parent 216bbb0a46
commit 9254f1bf8c
No known key found for this signature in database
GPG Key ID: 1111A8A81778319E
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/generators/fork_choice/main.py
View File

@ -1,24 +1,24 @@
from eth2spec.gen_helpers.gen_from_tests.gen import run_state_test_generators from eth2spec.gen_helpers.gen_from_tests.gen import run_state_test_generators
from eth2spec.phase0 import spec as spec_phase0 from eth2spec.phase0 import spec as spec_phase0
from eth2spec.lightclient_patch import spec as spec_lightclient_patch from eth2spec.altair import spec as spec_altair
from eth2spec.phase1 import spec as spec_phase1 from eth2spec.phase1 import spec as spec_phase1
from eth2spec.test.context import PHASE0, PHASE1, LIGHTCLIENT_PATCH from eth2spec.test.context import PHASE0, PHASE1, ALTAIR
specs = (spec_phase0, spec_lightclient_patch, spec_phase1) specs = (spec_phase0, spec_altair, spec_phase1)
if __name__ == "__main__": if __name__ == "__main__":
phase_0_mods = {key: 'eth2spec.test.phase0.fork_choice.test_' + key for key in [ phase_0_mods = {key: 'eth2spec.test.phase0.fork_choice.test_' + key for key in [
'get_head', 'get_head',
]} ]}
# No additional lightclient_patch or phase 1 specific finality tests, yet. # No additional Altair or phase 1 specific finality tests, yet.
lightclient_patch_mods = phase_0_mods altair_mods = phase_0_mods
phase_1_mods = phase_0_mods phase_1_mods = phase_0_mods
all_mods = { all_mods = {
PHASE0: phase_0_mods, PHASE0: phase_0_mods,
LIGHTCLIENT_PATCH: lightclient_patch_mods, ALTAIR: altair_mods,
PHASE1: phase_1_mods, PHASE1: phase_1_mods,
} }