merge tests updated to be in line with transition_store removal

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

@@ -128,8 +128,6 @@ def prepare_empty_pow_block(spec):
     return spec.PowBlock(
         block_hash=spec.Hash32(),
         parent_hash=spec.Hash32(),
-        is_processed=False,
-        is_valid=True,
         total_difficulty=uint256(0),
         difficulty=uint256(0)
     )

tests/core/pyspec/eth2spec/test/merge/block_processing/test_process_execution_payload.py

@@ -247,7 +247,7 @@ def test_bad_randao_first_payload(spec, state):
     # still valid because randao is ignored on this stage
     execution_payload.random = bad_randao
 
-    yield from run_execution_payload_processing(spec, state, execution_payload)
+    yield from run_execution_payload_processing(spec, state, execution_payload, valid=False)
 
 
 @with_merge_and_later

tests/core/pyspec/eth2spec/test/merge/fork_choice/test_terminal_validity.py

@@ -5,21 +5,21 @@ from eth2spec.test.helpers.block import (
 from eth2spec.test.context import spec_state_test, with_merge_and_later
 
 
-def create_transition_store(spec):
-    anchor_block = prepare_empty_pow_block(spec)
-    transition_store = spec.get_transition_store(anchor_block)
-    return transition_store
-
-
 class BlockNotFoundException(Exception):
     pass
 
 
-def run_process_merge_execution_payload(spec, transition_store, block, parent_block, payload,
+# Copy of conditional merge part of `on_block(store: Store, signed_block: SignedBeaconBlock)` handler
+def process_merge_execution_payload(spec, execution_payload):
+    pow_block = spec.get_pow_block(execution_payload.parent_hash)
+    pow_parent = spec.get_pow_block(pow_block.parent_hash)
+    assert spec.is_valid_terminal_pow_block(pow_block, pow_parent)
+
+
+def run_process_merge_execution_payload(spec, block, parent_block, payload,
                                         valid=True, block_lookup_success=True):
     """
     Run ``process_merge_execution_payload``, yielding:
-      - transition store ('transition_store')
       - current block ('block')
       - parent block ('parent_block')
       - execution payload ('payload')
@@ -27,7 +27,6 @@ def run_process_merge_execution_payload(spec, transition_store, block, parent_bl
     If ``block_lookup_success == False``, run expecting ``BlockNotFoundException``
     """
 
-    yield 'transition_store', transition_store
     yield 'block', block
     yield 'parent_block', parent_block
     yield 'payload', payload
@@ -46,7 +45,7 @@ def run_process_merge_execution_payload(spec, transition_store, block, parent_bl
     exception_caught = False
     block_not_found_exception_caught = False
     try:
-        spec.process_merge_execution_payload(transition_store, payload)
+        process_merge_execution_payload(spec, payload)
     except BlockNotFoundException:
         block_not_found_exception_caught = True
     except AssertionError:
@@ -68,109 +67,93 @@ def run_process_merge_execution_payload(spec, transition_store, block, parent_bl
 
 @with_merge_and_later
 @spec_state_test
-def test_valid_terminal_pow_block_success_valid_fail_invalid(spec, state):
+def test_valid_terminal_pow_block_success_valid(spec, state):
-    transition_store = create_transition_store(spec)
     parent_block = prepare_empty_pow_block(spec)
-    parent_block.total_difficulty = transition_store.terminal_total_difficulty - uint256(1)
+    parent_block.total_difficulty = spec.config.TERMINAL_TOTAL_DIFFICULTY - uint256(1)
     block = prepare_empty_pow_block(spec)
     block.parent_hash = parent_block.block_hash
-    block.total_difficulty = transition_store.terminal_total_difficulty
+    block.total_difficulty = spec.config.TERMINAL_TOTAL_DIFFICULTY
 
-    assert spec.is_valid_terminal_pow_block(transition_store, block, parent_block)
+    assert spec.is_valid_terminal_pow_block(block, parent_block)
-
-    block.is_valid = False
-    assert not spec.is_valid_terminal_pow_block(transition_store, block, parent_block)
 
 
 @with_merge_and_later
 @spec_state_test
 def test_valid_terminal_pow_block_fail_before_terminal(spec, state):
-    transition_store = create_transition_store(spec)
     parent_block = prepare_empty_pow_block(spec)
-    parent_block.total_difficulty = transition_store.terminal_total_difficulty - uint256(2)
+    parent_block.total_difficulty = spec.config.TERMINAL_TOTAL_DIFFICULTY - uint256(2)
     block = prepare_empty_pow_block(spec)
     block.parent_hash = parent_block.block_hash
-    block.total_difficulty = transition_store.terminal_total_difficulty - uint256(1)
+    block.total_difficulty = spec.config.TERMINAL_TOTAL_DIFFICULTY - uint256(1)
 
-    assert not spec.is_valid_terminal_pow_block(transition_store, block, parent_block)
+    assert not spec.is_valid_terminal_pow_block(block, parent_block)
 
 
 @with_merge_and_later
 @spec_state_test
 def test_valid_terminal_pow_block_fail_just_after_terminal(spec, state):
-    transition_store = create_transition_store(spec)
     parent_block = prepare_empty_pow_block(spec)
-    parent_block.total_difficulty = transition_store.terminal_total_difficulty
+    parent_block.total_difficulty = spec.config.TERMINAL_TOTAL_DIFFICULTY
     block = prepare_empty_pow_block(spec)
     block.parent_hash = parent_block.block_hash
-    block.total_difficulty = transition_store.terminal_total_difficulty + uint256(1)
+    block.total_difficulty = spec.config.TERMINAL_TOTAL_DIFFICULTY + uint256(1)
 
-    assert not spec.is_valid_terminal_pow_block(transition_store, block, parent_block)
+    assert not spec.is_valid_terminal_pow_block(block, parent_block)
 
 
 @with_merge_and_later
 @spec_state_test
 def test_process_merge_execution_payload_success(spec, state):
-    transition_store = create_transition_store(spec)
     parent_block = prepare_empty_pow_block(spec)
     parent_block.block_hash = spec.Hash32(spec.hash(b'01'))
-    parent_block.total_difficulty = transition_store.terminal_total_difficulty - uint256(1)
+    parent_block.total_difficulty = spec.config.TERMINAL_TOTAL_DIFFICULTY - uint256(1)
     block = prepare_empty_pow_block(spec)
     block.parent_hash = parent_block.block_hash
-    block.is_processed = True
+    block.total_difficulty = spec.config.TERMINAL_TOTAL_DIFFICULTY
-    block.total_difficulty = transition_store.terminal_total_difficulty
     payload = spec.ExecutionPayload()
     payload.parent_hash = block.block_hash
-    yield from run_process_merge_execution_payload(spec, transition_store, block, parent_block, payload)
+    yield from run_process_merge_execution_payload(spec, block, parent_block, payload)
-    block.is_processed = False
-    yield from run_process_merge_execution_payload(spec, transition_store, block, parent_block, payload, valid=False)
 
 
 @with_merge_and_later
 @spec_state_test
 def test_process_merge_execution_payload_fail_block_lookup(spec, state):
-    transition_store = create_transition_store(spec)
     parent_block = prepare_empty_pow_block(spec)
     parent_block.block_hash = spec.Hash32(spec.hash(b'01'))
-    parent_block.total_difficulty = transition_store.terminal_total_difficulty - uint256(1)
+    parent_block.total_difficulty = spec.config.TERMINAL_TOTAL_DIFFICULTY - uint256(1)
     block = prepare_empty_pow_block(spec)
     block.parent_hash = parent_block.block_hash
-    block.is_processed = True
+    block.total_difficulty = spec.config.TERMINAL_TOTAL_DIFFICULTY
-    block.total_difficulty = transition_store.terminal_total_difficulty
     payload = spec.ExecutionPayload()
     payload.parent_hash = spec.Hash32(spec.hash(b'02'))
-    yield from run_process_merge_execution_payload(spec, transition_store, block, parent_block, payload,
+    yield from run_process_merge_execution_payload(spec, block, parent_block, payload,
                                                    block_lookup_success=False)
 
 
 @with_merge_and_later
 @spec_state_test
 def test_process_merge_execution_payload_fail_parent_block_lookup(spec, state):
-    transition_store = create_transition_store(spec)
     parent_block = prepare_empty_pow_block(spec)
     parent_block.block_hash = spec.Hash32(spec.hash(b'01'))
-    parent_block.total_difficulty = transition_store.terminal_total_difficulty - uint256(1)
+    parent_block.total_difficulty = spec.config.TERMINAL_TOTAL_DIFFICULTY - uint256(1)
     block = prepare_empty_pow_block(spec)
     block.parent_hash = spec.Hash32(spec.hash(b'00'))
-    block.is_processed = True
+    block.total_difficulty = spec.config.TERMINAL_TOTAL_DIFFICULTY
-    block.total_difficulty = transition_store.terminal_total_difficulty
     payload = spec.ExecutionPayload()
     payload.parent_hash = block.block_hash
-    yield from run_process_merge_execution_payload(spec, transition_store, block, parent_block, payload,
+    yield from run_process_merge_execution_payload(spec, block, parent_block, payload,
                                                    block_lookup_success=False)
 
 
 @with_merge_and_later
 @spec_state_test
 def test_process_merge_execution_payload_fail_after_terminal(spec, state):
-    transition_store = create_transition_store(spec)
     parent_block = prepare_empty_pow_block(spec)
     parent_block.block_hash = spec.Hash32(spec.hash(b'01'))
-    parent_block.total_difficulty = transition_store.terminal_total_difficulty
+    parent_block.total_difficulty = spec.config.TERMINAL_TOTAL_DIFFICULTY
     block = prepare_empty_pow_block(spec)
     block.parent_hash = parent_block.block_hash
-    block.is_processed = True
+    block.total_difficulty = spec.config.TERMINAL_TOTAL_DIFFICULTY + 1
-    block.total_difficulty = transition_store.terminal_total_difficulty + 1
     payload = spec.ExecutionPayload()
     payload.parent_hash = block.block_hash
-    yield from run_process_merge_execution_payload(spec, transition_store, block, parent_block, payload, valid=False)
+    yield from run_process_merge_execution_payload(spec, block, parent_block, payload, valid=False)

tests/core/pyspec/eth2spec/test/merge/unit/test_unit.py

@@ -1,12 +1,8 @@
-from eth2spec.utils.ssz.ssz_typing import uint256
 from eth2spec.test.helpers.execution_payload import (
     build_empty_execution_payload,
     build_state_with_incomplete_transition,
     build_state_with_complete_transition,
 )
-from eth2spec.test.helpers.block import (
-    prepare_empty_pow_block
-)
 from eth2spec.test.context import spec_state_test, with_merge_and_later
 
 
@@ -102,21 +98,3 @@ def test_success_execution_enabled_true_true(spec, state):
     body = spec.BeaconBlockBody()
     body.execution_payload = execution_payload
     assert spec.is_execution_enabled(state, body)
-
-
-def compute_terminal_total_difficulty_reference(spec) -> uint256:
-    seconds_per_voting_period = spec.EPOCHS_PER_ETH1_VOTING_PERIOD * spec.SLOTS_PER_EPOCH * spec.config.SECONDS_PER_SLOT
-    pow_blocks_per_voting_period = seconds_per_voting_period // spec.config.SECONDS_PER_ETH1_BLOCK
-    pow_blocks_to_merge = spec.TARGET_SECONDS_TO_MERGE // spec.config.SECONDS_PER_ETH1_BLOCK
-    pow_blocks_after_anchor_block = spec.config.ETH1_FOLLOW_DISTANCE + pow_blocks_per_voting_period +\
-        pow_blocks_to_merge
-    return spec.config.MIN_ANCHOR_POW_BLOCK_DIFFICULTY * uint256(pow_blocks_after_anchor_block)
-
-
-@with_merge_and_later
-@spec_state_test
-def test_zero_difficulty(spec, state):
-    anchor_pow_block = prepare_empty_pow_block(spec)
-    reference_td = compute_terminal_total_difficulty_reference(spec)
-
-    assert spec.compute_terminal_total_difficulty(anchor_pow_block) == reference_td