fix tests

tests/core/pyspec/eth2spec/test/helpers/attestations.py

@@ -85,9 +85,7 @@ def build_attestation_data(spec, state, slot, index, shard_transition=None, on_t
             # No shard transition -> no shard block
             shard = spec.get_shard(state, spec.Attestation(data=attestation_data))
             if on_time:
-                temp_state = state.copy()
-                next_slot(spec, temp_state)
-                shard_transition = spec.get_shard_transition(temp_state, shard, shard_blocks=[])
+                shard_transition = spec.get_shard_transition(state, shard, shard_blocks=[])
                 lastest_shard_data_root_index = len(shard_transition.shard_data_roots) - 1
                 attestation_data.shard_head_root = shard_transition.shard_data_roots[lastest_shard_data_root_index]
                 attestation_data.shard_transition_root = shard_transition.hash_tree_root()

tests/core/pyspec/eth2spec/test/helpers/shard_block.py

@@ -1,6 +1,5 @@
 from eth2spec.test.helpers.attestations import get_valid_on_time_attestation
 from eth2spec.test.helpers.block import get_state_and_beacon_parent_root_at_slot
-from eth2spec.test.helpers.state import transition_to
 from eth2spec.test.helpers.keys import privkeys
 from eth2spec.utils import bls
 from eth2spec.utils.bls import only_with_bls
@@ -53,14 +52,13 @@ def build_shard_block(spec,
 
 
 def build_shard_transitions_till_slot(spec, state, shard_blocks, on_time_slot):
-    temp_state = state.copy()
-    transition_to(spec, temp_state, on_time_slot)
     shard_transitions = [spec.ShardTransition()] * spec.MAX_SHARDS
     for shard, blocks in shard_blocks.items():
-        offset_slots = spec.get_offset_slots(temp_state, shard)
+        offset_slots = spec.compute_offset_slots(spec.get_latest_slot_for_shard(state, shard), on_time_slot)
         len_offset_slots = len(offset_slots)
+        # TODO this is actually unsafe for long offset_slots
         assert len_offset_slots == on_time_slot - state.shard_states[shard].slot - 1
-        shard_transition = spec.get_shard_transition(temp_state, shard, blocks)
+        shard_transition = spec.get_shard_transition(state, shard, blocks)
         if len(blocks) > 0:
             shard_block_root = blocks[-1].message.hash_tree_root()
             assert shard_transition.shard_states[len_offset_slots - 1].latest_block_root == shard_block_root
@@ -71,16 +69,13 @@ def build_shard_transitions_till_slot(spec, state, shard_blocks, on_time_slot):
 
 
 def build_attestation_with_shard_transition(spec, state, index, on_time_slot, shard_transition):
-    temp_state = state.copy()
-    transition_to(spec, temp_state, on_time_slot - 1)
     attestation = get_valid_on_time_attestation(
         spec,
-        temp_state,
+        state,
         index=index,
         shard_transition=shard_transition,
         signed=True,
     )
-    assert attestation.data.slot == temp_state.slot
     if shard_transition is not None:
         assert attestation.data.shard_transition_root == shard_transition.hash_tree_root()
     return attestation

tests/core/pyspec/eth2spec/test/helpers/shard_transitions.py

@@ -1,5 +1,4 @@
 from eth2spec.test.context import expect_assertion_error
-from eth2spec.test.helpers.state import transition_to
 
 
 def run_shard_transitions_processing(spec, state, shard_transitions, attestations, valid=True):
@@ -37,7 +36,5 @@ def get_shard_transition_of_committee(spec, state, committee_index, slot=None, s
         slot = state.slot
 
     shard = spec.compute_shard_from_committee_index(state, committee_index, state.slot)
-    temp_state = state.copy()
-    transition_to(spec, temp_state, slot + 1)
-    shard_transition = spec.get_shard_transition(temp_state, shard, shard_blocks=shard_blocks)
+    shard_transition = spec.get_shard_transition(state, shard, shard_blocks=shard_blocks)
     return shard_transition

tests/core/pyspec/eth2spec/test/phase_1/block_processing/test_process_shard_transition.py

@@ -17,19 +17,23 @@ def run_basic_crosslink_tests(spec, state, target_len_offset_slot, valid=True):
     state = transition_to_valid_shard_slot(spec, state)
     init_slot = state.slot
     committee_index = spec.CommitteeIndex(0)
-    shard = spec.compute_shard_from_committee_index(state, committee_index, state.slot + target_len_offset_slot - 1)
-    assert state.shard_states[shard].slot == state.slot - 1
+    shard_slot = state.slot + target_len_offset_slot - 1
+    shard = spec.compute_shard_from_committee_index(state, committee_index, shard_slot)
+    assert state.shard_states[shard].slot == init_slot - 1
 
     # Create SignedShardBlock
     body = b'\x56' * spec.MAX_SHARD_BLOCK_SIZE
     shard_block = build_shard_block(spec, state, shard, body=body, signed=True)
     shard_blocks = [shard_block]
+
+    # Transition state latest shard slot
+    transition_to(spec, state, shard_slot)
     # Create a shard_transitions that would be included at beacon block `state.slot + target_len_offset_slot`
     shard_transitions = build_shard_transitions_till_slot(
         spec,
         state,
         shard_blocks={shard: shard_blocks},
-        on_time_slot=state.slot + target_len_offset_slot,
+        on_time_slot=init_slot + target_len_offset_slot,
     )
     shard_transition = shard_transitions[shard]
     # Create an attestation that would be included at beacon block `state.slot + target_len_offset_slot`
@@ -37,12 +41,12 @@ def run_basic_crosslink_tests(spec, state, target_len_offset_slot, valid=True):
         spec,
         state,
         index=committee_index,
-        on_time_slot=state.slot + target_len_offset_slot,
+        on_time_slot=init_slot + target_len_offset_slot,
         shard_transition=shard_transition,
     )
     pre_gasprice = state.shard_states[shard].gasprice
 
-    transition_to(spec, state, state.slot + target_len_offset_slot)
+    transition_to(spec, state, init_slot + target_len_offset_slot)
     pre_shard_state = state.shard_states[shard]
 
     yield from run_shard_transitions_processing(spec, state, shard_transitions, [attestation], valid=valid)