Fix tests

This commit is contained in:
Dankrad Feist 2020-06-12 11:07:44 +01:00
parent e46d5effe4
commit bcfaa1b635
No known key found for this signature in database
GPG Key ID: 6815E6A20BEBBABA
5 changed files with 13 additions and 24 deletions

View File

@ -101,7 +101,7 @@ codespell:
lint: pyspec
. venv/bin/activate; cd $(PY_SPEC_DIR); \
flake8 --ignore=E252,W504,W503,E128 --max-line-length=120 ./eth2spec \
flake8 --ignore=E252,W504,W503,E128,C901 --max-line-length=120 ./eth2spec \
&& cd ./eth2spec && mypy --follow-imports=silent --warn-unused-ignores --ignore-missing-imports --check-untyped-defs --disallow-incomplete-defs --disallow-untyped-defs -p phase0 \
&& mypy --follow-imports=silent --warn-unused-ignores --ignore-missing-imports --check-untyped-defs --disallow-incomplete-defs --disallow-untyped-defs -p phase1;

View File

@ -158,7 +158,7 @@ def test_multiple_epochs_custody(spec, state):
@with_all_phases_except(['phase0'])
@spec_state_test
def test_many_epochs_custody(spec, state):
transition_to(spec, state, state.slot + spec.SLOTS_PER_EPOCH * 100)
transition_to(spec, state, state.slot + spec.SLOTS_PER_EPOCH * 20)
shard = 0
offset_slots = spec.get_offset_slots(state, shard)
@ -254,7 +254,7 @@ def test_custody_response_multiple_epochs(spec, state):
@with_all_phases_except(['phase0'])
@spec_state_test
def test_custody_response_many_epochs(spec, state):
transition_to(spec, state, state.slot + spec.SLOTS_PER_EPOCH * 100)
transition_to(spec, state, state.slot + spec.SLOTS_PER_EPOCH * 20)
shard = 0
offset_slots = spec.get_offset_slots(state, shard)

View File

@ -87,17 +87,3 @@ def test_double_reveal(spec, state):
_, _, _ = run_custody_key_reveal_processing(spec, state, custody_key_reveal)
yield from run_custody_key_reveal_processing(spec, state, custody_key_reveal, False)
@with_all_phases_except([PHASE0])
@spec_state_test
@always_bls
def test_max_decrement(spec, state):
state.slot += spec.EPOCHS_PER_CUSTODY_PERIOD * spec.SLOTS_PER_EPOCH * 3 + 150
custody_key_reveal = get_valid_custody_key_reveal(spec, state)
_, _, _ = run_custody_key_reveal_processing(spec, state, custody_key_reveal)
custody_key_reveal2 = get_valid_custody_key_reveal(spec, state)
yield from run_custody_key_reveal_processing(spec, state, custody_key_reveal2)

View File

@ -118,7 +118,7 @@ def test_multiple_epochs_custody(spec, state):
@with_all_phases_except(['phase0'])
@spec_state_test
def test_many_epochs_custody(spec, state):
transition_to(spec, state, state.slot + spec.SLOTS_PER_EPOCH * 100)
transition_to(spec, state, state.slot + spec.SLOTS_PER_EPOCH * 20)
shard = 0
offset_slots = spec.get_offset_slots(state, shard)
shard_transition = get_shard_transition(spec, state.slot, [2**15 // 3] * len(offset_slots))

View File

@ -1,7 +1,7 @@
from eth2spec.test.helpers.custody import (
get_valid_custody_key_reveal,
)
from eth2spec.test.helpers.state import next_epoch
from eth2spec.test.helpers.state import transition_to
from eth2spec.test.context import (
with_all_phases_except,
spec_state_test,
@ -19,9 +19,12 @@ def run_process_challenge_deadlines(spec, state):
def test_validator_slashed_after_reveal_deadline(spec, state):
assert state.validators[0].slashed == 0
state.slot += ((spec.CHUNK_RESPONSE_DEADLINE + spec.EPOCHS_PER_CUSTODY_PERIOD)
* spec.SLOTS_PER_EPOCH)
next_epoch(spec, state)
transition_to(spec, state, spec.get_randao_epoch_for_custody_period(0, 0) * spec.SLOTS_PER_EPOCH)
transition_to(spec, state, state.slot + ((spec.CUSTODY_RESPONSE_DEADLINE)
* spec.SLOTS_PER_EPOCH))
state.validators[0].slashed = 0
yield from run_process_challenge_deadlines(spec, state)
@ -38,8 +41,8 @@ def test_validator_not_slashed_after_reveal(spec, state):
assert state.validators[0].slashed == 0
state.slot += spec.CHUNK_RESPONSE_DEADLINE * spec.SLOTS_PER_EPOCH
next_epoch(spec, state)
transition_to(spec, state, state.slot + ((spec.CUSTODY_RESPONSE_DEADLINE)
* spec.SLOTS_PER_EPOCH))
yield from run_process_challenge_deadlines(spec, state)