Fix tests to ensure merge functions do not need to be modified (#4718)

This PR removes the legacy merge transition functions
`is_merge_transition_complete` and `validate_merge_block` from the Gloas
specification. Updated test helpers to conditionally skip merge transition
assertions for post-Gloas forks

Fixes #4684

Author: AbolareRoheemah

specs/gloas/beacon-chain.md

@@ -68,8 +68,6 @@
         - [New `process_payload_attestation`](#new-process_payload_attestation)
       - [Proposer Slashing](#proposer-slashing)
         - [Modified `process_proposer_slashing`](#modified-process_proposer_slashing)
-    - [Modified `is_merge_transition_complete`](#modified-is_merge_transition_complete)
-    - [Modified `validate_merge_block`](#modified-validate_merge_block)
   - [Execution payload processing](#execution-payload-processing)
     - [New `verify_execution_payload_envelope_signature`](#new-verify_execution_payload_envelope_signature)
     - [New `process_execution_payload`](#new-process_execution_payload)
@@ -1203,53 +1201,6 @@ def process_proposer_slashing(state: BeaconState, proposer_slashing: ProposerSla
     slash_validator(state, header_1.proposer_index)
 ```
 
-#### Modified `is_merge_transition_complete`
-
-*Note*: `is_merge_transition_complete` is modified only for testing purposes to
-add the blob kzg commitments root for an empty list
-
-```python
-def is_merge_transition_complete(state: BeaconState) -> bool:
-    bid = ExecutionPayloadBid()
-    kzgs = List[KZGCommitment, MAX_BLOB_COMMITMENTS_PER_BLOCK]()
-    bid.blob_kzg_commitments_root = kzgs.hash_tree_root()
-
-    return state.latest_execution_payload_bid != bid
-```
-
-#### Modified `validate_merge_block`
-
-*Note*: `validate_merge_block` is modified to use the new
-`signed_execution_payload_bid` field in the `BeaconBlockBody`.
-
-```python
-def validate_merge_block(block: BeaconBlock) -> None:
-    """
-    Check the parent PoW block of execution payload is a valid terminal PoW block.
-
-    Note: Unavailable PoW block(s) may later become available,
-    and a client software MAY delay a call to ``validate_merge_block``
-    until the PoW block(s) become available.
-    """
-    if TERMINAL_BLOCK_HASH != Hash32():
-        # If `TERMINAL_BLOCK_HASH` is used as an override, the activation epoch must be reached.
-        assert compute_epoch_at_slot(block.slot) >= TERMINAL_BLOCK_HASH_ACTIVATION_EPOCH
-        assert (
-            block.body.signed_execution_payload_bid.message.parent_block_hash == TERMINAL_BLOCK_HASH
-        )
-        return
-
-    # [Modified in Gloas:EIP7732]
-    pow_block = get_pow_block(block.body.signed_execution_payload_bid.message.parent_block_hash)
-    # Check if `pow_block` is available
-    assert pow_block is not None
-    pow_parent = get_pow_block(pow_block.parent_hash)
-    # Check if `pow_parent` is available
-    assert pow_parent is not None
-    # Check if `pow_block` is a valid terminal PoW block
-    assert is_valid_terminal_pow_block(pow_block, pow_parent)
-```
-
 ### Execution payload processing
 
 #### New `verify_execution_payload_envelope_signature`

tests/core/pyspec/eth2spec/test/bellatrix/unittests/test_transition.py

@@ -1,11 +1,6 @@
 from eth2spec.test.context import (
     spec_state_test,
-    with_all_phases_from_to,
-    with_bellatrix_and_later,
-)
-from eth2spec.test.helpers.constants import (
-    BELLATRIX,
-    GLOAS,
+    with_bellatrix_only,
 )
 from eth2spec.test.helpers.execution_payload import (
     build_empty_execution_payload,
@@ -14,14 +9,14 @@
 )
 
 
-@with_bellatrix_and_later
+@with_bellatrix_only
 @spec_state_test
 def test_fail_merge_complete(spec, state):
     state = build_state_with_incomplete_transition(spec, state)
     assert not spec.is_merge_transition_complete(state)
 
 
-@with_bellatrix_and_later
+@with_bellatrix_only
 @spec_state_test
 def test_success_merge_complete(spec, state):
     state = build_state_with_complete_transition(spec, state)
@@ -37,7 +32,7 @@ def test_success_merge_complete(spec, state):
 ]
 
 
-@with_all_phases_from_to(BELLATRIX, GLOAS)
+@with_bellatrix_only
 @spec_state_test
 def test_is_merge_block_and_is_execution_enabled(spec, state):
     for result in expected_results:

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

@@ -444,8 +444,7 @@ def build_state_with_incomplete_transition(spec, state):
     else:
         header = spec.ExecutionPayloadHeader()
         state = build_state_with_execution_payload_header(spec, state, header)
-
-    assert not spec.is_merge_transition_complete(state)
+        assert not spec.is_merge_transition_complete(state)
 
     return state
 
@@ -458,8 +457,7 @@ def build_state_with_complete_transition(spec, state):
     else:
         payload_header = get_execution_payload_header(spec, state, pre_state_payload)
         state = build_state_with_execution_payload_header(spec, state, payload_header)
-
-    assert spec.is_merge_transition_complete(state)
+        assert spec.is_merge_transition_complete(state)
 
     return state