Get rid of state_transition.py

test_libs/pyspec/eth2spec/phase0/state_transition.py

@@ -1,47 +0,0 @@
-from . import spec
-
-
-from typing import (
-    Any,
-    Callable,
-    List
-)
-
-from .spec import (
-    BeaconState,
-    BeaconBlock,
-    Slot,
-)
-
-
-def process_block(state: BeaconState, block: BeaconBlock, verify_state_root) -> None:
-    spec.process_block_header(state, block)
-    spec.process_randao(state, block)
-    spec.process_eth1_data(state, block)
-    spec.process_operations(state, block.body)
-    if verify_state_root:
-        spec.verify_block_state_root(state, block)
-
-
-def process_epoch_transition(state: BeaconState) -> None:
-    spec.process_justification_and_finalization(state)
-    spec.process_crosslinks(state)
-    spec.process_rewards_and_penalties(state)
-    spec.process_registry_updates(state)
-    spec.process_slashings(state)
-    spec.process_final_updates(state)
-
-
-def state_transition_to(state: BeaconState, up_to: Slot) -> BeaconState:
-    while state.slot < up_to:
-        spec.cache_state(state)
-        if (state.slot + 1) % spec.SLOTS_PER_EPOCH == 0:
-            process_epoch_transition(state)
-        spec.advance_slot(state)
-
-
-def state_transition(state: BeaconState,
-                     block: BeaconBlock,
-                     verify_state_root: bool=False) -> BeaconState:
-    state_transition_to(state, block.slot)
-    process_block(state, block, verify_state_root)

test_libs/pyspec/tests/block_processing/test_process_attestation.py

@@ -3,13 +3,11 @@ import pytest
 
 import eth2spec.phase0.spec as spec
 
-from eth2spec.phase0.state_transition import (
-    state_transition,
-)
 from eth2spec.phase0.spec import (
     get_current_epoch,
     process_attestation,
     slot_to_epoch,
+    state_transition,
 )
 from tests.helpers import (
     build_empty_block_for_next_slot,

test_libs/pyspec/tests/block_processing/test_process_block_header.py

@@ -5,10 +5,10 @@ import pytest
 from eth2spec.phase0.spec import (
     get_beacon_proposer_index,
     cache_state,
-    advance_slot,
     process_block_header,
 )
 from tests.helpers import (
+    advance_slot,
     build_empty_block_for_next_slot,
     next_slot,
 )

test_libs/pyspec/tests/epoch_processing/test_process_crosslinks.py

@@ -3,13 +3,11 @@ import pytest
 
 import eth2spec.phase0.spec as spec
 
-from eth2spec.phase0.state_transition import (
-    state_transition,
-)
 from eth2spec.phase0.spec import (
     cache_state,
     get_crosslink_deltas,
     process_crosslinks,
+    state_transition,
 )
 from tests.helpers import (
     add_attestation_to_state,

test_libs/pyspec/tests/helpers.py

@@ -2,9 +2,6 @@ from copy import deepcopy
 
 from py_ecc import bls
 
-from eth2spec.phase0.state_transition import (
-    state_transition,
-)
 import eth2spec.phase0.spec as spec
 from eth2spec.utils.minimal_ssz import signing_root
 from eth2spec.phase0.spec import (
@@ -38,6 +35,7 @@ from eth2spec.phase0.spec import (
     get_shard_delta,
     hash_tree_root,
     slot_to_epoch,
+    state_transition,
     verify_merkle_branch,
     hash,
 )
@@ -53,6 +51,10 @@ pubkeys = [bls.privtopub(privkey) for privkey in privkeys]
 pubkey_to_privkey = {pubkey: privkey for privkey, pubkey in zip(privkeys, pubkeys)}
 
 
+def advance_slot(state) -> None:
+    state.slot += 1
+
+
 def get_balance(state, index):
     return state.balances[index]
 

test_libs/pyspec/tests/test_finality.py

@@ -4,9 +4,6 @@ import pytest
 
 import eth2spec.phase0.spec as spec
 
-from eth2spec.phase0.state_transition import (
-    state_transition,
-)
 from .helpers import (
     build_empty_block_for_next_slot,
     fill_aggregate_attestation,
@@ -67,7 +64,7 @@ def next_epoch_with_attestations(state,
             fill_aggregate_attestation(post_state, prev_attestation)
             block.body.attestations.append(prev_attestation)
 
-        state_transition(post_state, block)
+        spec.state_transition(post_state, block)
         blocks.append(block)
 
     return state, blocks, post_state

test_libs/pyspec/tests/test_sanity.py

@@ -20,13 +20,10 @@ from eth2spec.phase0.spec import (
     get_state_root,
     get_current_epoch,
     get_domain,
-    advance_slot,
     cache_state,
     verify_merkle_branch,
-    hash,
-)
-from eth2spec.phase0.state_transition import (
     state_transition,
+    hash,
 )
 from eth2spec.utils.merkle_minimal import (
     calc_merkle_tree_from_leaves,
@@ -34,6 +31,7 @@ from eth2spec.utils.merkle_minimal import (
     get_merkle_root,
 )
 from .helpers import (
+    advance_slot,
     get_balance,
     build_deposit_data,
     build_empty_block_for_next_slot,