fix previous forks tests

Author: potuz

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

@@ -292,7 +292,7 @@ def add_attester_slashing(spec, store, attester_slashing, test_steps, valid=True
 
 def get_formatted_head_output(spec, store):
     head = spec.get_head(store)
-    if is_post_eip7732:
+    if is_post_eip7732(spec):
         return {
             'slot': int(head.slot),
             'root': encode_hex(head.root),
@@ -404,7 +404,6 @@ def find_next_justifying_slot(spec,
     signed_blocks = []
     justifying_slot = None
     while justifying_slot is None:
-        previous_header_root = temp_state.latest_block_header.hash_tree_root()
         signed_block = state_transition_with_full_block(
             spec,
             temp_state,

tests/core/pyspec/eth2spec/test/phase0/fork_choice/test_ex_ante.py

@@ -34,7 +34,7 @@ def _apply_base_block_a(spec, state, store, test_steps):
     payload_state_transition(spec, store, signed_block_a.message)
     head = spec.get_head(store)
     expected_root = signed_block_a.message.hash_tree_root()
-    if is_post_eip7732:
+    if is_post_eip7732(spec):
         assert head.root == expected_root
     else:
         check_head_against_root(spec, store, signed_block_a.message.hash_tree_root())

tests/core/pyspec/eth2spec/test/phase0/fork_choice/test_get_head.py

@@ -1,6 +1,4 @@
 import random
-
-from eth_utils import encode_hex
 from eth2spec.test.context import (
     spec_state_test,
     with_altair_and_later,
@@ -124,7 +122,6 @@ def test_split_tie_breaker_no_attestations(spec, state):
     on_tick_and_append_step(spec, store, time, test_steps)
 
     yield from add_block(spec, store, signed_block_1, test_steps)
-    post_state_1 = state.copy()
     payload_state_transition(spec, store, signed_block_1.message)
     yield from add_block(spec, store, signed_block_2, test_steps)
     payload_state_transition(spec, store, signed_block_2.message)
@@ -259,6 +256,7 @@ def test_filtered_block_tree(spec, state):
 
     yield 'steps', test_steps
 
+
 # This test is skipped in EIP-7732 because the block's slot decides first on weight ties
 @with_altair_until_eip7732
 @spec_state_test

tests/core/pyspec/eth2spec/test/phase0/fork_choice/test_reorg.py

@@ -1,4 +1,3 @@
-from eth_utils import encode_hex
 from eth2spec.test.context import (
     spec_state_test,
     with_altair_and_later,
@@ -397,9 +396,10 @@ def _run_include_votes_of_another_empty_chain(spec, state, enough_ffg, is_justif
         ):
             block.body.attestations = attestations_for_y.pop(0)
         signed_block_z = state_transition_and_sign_block(spec, state, block)
+        payload_state_transition_no_store(spec, state, block)
         if signed_block_y != signed_block_z:
             yield from tick_and_add_block(spec, store, signed_block_z, test_steps)
-            state = payload_state_transition(spec, store, signed_block_z.message).copy()
+            payload_state_transition(spec, store, signed_block_z.message)
         if is_ready_to_justify(spec, state):
             break
 

tests/core/pyspec/eth2spec/test/phase0/fork_choice/test_withholding.py

@@ -1,4 +1,3 @@
-from eth_utils import encode_hex
 from eth2spec.test.context import (
     spec_state_test,
     with_altair_and_later,

tests/core/pyspec/eth2spec/test/phase0/unittests/fork_choice/test_on_attestation.py

@@ -20,7 +20,7 @@ def run_on_attestation(spec, state, store, attestation, valid=True):
     spec.on_attestation(store, attestation)
 
     sample_index = indexed_attestation.attesting_indices[0]
-    if is_post_eip7732:
+    if is_post_eip7732(spec):
         latest_message = spec.LatestMessage(
             slot=attestation.data.slot,
             root=attestation.data.beacon_block_root,