fix lint

Author: fradamt

specs/electra/beacon-chain.md

@@ -337,7 +337,8 @@ class ExecutionPayload(Container):
     deposit_receipts: List[DepositReceipt, MAX_DEPOSIT_RECEIPTS_PER_PAYLOAD]  # [New in Electra:EIP6110]
     # [New in Electra:EIP7002:EIP7251]
     withdrawal_requests: List[ExecutionLayerWithdrawalRequest, MAX_WITHDRAWAL_REQUESTS_PER_PAYLOAD]
-    consolidation_requests: List[ExecutionLayerConsolidationRequest, MAX_CONSOLIDATION_REQUESTS_PER_PAYLOAD]  # [New in Electra:EIP7251]
+    # [New in Electra:EIP7251]
+    consolidation_requests: List[ExecutionLayerConsolidationRequest, MAX_CONSOLIDATION_REQUESTS_PER_PAYLOAD]
 ```
 
 #### `ExecutionPayloadHeader`
@@ -365,7 +366,7 @@ class ExecutionPayloadHeader(Container):
     excess_blob_gas: uint64
     deposit_receipts_root: Root  # [New in Electra:EIP6110]
     withdrawal_requests_root: Root  # [New in Electra:EIP7002:EIP7251]
-    consolidation_requests_root: Root # [New in Electra:EIP7251]
+    consolidation_requests_root: Root  # [New in Electra:EIP7251]
 ```
 
 #### `BeaconState`
@@ -1037,7 +1038,8 @@ def process_operations(state: BeaconState, body: BeaconBlockBody) -> None:
     # [New in Electra:EIP7002:EIP7251]
     for_ops(body.execution_payload.withdrawal_requests, process_execution_layer_withdrawal_request)
     for_ops(body.execution_payload.deposit_receipts, process_deposit_receipt)  # [New in Electra:EIP6110]
-    for_ops(body.execution_payload.consolidation_requests, process_execution_layer_consolidation_request)  # [New in Electra:EIP7251]
+    # [New in Electra:EIP7251]
+    for_ops(body.execution_payload.consolidation_requests, process_execution_layer_consolidation_request)
 ```
 
 ##### Attestations
@@ -1291,7 +1293,8 @@ def process_deposit_receipt(state: BeaconState, deposit_receipt: DepositReceipt)
 ```python
 def process_execution_layer_consolidation_request(
     state: BeaconState,
-    execution_layer_consolidation_request: ExecutionLayerConsolidationRequest) -> None:
+    execution_layer_consolidation_request: ExecutionLayerConsolidationRequest
+) -> None:
     # If the pending consolidations queue is full, consolidation requests are ignored
     if len(state.pending_consolidations) == PENDING_CONSOLIDATIONS_LIMIT:
         return

tests/core/pyspec/eth2spec/test/electra/block_processing/test_process_execution_layer_consolidation_request.py

@@ -9,7 +9,6 @@
     default_activation_threshold,
     spec_state_test,
 )
-from eth2spec.test.helpers.keys import pubkey_to_privkey
 from eth2spec.test.helpers.withdrawals import (
     set_eth1_withdrawal_credential_with_balance,
     set_compounding_withdrawal_credential,
@@ -255,7 +254,6 @@ def test_basic_consolidation_with_compounding_credentials(spec, state):
     assert state.validators[source_index].exit_epoch == expected_exit_epoch
 
 
-
 @with_electra_and_later
 @with_presets([MINIMAL], "need sufficient consolidation churn limit")
 @with_custom_state(
@@ -623,7 +621,7 @@ def test_invalid_inactive_target(spec, state):
 @spec_test
 @single_phase
 def test_invalid_no_source_execution_withdrawal_credential(spec, state):
-    # Set up a correct consolidation, but source does not have 
+    # Set up a correct consolidation, but source does not have
     # an execution withdrawal credential
     current_epoch = spec.get_current_epoch(state)
     source_index = spec.get_active_validator_indices(state, current_epoch)[0]
@@ -639,6 +637,7 @@ def test_invalid_no_source_execution_withdrawal_credential(spec, state):
         spec, state, consolidation, success=False
     )
 
+
 @with_electra_and_later
 @with_presets([MINIMAL], "need sufficient consolidation churn limit")
 @with_custom_state(
@@ -648,7 +647,7 @@ def test_invalid_no_source_execution_withdrawal_credential(spec, state):
 @spec_test
 @single_phase
 def test_invalid_no_target_execution_withdrawal_credential(spec, state):
-    # Set up a correct consolidation, but target does not have 
+    # Set up a correct consolidation, but target does not have
     # an execution withdrawal credential
     current_epoch = spec.get_current_epoch(state)
     source_index = spec.get_active_validator_indices(state, current_epoch)[0]
@@ -666,6 +665,7 @@ def test_invalid_no_target_execution_withdrawal_credential(spec, state):
         spec, state, consolidation, success=False
     )
 
+
 @with_electra_and_later
 @with_presets([MINIMAL], "need sufficient consolidation churn limit")
 @with_custom_state(
@@ -691,7 +691,6 @@ def test_invalid_incorrect_source_address(spec, state):
     )
     set_eth1_withdrawal_credential_with_balance(spec, state, target_index)
 
-
     yield from run_consolidation_processing(
         spec, state, consolidation, success=False
     )
@@ -757,7 +756,6 @@ def test_invalid_unknown_target_pubkey(spec, state):
     )
 
 
-
 def run_consolidation_processing(spec, state, consolidation, success=True):
     """
     Run ``process_consolidation``, yielding:
@@ -779,7 +777,6 @@ def run_consolidation_processing(spec, state, consolidation, success=True):
     else:
         pre_state = state.copy()
 
-
     yield 'pre', state
     yield 'consolidation', consolidation
 
@@ -802,12 +799,11 @@ def run_consolidation_processing(spec, state, consolidation, success=True):
         assert state.validators[source_index].exit_epoch < spec.FAR_FUTURE_EPOCH
         # Check that the exit epoch matches earliest_consolidation_epoch
         assert state.validators[source_index].exit_epoch == state.earliest_consolidation_epoch
-        # Check that the correct consolidation has been appended 
+        # Check that the correct consolidation has been appended
         expected_new_pending_consolidation = spec.PendingConsolidation(
             source_index=source_index,
             target_index=target_index,
         )
         assert state.pending_consolidations == pre_pending_consolidations + [expected_new_pending_consolidation]
     else:
         assert pre_state == state
-

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

@@ -112,8 +112,6 @@ def compute_el_header_block_hash(spec,
         execution_payload_header_rlp.append((Binary(32, 32), deposit_receipts_trie_root))
         # withdrawal requests root
         execution_payload_header_rlp.append((Binary(32, 32), withdrawal_requests_root))
-        # consolidation requests root
-        execution_payload_header_rlp.append((Binary(32, 32), consolidation_requests_root))
 
     sedes = List([schema for schema, _ in execution_payload_header_rlp])
     values = [value for _, value in execution_payload_header_rlp]