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

Merge pull request #1914 from ethereum/hwwhww/align_fork_name 

Align directory names of forks
This commit is contained in:
Danny Ryan 2020-06-18 09:30:02 -06:00 committed by GitHub
parent 6b3d391bfa ec25f78632
commit df330810d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
42 changed files with 64 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
tests/core/pyspec/eth2spec/test/phase_0/__init__.py → tests/core/pyspec/eth2spec/test/phase0/__init__.py
View File

0
tests/core/pyspec/eth2spec/test/phase_0/block_processing/__init__.py → tests/core/pyspec/eth2spec/test/phase0/block_processing/__init__.py
View File

0
tests/core/pyspec/eth2spec/test/phase_0/block_processing/test_process_attestation.py → tests/core/pyspec/eth2spec/test/phase0/block_processing/test_process_attestation.py
View File

0
tests/core/pyspec/eth2spec/test/phase_0/block_processing/test_process_attester_slashing.py → tests/core/pyspec/eth2spec/test/phase0/block_processing/test_process_attester_slashing.py
View File

0
tests/core/pyspec/eth2spec/test/phase_0/block_processing/test_process_block_header.py → tests/core/pyspec/eth2spec/test/phase0/block_processing/test_process_block_header.py
View File

0
tests/core/pyspec/eth2spec/test/phase_0/block_processing/test_process_deposit.py → tests/core/pyspec/eth2spec/test/phase0/block_processing/test_process_deposit.py
View File

0
tests/core/pyspec/eth2spec/test/phase_0/block_processing/test_process_proposer_slashing.py → tests/core/pyspec/eth2spec/test/phase0/block_processing/test_process_proposer_slashing.py
View File

0
tests/core/pyspec/eth2spec/test/phase_0/block_processing/test_process_voluntary_exit.py → tests/core/pyspec/eth2spec/test/phase0/block_processing/test_process_voluntary_exit.py
View File

0
tests/core/pyspec/eth2spec/test/phase_0/epoch_processing/__init__.py → tests/core/pyspec/eth2spec/test/phase0/epoch_processing/__init__.py
View File

0
tests/core/pyspec/eth2spec/test/phase_0/epoch_processing/run_epoch_process_base.py → tests/core/pyspec/eth2spec/test/phase0/epoch_processing/run_epoch_process_base.py
View File

2
tests/core/pyspec/eth2spec/test/phase_0/epoch_processing/test_process_final_updates.py → tests/core/pyspec/eth2spec/test/phase0/epoch_processing/test_process_final_updates.py
View File

@ -1,5 +1,5 @@
from eth2spec.test.context import spec_state_test, with_all_phases from eth2spec.test.context import spec_state_test, with_all_phases
from eth2spec.test.phase_0.epoch_processing.run_epoch_process_base import ( from eth2spec.test.phase0.epoch_processing.run_epoch_process_base import (
run_epoch_processing_with, run_epoch_processing_to run_epoch_processing_with, run_epoch_processing_to
) )
from eth2spec.test.helpers.state import transition_to from eth2spec.test.helpers.state import transition_to

2
tests/core/pyspec/eth2spec/test/phase_0/epoch_processing/test_process_justification_and_finalization.py → tests/core/pyspec/eth2spec/test/phase0/epoch_processing/test_process_justification_and_finalization.py
View File

@ -1,5 +1,5 @@
from eth2spec.test.context import spec_state_test, with_all_phases from eth2spec.test.context import spec_state_test, with_all_phases
from eth2spec.test.phase_0.epoch_processing.run_epoch_process_base import ( from eth2spec.test.phase0.epoch_processing.run_epoch_process_base import (
run_epoch_processing_with run_epoch_processing_with
) )
from eth2spec.test.helpers.state import transition_to from eth2spec.test.helpers.state import transition_to

2
tests/core/pyspec/eth2spec/test/phase_0/epoch_processing/test_process_registry_updates.py → tests/core/pyspec/eth2spec/test/phase0/epoch_processing/test_process_registry_updates.py
View File

@ -1,7 +1,7 @@
from eth2spec.test.helpers.deposits import mock_deposit from eth2spec.test.helpers.deposits import mock_deposit
from eth2spec.test.helpers.state import next_epoch, next_slots from eth2spec.test.helpers.state import next_epoch, next_slots
from eth2spec.test.context import spec_state_test, with_all_phases from eth2spec.test.context import spec_state_test, with_all_phases
from eth2spec.test.phase_0.epoch_processing.run_epoch_process_base import run_epoch_processing_with from eth2spec.test.phase0.epoch_processing.run_epoch_process_base import run_epoch_processing_with
def run_process_registry_updates(spec, state): def run_process_registry_updates(spec, state):

7
tests/core/pyspec/eth2spec/test/phase_0/epoch_processing/test_process_rewards_and_penalties.py → tests/core/pyspec/eth2spec/test/phase0/epoch_processing/test_process_rewards_and_penalties.py
View File

@ -1,4 +1,5 @@
from eth2spec.test.context import ( from eth2spec.test.context import (
PHASE0,
spec_state_test, spec_test, spec_state_test, spec_test,
with_all_phases, with_phases, single_phase, with_all_phases, with_phases, single_phase,
with_custom_state, with_custom_state,
@ -16,7 +17,7 @@ from eth2spec.test.helpers.attestations import (
) )
from eth2spec.test.helpers.rewards import leaking from eth2spec.test.helpers.rewards import leaking
from eth2spec.test.helpers.attester_slashings import get_indexed_attestation_participants from eth2spec.test.helpers.attester_slashings import get_indexed_attestation_participants
from eth2spec.test.phase_0.epoch_processing.run_epoch_process_base import run_epoch_processing_with from eth2spec.test.phase0.epoch_processing.run_epoch_process_base import run_epoch_processing_with
from random import Random from random import Random
@ -24,7 +25,7 @@ def run_process_rewards_and_penalties(spec, state):
yield from run_epoch_processing_with(spec, state, 'process_rewards_and_penalties') yield from run_epoch_processing_with(spec, state, 'process_rewards_and_penalties')
@with_phases(['phase0']) @with_phases([PHASE0])
@spec_state_test @spec_state_test
def test_genesis_epoch_no_attestations_no_penalties(spec, state): def test_genesis_epoch_no_attestations_no_penalties(spec, state):
pre_state = state.copy() pre_state = state.copy()
@ -37,7 +38,7 @@ def test_genesis_epoch_no_attestations_no_penalties(spec, state):
assert state.balances[index] == pre_state.balances[index] assert state.balances[index] == pre_state.balances[index]
@with_phases(['phase0']) @with_phases([PHASE0])
@spec_state_test @spec_state_test
def test_genesis_epoch_full_attestations_no_rewards(spec, state): def test_genesis_epoch_full_attestations_no_rewards(spec, state):
attestations = [] attestations = []

2
tests/core/pyspec/eth2spec/test/phase_0/epoch_processing/test_process_slashings.py → tests/core/pyspec/eth2spec/test/phase0/epoch_processing/test_process_slashings.py
View File

@ -1,5 +1,5 @@
from eth2spec.test.context import spec_state_test, with_all_phases from eth2spec.test.context import spec_state_test, with_all_phases
from eth2spec.test.phase_0.epoch_processing.run_epoch_process_base import ( from eth2spec.test.phase0.epoch_processing.run_epoch_process_base import (
run_epoch_processing_with, run_epoch_processing_to run_epoch_processing_with, run_epoch_processing_to
) )
from eth2spec.test.helpers.state import next_epoch from eth2spec.test.helpers.state import next_epoch

0
tests/core/pyspec/eth2spec/test/phase_0/rewards/__init__.py → tests/core/pyspec/eth2spec/test/phase0/rewards/__init__.py
View File

0
tests/core/pyspec/eth2spec/test/phase_0/rewards/test_basic.py → tests/core/pyspec/eth2spec/test/phase0/rewards/test_basic.py
View File

0
tests/core/pyspec/eth2spec/test/phase_0/rewards/test_leak.py → tests/core/pyspec/eth2spec/test/phase0/rewards/test_leak.py
View File

0
tests/core/pyspec/eth2spec/test/phase_0/rewards/test_random.py → tests/core/pyspec/eth2spec/test/phase0/rewards/test_random.py
View File

0
tests/core/pyspec/eth2spec/test/phase_0/sanity/__init__.py → tests/core/pyspec/eth2spec/test/phase0/sanity/__init__.py
View File

14
tests/core/pyspec/eth2spec/test/phase_0/sanity/test_blocks.py → tests/core/pyspec/eth2spec/test/phase0/sanity/test_blocks.py
View File

@ -21,8 +21,8 @@ from eth2spec.test.helpers.deposits import prepare_state_and_deposit
from eth2spec.test.helpers.shard_transitions import get_shard_transition_of_committee from eth2spec.test.helpers.shard_transitions import get_shard_transition_of_committee
from eth2spec.test.context import ( from eth2spec.test.context import (
PHASE0, PHASE1,
spec_state_test, with_all_phases, expect_assertion_error, always_bls, with_phases, spec_state_test, with_all_phases, expect_assertion_error, always_bls, with_phases,
PHASE1
) )
@ -113,7 +113,7 @@ def process_and_sign_block_without_header_validations(spec, state, block):
return sign_block(spec, state, block) return sign_block(spec, state, block)
@with_phases(['phase0']) @with_phases([PHASE0])
@spec_state_test @spec_state_test
def test_proposal_for_genesis_slot(spec, state): def test_proposal_for_genesis_slot(spec, state):
assert state.slot == spec.GENESIS_SLOT assert state.slot == spec.GENESIS_SLOT
@ -484,7 +484,7 @@ def test_duplicate_attester_slashing(spec, state):
# All AttesterSlashing tests should be adopted for Phase 1 but helper support is not yet there # All AttesterSlashing tests should be adopted for Phase 1 but helper support is not yet there
@with_phases(['phase0']) @with_phases([PHASE0])
@spec_state_test @spec_state_test
def test_multiple_attester_slashings_no_overlap(spec, state): def test_multiple_attester_slashings_no_overlap(spec, state):
# Skip test if config cannot handle multiple AttesterSlashings per block # Skip test if config cannot handle multiple AttesterSlashings per block
@ -525,7 +525,7 @@ def test_multiple_attester_slashings_no_overlap(spec, state):
check_attester_slashing_effect(spec, pre_state, state, full_indices) check_attester_slashing_effect(spec, pre_state, state, full_indices)
@with_phases(['phase0']) @with_phases([PHASE0])
@spec_state_test @spec_state_test
def test_multiple_attester_slashings_partial_overlap(spec, state): def test_multiple_attester_slashings_partial_overlap(spec, state):
# Skip test if config cannot handle multiple AttesterSlashings per block # Skip test if config cannot handle multiple AttesterSlashings per block
@ -740,7 +740,7 @@ def prepare_signed_exits(spec, state, indices):
# exceeding the minimal-config randao mixes memory size. # exceeding the minimal-config randao mixes memory size.
# Applies to all voluntary-exit sanity block tests. # Applies to all voluntary-exit sanity block tests.
@with_phases(['phase0']) @with_phases([PHASE0])
@spec_state_test @spec_state_test
def test_voluntary_exit(spec, state): def test_voluntary_exit(spec, state):
validator_index = spec.get_active_validator_indices(state, spec.get_current_epoch(state))[-1] validator_index = spec.get_active_validator_indices(state, spec.get_current_epoch(state))[-1]
@ -768,7 +768,7 @@ def test_voluntary_exit(spec, state):
assert state.validators[validator_index].exit_epoch < spec.FAR_FUTURE_EPOCH assert state.validators[validator_index].exit_epoch < spec.FAR_FUTURE_EPOCH
@with_phases(['phase0']) @with_phases([PHASE0])
@spec_state_test @spec_state_test
def test_double_validator_exit_same_block(spec, state): def test_double_validator_exit_same_block(spec, state):
validator_index = spec.get_active_validator_indices(state, spec.get_current_epoch(state))[-1] validator_index = spec.get_active_validator_indices(state, spec.get_current_epoch(state))[-1]
@ -789,7 +789,7 @@ def test_double_validator_exit_same_block(spec, state):
yield 'post', None yield 'post', None
@with_phases(['phase0']) @with_phases([PHASE0])
@spec_state_test @spec_state_test
def test_multiple_different_validator_exits_same_block(spec, state): def test_multiple_different_validator_exits_same_block(spec, state):
validator_indices = [ validator_indices = [

0
tests/core/pyspec/eth2spec/test/phase_0/sanity/test_slots.py → tests/core/pyspec/eth2spec/test/phase0/sanity/test_slots.py
View File

0
tests/core/pyspec/eth2spec/test/phase_1/__init__.py → tests/core/pyspec/eth2spec/test/phase1/__init__.py
View File

0
tests/core/pyspec/eth2spec/test/phase_1/block_processing/__init__.py → tests/core/pyspec/eth2spec/test/phase1/block_processing/__init__.py
View File

5
tests/core/pyspec/eth2spec/test/phase_1/block_processing/test_process_attestation.py → tests/core/pyspec/eth2spec/test/phase1/block_processing/test_process_attestation.py
View File

@ -1,4 +1,5 @@
from eth2spec.test.context import ( from eth2spec.test.context import (
PHASE0,
with_all_phases_except, with_all_phases_except,
spec_state_test, spec_state_test,
always_bls, always_bls,
@ -11,7 +12,7 @@ from eth2spec.test.helpers.attestations import (
) )
@with_all_phases_except(['phase0']) @with_all_phases_except([PHASE0])
@spec_state_test @spec_state_test
@always_bls @always_bls
def test_on_time_success(spec, state): def test_on_time_success(spec, state):
@ -22,7 +23,7 @@ def test_on_time_success(spec, state):
yield from run_attestation_processing(spec, state, attestation) yield from run_attestation_processing(spec, state, attestation)
@with_all_phases_except(['phase0']) @with_all_phases_except([PHASE0])
@spec_state_test @spec_state_test
@always_bls @always_bls
def test_late_success(spec, state): def test_late_success(spec, state):

23
tests/core/pyspec/eth2spec/test/phase_1/block_processing/test_process_chunk_challenge.py → tests/core/pyspec/eth2spec/test/phase1/block_processing/test_process_chunk_challenge.py
View File

@ -8,11 +8,12 @@ from eth2spec.test.helpers.attestations import (
) )
from eth2spec.test.helpers.state import transition_to from eth2spec.test.helpers.state import transition_to
from eth2spec.test.context import ( from eth2spec.test.context import (
PHASE0,
with_all_phases_except, with_all_phases_except,
spec_state_test, spec_state_test,
expect_assertion_error, expect_assertion_error,
) )
from eth2spec.test.phase_0.block_processing.test_process_attestation import run_attestation_processing from eth2spec.test.phase0.block_processing.test_process_attestation import run_attestation_processing
def run_chunk_challenge_processing(spec, state, custody_chunk_challenge, valid=True): def run_chunk_challenge_processing(spec, state, custody_chunk_challenge, valid=True):
@ -64,7 +65,7 @@ def run_custody_chunk_response_processing(spec, state, custody_response, valid=T
yield 'post', state yield 'post', state
@with_all_phases_except(['phase0']) @with_all_phases_except([PHASE0])
@spec_state_test @spec_state_test
def test_challenge_appended(spec, state): def test_challenge_appended(spec, state):
transition_to(spec, state, state.slot + 1) transition_to(spec, state, state.slot + 1)
@ -85,7 +86,7 @@ def test_challenge_appended(spec, state):
yield from run_chunk_challenge_processing(spec, state, challenge) yield from run_chunk_challenge_processing(spec, state, challenge)
@with_all_phases_except(['phase0']) @with_all_phases_except([PHASE0])
@spec_state_test @spec_state_test
def test_challenge_empty_element_replaced(spec, state): def test_challenge_empty_element_replaced(spec, state):
transition_to(spec, state, state.slot + 1) transition_to(spec, state, state.slot + 1)
@ -108,7 +109,7 @@ def test_challenge_empty_element_replaced(spec, state):
yield from run_chunk_challenge_processing(spec, state, challenge) yield from run_chunk_challenge_processing(spec, state, challenge)
@with_all_phases_except(['phase0']) @with_all_phases_except([PHASE0])
@spec_state_test @spec_state_test
def test_duplicate_challenge(spec, state): def test_duplicate_challenge(spec, state):
transition_to(spec, state, state.slot + 1) transition_to(spec, state, state.slot + 1)
@ -131,7 +132,7 @@ def test_duplicate_challenge(spec, state):
yield from run_chunk_challenge_processing(spec, state, challenge, valid=False) yield from run_chunk_challenge_processing(spec, state, challenge, valid=False)
@with_all_phases_except(['phase0']) @with_all_phases_except([PHASE0])
@spec_state_test @spec_state_test
def test_second_challenge(spec, state): def test_second_challenge(spec, state):
transition_to(spec, state, state.slot + 1) transition_to(spec, state, state.slot + 1)
@ -156,7 +157,7 @@ def test_second_challenge(spec, state):
yield from run_chunk_challenge_processing(spec, state, challenge1) yield from run_chunk_challenge_processing(spec, state, challenge1)
@with_all_phases_except(['phase0']) @with_all_phases_except([PHASE0])
@spec_state_test @spec_state_test
def test_multiple_epochs_custody(spec, state): def test_multiple_epochs_custody(spec, state):
transition_to(spec, state, state.slot + spec.SLOTS_PER_EPOCH * 3) transition_to(spec, state, state.slot + spec.SLOTS_PER_EPOCH * 3)
@ -178,7 +179,7 @@ def test_multiple_epochs_custody(spec, state):
yield from run_chunk_challenge_processing(spec, state, challenge) yield from run_chunk_challenge_processing(spec, state, challenge)
@with_all_phases_except(['phase0']) @with_all_phases_except([PHASE0])
@spec_state_test @spec_state_test
def test_many_epochs_custody(spec, state): def test_many_epochs_custody(spec, state):
transition_to(spec, state, state.slot + spec.SLOTS_PER_EPOCH * 20) transition_to(spec, state, state.slot + spec.SLOTS_PER_EPOCH * 20)
@ -200,7 +201,7 @@ def test_many_epochs_custody(spec, state):
yield from run_chunk_challenge_processing(spec, state, challenge) yield from run_chunk_challenge_processing(spec, state, challenge)
@with_all_phases_except(['phase0']) @with_all_phases_except([PHASE0])
@spec_state_test @spec_state_test
def test_off_chain_attestation(spec, state): def test_off_chain_attestation(spec, state):
transition_to(spec, state, state.slot + spec.SLOTS_PER_EPOCH) transition_to(spec, state, state.slot + spec.SLOTS_PER_EPOCH)
@ -218,7 +219,7 @@ def test_off_chain_attestation(spec, state):
yield from run_chunk_challenge_processing(spec, state, challenge) yield from run_chunk_challenge_processing(spec, state, challenge)
@with_all_phases_except(['phase0']) @with_all_phases_except([PHASE0])
@spec_state_test @spec_state_test
def test_custody_response(spec, state): def test_custody_response(spec, state):
transition_to(spec, state, state.slot + spec.SLOTS_PER_EPOCH) transition_to(spec, state, state.slot + spec.SLOTS_PER_EPOCH)
@ -246,7 +247,7 @@ def test_custody_response(spec, state):
yield from run_custody_chunk_response_processing(spec, state, custody_response) yield from run_custody_chunk_response_processing(spec, state, custody_response)
@with_all_phases_except(['phase0']) @with_all_phases_except([PHASE0])
@spec_state_test @spec_state_test
def test_custody_response_multiple_epochs(spec, state): def test_custody_response_multiple_epochs(spec, state):
transition_to(spec, state, state.slot + spec.SLOTS_PER_EPOCH * 3) transition_to(spec, state, state.slot + spec.SLOTS_PER_EPOCH * 3)
@ -274,7 +275,7 @@ def test_custody_response_multiple_epochs(spec, state):
yield from run_custody_chunk_response_processing(spec, state, custody_response) yield from run_custody_chunk_response_processing(spec, state, custody_response)
@with_all_phases_except(['phase0']) @with_all_phases_except([PHASE0])
@spec_state_test @spec_state_test
def test_custody_response_many_epochs(spec, state): def test_custody_response_many_epochs(spec, state):
transition_to(spec, state, state.slot + spec.SLOTS_PER_EPOCH * 20) transition_to(spec, state, state.slot + spec.SLOTS_PER_EPOCH * 20)

0
tests/core/pyspec/eth2spec/test/phase_1/block_processing/test_process_custody_key_reveal.py → tests/core/pyspec/eth2spec/test/phase1/block_processing/test_process_custody_key_reveal.py
View File

13
tests/core/pyspec/eth2spec/test/phase_1/block_processing/test_process_custody_slashing.py → tests/core/pyspec/eth2spec/test/phase1/block_processing/test_process_custody_slashing.py
View File

@ -9,11 +9,12 @@ from eth2spec.test.helpers.attestations import (
from eth2spec.utils.ssz.ssz_typing import ByteList from eth2spec.utils.ssz.ssz_typing import ByteList
from eth2spec.test.helpers.state import get_balance, transition_to from eth2spec.test.helpers.state import get_balance, transition_to
from eth2spec.test.context import ( from eth2spec.test.context import (
PHASE0,
with_all_phases_except, with_all_phases_except,
spec_state_test, spec_state_test,
expect_assertion_error, expect_assertion_error,
) )
from eth2spec.test.phase_0.block_processing.test_process_attestation import run_attestation_processing from eth2spec.test.phase0.block_processing.test_process_attestation import run_attestation_processing
def run_custody_slashing_processing(spec, state, custody_slashing, valid=True, correct=True): def run_custody_slashing_processing(spec, state, custody_slashing, valid=True, correct=True):
@ -102,31 +103,31 @@ def run_standard_custody_slashing_test(spec,
yield from run_custody_slashing_processing(spec, state, slashing, valid=valid, correct=correct) yield from run_custody_slashing_processing(spec, state, slashing, valid=valid, correct=correct)
@with_all_phases_except(['phase0']) @with_all_phases_except([PHASE0])
@spec_state_test @spec_state_test
def test_custody_slashing(spec, state): def test_custody_slashing(spec, state):
yield from run_standard_custody_slashing_test(spec, state) yield from run_standard_custody_slashing_test(spec, state)
@with_all_phases_except(['phase0']) @with_all_phases_except([PHASE0])
@spec_state_test @spec_state_test
def test_incorrect_custody_slashing(spec, state): def test_incorrect_custody_slashing(spec, state):
yield from run_standard_custody_slashing_test(spec, state, correct=False) yield from run_standard_custody_slashing_test(spec, state, correct=False)
@with_all_phases_except(['phase0']) @with_all_phases_except([PHASE0])
@spec_state_test @spec_state_test
def test_multiple_epochs_custody(spec, state): def test_multiple_epochs_custody(spec, state):
yield from run_standard_custody_slashing_test(spec, state, shard_lateness=spec.SLOTS_PER_EPOCH * 3) yield from run_standard_custody_slashing_test(spec, state, shard_lateness=spec.SLOTS_PER_EPOCH * 3)
@with_all_phases_except(['phase0']) @with_all_phases_except([PHASE0])
@spec_state_test @spec_state_test
def test_many_epochs_custody(spec, state): def test_many_epochs_custody(spec, state):
yield from run_standard_custody_slashing_test(spec, state, shard_lateness=spec.SLOTS_PER_EPOCH * 10) yield from run_standard_custody_slashing_test(spec, state, shard_lateness=spec.SLOTS_PER_EPOCH * 10)
@with_all_phases_except(['phase0']) @with_all_phases_except([PHASE0])
@spec_state_test @spec_state_test
def test_invalid_custody_slashing(spec, state): def test_invalid_custody_slashing(spec, state):
yield from run_standard_custody_slashing_test( yield from run_standard_custody_slashing_test(

0
tests/core/pyspec/eth2spec/test/phase_1/block_processing/test_process_early_derived_secret_reveal.py → tests/core/pyspec/eth2spec/test/phase1/block_processing/test_process_early_derived_secret_reveal.py
View File

0
tests/core/pyspec/eth2spec/test/phase_1/block_processing/test_process_shard_transition.py → tests/core/pyspec/eth2spec/test/phase1/block_processing/test_process_shard_transition.py
View File

9
tests/core/pyspec/eth2spec/test/phase_1/epoch_processing/test_process_challenge_deadlines.py → tests/core/pyspec/eth2spec/test/phase1/epoch_processing/test_process_challenge_deadlines.py
View File

@ -7,13 +7,14 @@ from eth2spec.test.helpers.attestations import (
) )
from eth2spec.test.helpers.state import transition_to from eth2spec.test.helpers.state import transition_to
from eth2spec.test.context import ( from eth2spec.test.context import (
PHASE0,
with_all_phases_except, with_all_phases_except,
spec_state_test, spec_state_test,
) )
from eth2spec.test.phase_0.block_processing.test_process_attestation import run_attestation_processing from eth2spec.test.phase0.block_processing.test_process_attestation import run_attestation_processing
from eth2spec.test.phase_0.epoch_processing.run_epoch_process_base import run_epoch_processing_with from eth2spec.test.phase0.epoch_processing.run_epoch_process_base import run_epoch_processing_with
from eth2spec.test.phase_1.block_processing.test_process_chunk_challenge import ( from eth2spec.test.phase1.block_processing.test_process_chunk_challenge import (
run_chunk_challenge_processing, run_chunk_challenge_processing,
) )
@ -22,7 +23,7 @@ def run_process_challenge_deadlines(spec, state):
yield from run_epoch_processing_with(spec, state, 'process_challenge_deadlines') yield from run_epoch_processing_with(spec, state, 'process_challenge_deadlines')
@with_all_phases_except(['phase0']) @with_all_phases_except([PHASE0])
@spec_state_test @spec_state_test
def test_validator_slashed_after_chunk_challenge(spec, state): def test_validator_slashed_after_chunk_challenge(spec, state):
transition_to(spec, state, state.slot + 1) transition_to(spec, state, state.slot + 1)

19
tests/core/pyspec/eth2spec/test/phase_1/epoch_processing/test_process_custody_final_updates.py → tests/core/pyspec/eth2spec/test/phase1/epoch_processing/test_process_custody_final_updates.py
View File

@ -1,3 +1,6 @@
from eth2spec.test.context import (
PHASE0,
)
from eth2spec.test.helpers.custody import ( from eth2spec.test.helpers.custody import (
get_valid_chunk_challenge, get_valid_chunk_challenge,
get_valid_custody_chunk_response, get_valid_custody_chunk_response,
@ -12,21 +15,21 @@ from eth2spec.test.context import (
with_all_phases_except, with_all_phases_except,
spec_state_test, spec_state_test,
) )
from eth2spec.test.phase_0.block_processing.test_process_attestation import run_attestation_processing from eth2spec.test.phase0.block_processing.test_process_attestation import run_attestation_processing
from eth2spec.test.phase_0.epoch_processing.run_epoch_process_base import run_epoch_processing_with from eth2spec.test.phase0.epoch_processing.run_epoch_process_base import run_epoch_processing_with
from eth2spec.test.phase_1.block_processing.test_process_chunk_challenge import ( from eth2spec.test.phase1.block_processing.test_process_chunk_challenge import (
run_chunk_challenge_processing, run_chunk_challenge_processing,
run_custody_chunk_response_processing, run_custody_chunk_response_processing,
) )
from eth2spec.test.phase_1.block_processing.test_process_custody_key_reveal import run_custody_key_reveal_processing from eth2spec.test.phase1.block_processing.test_process_custody_key_reveal import run_custody_key_reveal_processing
def run_process_custody_final_updates(spec, state): def run_process_custody_final_updates(spec, state):
yield from run_epoch_processing_with(spec, state, 'process_custody_final_updates') yield from run_epoch_processing_with(spec, state, 'process_custody_final_updates')
@with_all_phases_except(['phase0']) @with_all_phases_except([PHASE0])
@spec_state_test @spec_state_test
def test_validator_withdrawal_delay(spec, state): def test_validator_withdrawal_delay(spec, state):
spec.initiate_validator_exit(state, 0) spec.initiate_validator_exit(state, 0)
@ -37,7 +40,7 @@ def test_validator_withdrawal_delay(spec, state):
assert state.validators[0].withdrawable_epoch == spec.FAR_FUTURE_EPOCH assert state.validators[0].withdrawable_epoch == spec.FAR_FUTURE_EPOCH
@with_all_phases_except(['phase0']) @with_all_phases_except([PHASE0])
@spec_state_test @spec_state_test
def test_validator_withdrawal_reenable_after_custody_reveal(spec, state): def test_validator_withdrawal_reenable_after_custody_reveal(spec, state):
spec.initiate_validator_exit(state, 0) spec.initiate_validator_exit(state, 0)
@ -60,7 +63,7 @@ def test_validator_withdrawal_reenable_after_custody_reveal(spec, state):
assert state.validators[0].withdrawable_epoch < spec.FAR_FUTURE_EPOCH assert state.validators[0].withdrawable_epoch < spec.FAR_FUTURE_EPOCH
@with_all_phases_except(['phase0']) @with_all_phases_except([PHASE0])
@spec_state_test @spec_state_test
def test_validator_withdrawal_suspend_after_chunk_challenge(spec, state): def test_validator_withdrawal_suspend_after_chunk_challenge(spec, state):
transition_to(spec, state, state.slot + 1) transition_to(spec, state, state.slot + 1)
@ -108,7 +111,7 @@ def test_validator_withdrawal_suspend_after_chunk_challenge(spec, state):
assert state.validators[validator_index].withdrawable_epoch == spec.FAR_FUTURE_EPOCH assert state.validators[validator_index].withdrawable_epoch == spec.FAR_FUTURE_EPOCH
@with_all_phases_except(['phase0']) @with_all_phases_except([PHASE0])
@spec_state_test @spec_state_test
def test_validator_withdrawal_resume_after_chunk_challenge_response(spec, state): def test_validator_withdrawal_resume_after_chunk_challenge_response(spec, state):
transition_to(spec, state, state.slot + 1) transition_to(spec, state, state.slot + 1)

9
tests/core/pyspec/eth2spec/test/phase_1/epoch_processing/test_process_reveal_deadlines.py → tests/core/pyspec/eth2spec/test/phase1/epoch_processing/test_process_reveal_deadlines.py
View File

@ -3,18 +3,19 @@ from eth2spec.test.helpers.custody import (
) )
from eth2spec.test.helpers.state import transition_to from eth2spec.test.helpers.state import transition_to
from eth2spec.test.context import ( from eth2spec.test.context import (
PHASE0,
with_all_phases_except, with_all_phases_except,
spec_state_test, spec_state_test,
) )
from eth2spec.test.phase_0.epoch_processing.run_epoch_process_base import run_epoch_processing_with from eth2spec.test.phase0.epoch_processing.run_epoch_process_base import run_epoch_processing_with
from eth2spec.test.phase_1.block_processing.test_process_custody_key_reveal import run_custody_key_reveal_processing from eth2spec.test.phase1.block_processing.test_process_custody_key_reveal import run_custody_key_reveal_processing
def run_process_challenge_deadlines(spec, state): def run_process_challenge_deadlines(spec, state):
yield from run_epoch_processing_with(spec, state, 'process_challenge_deadlines') yield from run_epoch_processing_with(spec, state, 'process_challenge_deadlines')
@with_all_phases_except(['phase0']) @with_all_phases_except([PHASE0])
@spec_state_test @spec_state_test
def test_validator_slashed_after_reveal_deadline(spec, state): def test_validator_slashed_after_reveal_deadline(spec, state):
assert state.validators[0].slashed == 0 assert state.validators[0].slashed == 0
@ -33,7 +34,7 @@ def test_validator_slashed_after_reveal_deadline(spec, state):
assert state.validators[0].slashed == 1 assert state.validators[0].slashed == 1
@with_all_phases_except(['phase0']) @with_all_phases_except([PHASE0])
@spec_state_test @spec_state_test
def test_validator_not_slashed_after_reveal(spec, state): def test_validator_not_slashed_after_reveal(spec, state):
transition_to(spec, state, spec.EPOCHS_PER_CUSTODY_PERIOD * spec.SLOTS_PER_EPOCH) transition_to(spec, state, spec.EPOCHS_PER_CUSTODY_PERIOD * spec.SLOTS_PER_EPOCH)

0
tests/core/pyspec/eth2spec/test/phase_1/sanity/__init__.py → tests/core/pyspec/eth2spec/test/phase1/sanity/__init__.py
View File

0
tests/core/pyspec/eth2spec/test/phase_1/sanity/test_blocks.py → tests/core/pyspec/eth2spec/test/phase1/sanity/test_blocks.py
View File

0
tests/core/pyspec/eth2spec/test/phase_1/unittests/__init__.py → tests/core/pyspec/eth2spec/test/phase1/unittests/__init__.py
View File

0
tests/core/pyspec/eth2spec/test/phase_1/unittests/test_get_start_shard.py → tests/core/pyspec/eth2spec/test/phase1/unittests/test_get_start_shard.py
View File

4
tests/core/pyspec/eth2spec/test/test_finality.py
View File

@ -1,4 +1,4 @@
from eth2spec.test.context import spec_state_test, never_bls, with_all_phases, with_phases from eth2spec.test.context import PHASE0, spec_state_test, never_bls, with_all_phases, with_phases
from eth2spec.test.helpers.state import next_epoch_via_block from eth2spec.test.helpers.state import next_epoch_via_block
from eth2spec.test.helpers.attestations import next_epoch_with_attestations from eth2spec.test.helpers.attestations import next_epoch_with_attestations
@ -28,7 +28,7 @@ def check_finality(spec,
assert state.finalized_checkpoint == prev_state.finalized_checkpoint assert state.finalized_checkpoint == prev_state.finalized_checkpoint
@with_phases(["phase0"]) @with_phases([PHASE0])
@spec_state_test @spec_state_test
@never_bls @never_bls
def test_finality_no_updates_at_genesis(spec, state): def test_finality_no_updates_at_genesis(spec, state):

2
tests/generators/epoch_processing/main.py
View File

@ -2,7 +2,7 @@ from typing import Iterable
from eth2spec.phase0 import spec as spec_phase0 from eth2spec.phase0 import spec as spec_phase0
from eth2spec.phase1 import spec as spec_phase1 from eth2spec.phase1 import spec as spec_phase1
from eth2spec.test.phase_0.epoch_processing import ( from eth2spec.test.phase0.epoch_processing import (
test_process_final_updates, test_process_final_updates,
test_process_justification_and_finalization, test_process_justification_and_finalization,
test_process_registry_updates, test_process_registry_updates,

2
tests/generators/operations/main.py
View File

@ -1,6 +1,6 @@
from typing import Iterable from typing import Iterable
from eth2spec.test.phase_0.block_processing import ( from eth2spec.test.phase0.block_processing import (
test_process_attestation, test_process_attestation,
test_process_attester_slashing, test_process_attester_slashing,
test_process_block_header, test_process_block_header,

2
tests/generators/rewards/main.py
View File

@ -2,7 +2,7 @@ from typing import Iterable
from eth2spec.phase0 import spec as spec_phase0 from eth2spec.phase0 import spec as spec_phase0
from eth2spec.phase1 import spec as spec_phase1 from eth2spec.phase1 import spec as spec_phase1
from eth2spec.test.phase_0.rewards import ( from eth2spec.test.phase0.rewards import (
test_basic, test_basic,
test_leak, test_leak,
test_random, test_random,

2
tests/generators/sanity/main.py
View File

@ -5,7 +5,7 @@ from gen_base import gen_runner, gen_typing
from gen_from_tests.gen import generate_from_tests from gen_from_tests.gen import generate_from_tests
from eth2spec.test.context import PHASE0 from eth2spec.test.context import PHASE0
from eth2spec.test.phase_0.sanity import test_blocks, test_slots from eth2spec.test.phase0.sanity import test_blocks, test_slots
from eth2spec.config import config_util from eth2spec.config import config_util
from eth2spec.phase0 import spec as spec_phase0 from eth2spec.phase0 import spec as spec_phase0
from eth2spec.phase1 import spec as spec_phase1 from eth2spec.phase1 import spec as spec_phase1