Use pending_deposits format for both test files

Author: jtraglia

tests/core/pyspec/eth2spec/test/electra/epoch_processing/pending_deposits/__init__.py

@@ -0,0 +1,3 @@
+# This is a trick to allow tests be split into multiple files and use the same test format.
+from .test_apply_pending_deposit import *  # noqa: F401 F403
+from .test_process_pending_deposits import *  # noqa: F401 F403

…ocessing/test_process_pending_deposit.py …g_deposits/test_apply_pending_deposit.pytests/core/pyspec/eth2spec/test/electra/epoch_processing/test_process_pending_deposit.py renamed to tests/core/pyspec/eth2spec/test/electra/epoch_processing/pending_deposits/test_apply_pending_deposit.py tests/core/pyspec/eth2spec/test/electra/epoch_processing/test_process_pending_deposit.py renamed to tests/core/pyspec/eth2spec/test/electra/epoch_processing/pending_deposits/test_apply_pending_deposit.py

@@ -13,7 +13,7 @@
 
 @with_electra_and_later
 @spec_state_test
-def test_process_pending_deposit_under_min_activation(spec, state):
+def test_apply_pending_deposit_under_min_activation(spec, state):
     # fresh deposit = next validator index = validator appended to registry
     validator_index = len(state.validators)
     # effective balance will be 1 EFFECTIVE_BALANCE_INCREMENT smaller because of this small decrement.
@@ -25,7 +25,7 @@ def test_process_pending_deposit_under_min_activation(spec, state):
 
 @with_electra_and_later
 @spec_state_test
-def test_process_pending_deposit_min_activation(spec, state):
+def test_apply_pending_deposit_min_activation(spec, state):
     # fresh deposit = next validator index = validator appended to registry
     validator_index = len(state.validators)
     # effective balance will be exactly the same as balance.
@@ -37,7 +37,7 @@ def test_process_pending_deposit_min_activation(spec, state):
 
 @with_electra_and_later
 @spec_state_test
-def test_process_pending_deposit_over_min_activation(spec, state):
+def test_apply_pending_deposit_over_min_activation(spec, state):
     # fresh deposit = next validator index = validator appended to registry
     validator_index = len(state.validators)
     # just 1 over the limit, effective balance should be set MIN_ACTIVATION_BALANCE during processing
@@ -49,7 +49,7 @@ def test_process_pending_deposit_over_min_activation(spec, state):
 
 @with_electra_and_later
 @spec_state_test
-def test_process_pending_deposit_eth1_withdrawal_credentials(spec, state):
+def test_apply_pending_deposit_eth1_withdrawal_credentials(spec, state):
     # fresh deposit = next validator index = validator appended to registry
     validator_index = len(state.validators)
     withdrawal_credentials = (
@@ -71,7 +71,7 @@ def test_process_pending_deposit_eth1_withdrawal_credentials(spec, state):
 
 @with_electra_and_later
 @spec_state_test
-def test_process_pending_deposit_compounding_withdrawal_credentials_under_max(spec, state):
+def test_apply_pending_deposit_compounding_withdrawal_credentials_under_max(spec, state):
     # fresh deposit = next validator index = validator appended to registry
     validator_index = len(state.validators)
     withdrawal_credentials = (
@@ -94,7 +94,7 @@ def test_process_pending_deposit_compounding_withdrawal_credentials_under_max(sp
 
 @with_electra_and_later
 @spec_state_test
-def test_process_pending_deposit_compounding_withdrawal_credentials_max(spec, state):
+def test_apply_pending_deposit_compounding_withdrawal_credentials_max(spec, state):
     # fresh deposit = next validator index = validator appended to registry
     validator_index = len(state.validators)
     withdrawal_credentials = (
@@ -117,7 +117,7 @@ def test_process_pending_deposit_compounding_withdrawal_credentials_max(spec, st
 
 @with_electra_and_later
 @spec_state_test
-def test_process_pending_deposit_compounding_withdrawal_credentials_over_max(spec, state):
+def test_apply_pending_deposit_compounding_withdrawal_credentials_over_max(spec, state):
     # fresh deposit = next validator index = validator appended to registry
     validator_index = len(state.validators)
     withdrawal_credentials = (
@@ -140,7 +140,7 @@ def test_process_pending_deposit_compounding_withdrawal_credentials_over_max(spe
 
 @with_electra_and_later
 @spec_state_test
-def test_process_pending_deposit_non_versioned_withdrawal_credentials(spec, state):
+def test_apply_pending_deposit_non_versioned_withdrawal_credentials(spec, state):
     # fresh deposit = next validator index = validator appended to registry
     validator_index = len(state.validators)
     withdrawal_credentials = (
@@ -161,7 +161,7 @@ def test_process_pending_deposit_non_versioned_withdrawal_credentials(spec, stat
 
 @with_electra_and_later
 @spec_state_test
-def test_process_pending_deposit_non_versioned_withdrawal_credentials_over_min_activation(spec, state):
+def test_apply_pending_deposit_non_versioned_withdrawal_credentials_over_min_activation(spec, state):
     # fresh deposit = next validator index = validator appended to registry
     validator_index = len(state.validators)
     withdrawal_credentials = (
@@ -184,7 +184,7 @@ def test_process_pending_deposit_non_versioned_withdrawal_credentials_over_min_a
 @with_electra_and_later
 @spec_state_test
 @always_bls
-def test_process_pending_deposit_correct_sig_but_forked_state(spec, state):
+def test_apply_pending_deposit_correct_sig_but_forked_state(spec, state):
     validator_index = len(state.validators)
     amount = spec.MIN_ACTIVATION_BALANCE
     # deposits will always be valid, regardless of the current fork
@@ -196,7 +196,7 @@ def test_process_pending_deposit_correct_sig_but_forked_state(spec, state):
 @with_electra_and_later
 @spec_state_test
 @always_bls
-def test_process_pending_deposit_incorrect_sig_new_deposit(spec, state):
+def test_apply_pending_deposit_incorrect_sig_new_deposit(spec, state):
     # fresh deposit = next validator index = validator appended to registry
     validator_index = len(state.validators)
     amount = spec.MIN_ACTIVATION_BALANCE
@@ -206,7 +206,7 @@ def test_process_pending_deposit_incorrect_sig_new_deposit(spec, state):
 
 @with_electra_and_later
 @spec_state_test
-def test_process_pending_deposit_top_up__min_activation_balance(spec, state):
+def test_apply_pending_deposit_top_up__min_activation_balance(spec, state):
     validator_index = 0
     amount = spec.MIN_ACTIVATION_BALANCE // 4
     pending_deposit = prepare_pending_deposit(spec, validator_index, amount, signed=True)
@@ -222,7 +222,7 @@ def test_process_pending_deposit_top_up__min_activation_balance(spec, state):
 
 @with_electra_and_later
 @spec_state_test
-def test_process_pending_deposit_top_up__min_activation_balance_compounding(spec, state):
+def test_apply_pending_deposit_top_up__min_activation_balance_compounding(spec, state):
     validator_index = 0
     withdrawal_credentials = (
         spec.COMPOUNDING_WITHDRAWAL_PREFIX
@@ -244,7 +244,7 @@ def test_process_pending_deposit_top_up__min_activation_balance_compounding(spec
 
 @with_electra_and_later
 @spec_state_test
-def test_process_pending_deposit_top_up__max_effective_balance_compounding(spec, state):
+def test_apply_pending_deposit_top_up__max_effective_balance_compounding(spec, state):
     validator_index = 0
     withdrawal_credentials = (
         spec.COMPOUNDING_WITHDRAWAL_PREFIX
@@ -266,7 +266,7 @@ def test_process_pending_deposit_top_up__max_effective_balance_compounding(spec,
 
 @with_electra_and_later
 @spec_state_test
-def test_process_pending_deposit_top_up__less_effective_balance(spec, state):
+def test_apply_pending_deposit_top_up__less_effective_balance(spec, state):
     validator_index = 0
     amount = spec.MIN_ACTIVATION_BALANCE // 4
     pending_deposit = prepare_pending_deposit(spec, validator_index, amount, signed=True)
@@ -285,7 +285,7 @@ def test_process_pending_deposit_top_up__less_effective_balance(spec, state):
 
 @with_electra_and_later
 @spec_state_test
-def test_process_pending_deposit_top_up__zero_balance(spec, state):
+def test_apply_pending_deposit_top_up__zero_balance(spec, state):
     validator_index = 0
     amount = spec.MIN_ACTIVATION_BALANCE // 4
     pending_deposit = prepare_pending_deposit(spec, validator_index, amount, signed=True)
@@ -305,7 +305,7 @@ def test_process_pending_deposit_top_up__zero_balance(spec, state):
 @with_electra_and_later
 @spec_state_test
 @always_bls
-def test_process_pending_deposit_incorrect_sig_top_up(spec, state):
+def test_apply_pending_deposit_incorrect_sig_top_up(spec, state):
     validator_index = 0
     amount = spec.MIN_ACTIVATION_BALANCE // 4
     pending_deposit = prepare_pending_deposit(spec, validator_index, amount, signed=True)
@@ -316,7 +316,7 @@ def test_process_pending_deposit_incorrect_sig_top_up(spec, state):
 
 @with_electra_and_later
 @spec_state_test
-def test_process_pending_deposit_incorrect_withdrawal_credentials_top_up(spec, state):
+def test_apply_pending_deposit_incorrect_withdrawal_credentials_top_up(spec, state):
     validator_index = 0
     amount = spec.MIN_ACTIVATION_BALANCE // 4
     withdrawal_credentials = spec.BLS_WITHDRAWAL_PREFIX + spec.hash(b"junk")[1:]
@@ -335,7 +335,7 @@ def test_process_pending_deposit_incorrect_withdrawal_credentials_top_up(spec, s
 @with_electra_and_later
 @spec_state_test
 @always_bls
-def test_process_pending_deposit_key_validate_invalid_subgroup(spec, state):
+def test_apply_pending_deposit_key_validate_invalid_subgroup(spec, state):
     validator_index = len(state.validators)
     amount = spec.MIN_ACTIVATION_BALANCE
 
@@ -350,7 +350,7 @@ def test_process_pending_deposit_key_validate_invalid_subgroup(spec, state):
 @with_electra_and_later
 @spec_state_test
 @always_bls
-def test_process_pending_deposit_key_validate_invalid_decompression(spec, state):
+def test_apply_pending_deposit_key_validate_invalid_decompression(spec, state):
     validator_index = len(state.validators)
     amount = spec.MIN_ACTIVATION_BALANCE
 
@@ -367,7 +367,7 @@ def test_process_pending_deposit_key_validate_invalid_decompression(spec, state)
 @with_electra_and_later
 @spec_state_test
 @always_bls
-def test_process_pending_deposit_ineffective_deposit_with_bad_fork_version(spec, state):
+def test_apply_pending_deposit_ineffective_deposit_with_bad_fork_version(spec, state):
     validator_index = len(state.validators)
     fork_version = spec.Version('0xAaBbCcDd')
     pending_deposit = prepare_pending_deposit(
@@ -384,7 +384,7 @@ def test_process_pending_deposit_ineffective_deposit_with_bad_fork_version(spec,
 @with_electra_and_later
 @spec_state_test
 @always_bls
-def test_process_pending_deposit_with_previous_fork_version(spec, state):
+def test_apply_pending_deposit_with_previous_fork_version(spec, state):
     # Since deposits are valid across forks, the domain is always set with `GENESIS_FORK_VERSION`.
     # It's an ineffective deposit because it fails at BLS sig verification.
     # NOTE: it was effective in Altair.
@@ -423,7 +423,7 @@ def test_ineffective_deposit_with_current_fork_version(spec, state):
 @with_electra_and_later
 @spec_state_test
 @always_bls
-def test_process_pending_deposit_effective_deposit_with_genesis_fork_version(spec, state):
+def test_apply_pending_deposit_effective_deposit_with_genesis_fork_version(spec, state):
     assert spec.config.GENESIS_FORK_VERSION not in (state.fork.previous_version, state.fork.current_version)
 
     validator_index = len(state.validators)
@@ -441,7 +441,7 @@ def test_process_pending_deposit_effective_deposit_with_genesis_fork_version(spe
 
 @with_electra_and_later
 @spec_state_test
-def test_process_pending_deposit_success_top_up_to_withdrawn_validator(spec, state):
+def test_apply_pending_deposit_success_top_up_to_withdrawn_validator(spec, state):
     validator_index = 0
 
     # Fully withdraw validator

…cessing/test_process_pending_deposits.py …eposits/test_process_pending_deposits.pytests/core/pyspec/eth2spec/test/electra/epoch_processing/test_process_pending_deposits.py renamed to tests/core/pyspec/eth2spec/test/electra/epoch_processing/pending_deposits/test_process_pending_deposits.py tests/core/pyspec/eth2spec/test/electra/epoch_processing/test_process_pending_deposits.py renamed to tests/core/pyspec/eth2spec/test/electra/epoch_processing/pending_deposits/test_process_pending_deposits.py

@@ -32,19 +32,21 @@ The provided pre-state is already transitioned to just before the specific sub-t
 
 Sub-transitions:
 
-- `justification_and_finalization`
-- `inactivity_updates` (Altair)
-- `rewards_and_penalties`
-- `registry_updates`
-- `slashings`
-- `eth1_data_reset`
-- `effective_balance_updates`
-- `slashings_reset`
-- `randao_mixes_reset`
-- `historical_roots_update` (Phase0, Altair, Bellatrix only)
-- `historical_summaries_update` (Capella)
-- `participation_record_updates` (Phase 0 only)
-- `participation_flag_updates` (Altair)
-- `sync_committee_updates` (Altair)
+- `eth1_data_reset` (>=Phase0)
+- `historical_roots_update` (>=Phase0,<=Bellatrix)
+- `justification_and_finalization` (>=Phase0)
+- `participation_record_updates` (==Phase0)
+- `randao_mixes_reset` (>=Phase0)
+- `registry_updates` (>=Phase0)
+- `rewards_and_penalties` (>=Phase0)
+- `slashings_reset` (>=Phase0)
+- `slashings` (>=Phase0)
+- `inactivity_updates` (>=Altair)
+- `participation_flag_updates` (>=Altair)
+- `sync_committee_updates` (>=Altair)
+- `historical_summaries_update` (>=Capella)
+- `effective_balance_updates` (>=Electra)
+- `pending_consolidations` (>=Electra)
+- `pending_deposits` (>=Electra)
 
 The resulting state should match the expected `post` state.

tests/formats/epoch_processing/README.md

@@ -37,12 +37,15 @@
     ]}
     deneb_mods = combine_mods(_new_deneb_mods, capella_mods)
 
-    _new_electra_mods = {key: 'eth2spec.test.electra.epoch_processing.test_process_' + key for key in [
+    _new_electra_mods_1 = {key: 'eth2spec.test.electra.epoch_processing.test_process_' + key for key in [
         'effective_balance_updates',
-        'pending_deposit',
-        'pending_deposits',
         'pending_consolidations',
     ]}
+    # 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 [
+        'pending_deposits',
+    ]}
+    _new_electra_mods = {**_new_electra_mods_1, **_new_electra_mods_2}
     electra_mods = combine_mods(_new_electra_mods, deneb_mods)
 
     # TODO Custody Game testgen is disabled for now