Apply suggestions by @jtraglia

Author: mkalinin

tests/core/pyspec/eth2spec/test/electra/epoch_processing/test_process_pending_consolidations.py

@@ -306,7 +306,7 @@ def test_pending_consolidation_with_pending_deposit(spec, state):
 
 @with_electra_and_later
 @spec_state_test
-def test_pending_consolidation_source_balance_less_than_effective(spec, state):
+def test_pending_consolidation_source_balance_less_than_max_effective(spec, state):
     current_epoch = spec.get_current_epoch(state)
     source_index = spec.get_active_validator_indices(state, current_epoch)[0]
     target_index = spec.get_active_validator_indices(state, current_epoch)[1]
@@ -327,6 +327,8 @@ def test_pending_consolidation_source_balance_less_than_effective(spec, state):
 
     pre_balance_target = state.balances[target_index]
 
+    assert state.balances[source_index] < spec.get_max_effective_balance(state.validators[source_index])
+
     yield from run_epoch_processing_with(spec, state, "process_pending_consolidations")
 
     # Pending consolidation was successfully processed
@@ -337,7 +339,7 @@ def test_pending_consolidation_source_balance_less_than_effective(spec, state):
 
 @with_electra_and_later
 @spec_state_test
-def test_pending_consolidation_source_balance_greater_than_effective(spec, state):
+def test_pending_consolidation_source_balance_greater_than_max_effective(spec, state):
     current_epoch = spec.get_current_epoch(state)
     source_index = spec.get_active_validator_indices(state, current_epoch)[0]
     target_index = spec.get_active_validator_indices(state, current_epoch)[1]
@@ -353,16 +355,18 @@ def test_pending_consolidation_source_balance_greater_than_effective(spec, state
     )
     state.validators[target_index].withdrawal_credentials = eth1_withdrawal_credential
     # Set the source balance to be greater than effective_balance
-    pre_balance_source = state.validators[source_index].effective_balance + spec.EFFECTIVE_BALANCE_INCREMENT // 8
+    excess_source_balance = spec.EFFECTIVE_BALANCE_INCREMENT // 8
+    pre_balance_source = state.validators[source_index].effective_balance + excess_source_balance
     state.balances[source_index] = pre_balance_source
 
     pre_balance_target = state.balances[target_index]
 
+    source_max_effective_balance = spec.get_max_effective_balance(state.validators[source_index])
+    assert state.balances[source_index] > source_max_effective_balance
+
     yield from run_epoch_processing_with(spec, state, "process_pending_consolidations")
 
     # Pending consolidation was successfully processed
-    assert state.balances[target_index] == (
-        pre_balance_target + spec.get_max_effective_balance(state.validators[source_index]))
-    assert state.balances[source_index] == (
-        pre_balance_source - spec.get_max_effective_balance(state.validators[source_index]))
+    assert state.balances[target_index] == pre_balance_target + source_max_effective_balance
+    assert state.balances[source_index] == excess_source_balance
     assert state.pending_consolidations == []

tests/core/pyspec/eth2spec/test/electra/epoch_processing/test_process_registry_updates.py

@@ -32,10 +32,6 @@ def run_test_activation_queue_eligibility(spec, state, validator_index, balance)
 @with_electra_and_later
 @spec_state_test
 def test_activation_queue_eligibility__less_than_min_activation_balance(spec, state):
-    # move past first two irregular epochs wrt finality
-    next_epoch(spec, state)
-    next_epoch(spec, state)
-
     index = 3
     balance = spec.MIN_ACTIVATION_BALANCE - spec.EFFECTIVE_BALANCE_INCREMENT
     yield from run_test_activation_queue_eligibility(spec, state, index, balance)
@@ -44,10 +40,6 @@ def test_activation_queue_eligibility__less_than_min_activation_balance(spec, st
 @with_electra_and_later
 @spec_state_test
 def test_activation_queue_eligibility__min_activation_balance(spec, state):
-    # move past first two irregular epochs wrt finality
-    next_epoch(spec, state)
-    next_epoch(spec, state)
-
     index = 5
     balance = spec.MIN_ACTIVATION_BALANCE
     yield from run_test_activation_queue_eligibility(spec, state, index, balance)
@@ -56,10 +48,6 @@ def test_activation_queue_eligibility__min_activation_balance(spec, state):
 @with_electra_and_later
 @spec_state_test
 def test_activation_queue_eligibility__min_activation_balance_eth1_creds(spec, state):
-    # move past first two irregular epochs wrt finality
-    next_epoch(spec, state)
-    next_epoch(spec, state)
-
     index = 7
     balance = spec.MIN_ACTIVATION_BALANCE
     set_eth1_withdrawal_credential_with_balance(spec, state, index)
@@ -69,10 +57,6 @@ def test_activation_queue_eligibility__min_activation_balance_eth1_creds(spec, s
 @with_electra_and_later
 @spec_state_test
 def test_activation_queue_eligibility__min_activation_balance_compounding_creds(spec, state):
-    # move past first two irregular epochs wrt finality
-    next_epoch(spec, state)
-    next_epoch(spec, state)
-
     index = 11
     balance = spec.MIN_ACTIVATION_BALANCE
     set_compounding_withdrawal_credential_with_balance(spec, state, index)
@@ -82,10 +66,6 @@ def test_activation_queue_eligibility__min_activation_balance_compounding_creds(
 @with_electra_and_later
 @spec_state_test
 def test_activation_queue_eligibility__greater_than_min_activation_balance(spec, state):
-    # move past first two irregular epochs wrt finality
-    next_epoch(spec, state)
-    next_epoch(spec, state)
-
     index = 13
     balance = spec.MIN_ACTIVATION_BALANCE + spec.EFFECTIVE_BALANCE_INCREMENT
     set_compounding_withdrawal_credential_with_balance(spec, state, index)

tests/generators/epoch_processing/main.py

@@ -40,6 +40,7 @@
     _new_electra_mods_1 = {key: 'eth2spec.test.electra.epoch_processing.test_process_' + key for key in [
         'effective_balance_updates',
         'pending_consolidations',
+        'registry_updates',
     ]}
     # This is a trick to allow tests be split into multiple files and use the same test format.
     _new_electra_mods_2 = {key: 'eth2spec.test.electra.epoch_processing.' + key for key in [