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

Move capella fork tests to the correct folder and resolve conflicts

This commit is contained in:
Hsiao-Wei Wang 2021-12-27 18:44:03 +08:00
parent 3b474eb2fe
commit cbf314c67e
No known key found for this signature in database
GPG Key ID: 1111A8A81778319E
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/core/pyspec/eth2spec/capella/fork/test_capella_fork_basic.py → tests/core/pyspec/eth2spec/test/capella/fork/test_capella_fork_basic.py
View File

@ -7,7 +7,7 @@ from eth2spec.test.context import (
)
from eth2spec.test.utils import with_meta_tags
from eth2spec.test.helpers.constants import (
MERGE, CAPELLA,
BELLATRIX, CAPELLA,
MINIMAL,
)
from eth2spec.test.helpers.state import (
@ -20,7 +20,7 @@ from eth2spec.test.helpers.capella.fork import (
)
@with_phases(phases=[MERGE], other_phases=[CAPELLA])
@with_phases(phases=[BELLATRIX], other_phases=[CAPELLA])
@spec_test
@with_state
@with_meta_tags(CAPELLA_FORK_TEST_META_TAGS)
@ -28,7 +28,7 @@ def test_fork_base_state(spec, phases, state):
yield from run_fork_test(phases[CAPELLA], state)
@with_phases(phases=[MERGE], other_phases=[CAPELLA])
@with_phases(phases=[BELLATRIX], other_phases=[CAPELLA])
@spec_test
@with_state
@with_meta_tags(CAPELLA_FORK_TEST_META_TAGS)
@ -37,7 +37,7 @@ def test_fork_next_epoch(spec, phases, state):
yield from run_fork_test(phases[CAPELLA], state)
@with_phases(phases=[MERGE], other_phases=[CAPELLA])
@with_phases(phases=[BELLATRIX], other_phases=[CAPELLA])
@spec_test
@with_state
@with_meta_tags(CAPELLA_FORK_TEST_META_TAGS)
@ -46,7 +46,7 @@ def test_fork_next_epoch_with_block(spec, phases, state):
yield from run_fork_test(phases[CAPELLA], state)
@with_phases(phases=[MERGE], other_phases=[CAPELLA])
@with_phases(phases=[BELLATRIX], other_phases=[CAPELLA])
@spec_test
@with_state
@with_meta_tags(CAPELLA_FORK_TEST_META_TAGS)
@ -56,7 +56,7 @@ def test_fork_many_next_epoch(spec, phases, state):
yield from run_fork_test(phases[CAPELLA], state)
@with_phases(phases=[MERGE], other_phases=[CAPELLA])
@with_phases(phases=[BELLATRIX], other_phases=[CAPELLA])
@with_custom_state(balances_fn=low_balances, threshold_fn=lambda spec: spec.config.EJECTION_BALANCE)
@spec_test
@with_meta_tags(CAPELLA_FORK_TEST_META_TAGS)
@ -64,7 +64,7 @@ def test_fork_random_low_balances(spec, phases, state):
yield from run_fork_test(phases[CAPELLA], state)
@with_phases(phases=[MERGE], other_phases=[CAPELLA])
@with_phases(phases=[BELLATRIX], other_phases=[CAPELLA])
@with_custom_state(balances_fn=misc_balances, threshold_fn=lambda spec: spec.config.EJECTION_BALANCE)
@spec_test
@with_meta_tags(CAPELLA_FORK_TEST_META_TAGS)
@ -72,7 +72,7 @@ def test_fork_random_misc_balances(spec, phases, state):
yield from run_fork_test(phases[CAPELLA], state)
@with_phases(phases=[MERGE], other_phases=[CAPELLA])
@with_phases(phases=[BELLATRIX], other_phases=[CAPELLA])
@with_presets([MINIMAL],
reason="mainnet config leads to larger validator set than limit of public/private keys pre-generated")
@with_custom_state(balances_fn=large_validator_set, threshold_fn=lambda spec: spec.config.EJECTION_BALANCE)

0
tests/core/pyspec/eth2spec/capella/fork/test_capella_fork_random.py → tests/core/pyspec/eth2spec/test/capella/fork/test_capella_fork_random.py
View File