Skip to content

Commit 0302261

Browse files
authored
rename exit_pool > validator_change_pool (#5679)
The `ExitPool` was renamed to `ValidatorChangePool` with Capella, but the files were still using the previous name. Rename for consistency.
1 parent 583782a commit 0302261

File tree

9 files changed

+17
-14
lines changed

9 files changed

+17
-14
lines changed

beacon_chain/beacon_node.nim

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import
2020
./el/el_manager,
2121
./consensus_object_pools/[
2222
blockchain_dag, blob_quarantine, block_quarantine, consensus_manager,
23-
exit_pool, attestation_pool, sync_committee_msg_pool],
23+
attestation_pool, sync_committee_msg_pool, validator_change_pool],
2424
./spec/datatypes/[base, altair],
2525
./spec/eth2_apis/dynamic_fee_recipients,
2626
./sync/[sync_manager, request_manager],
@@ -32,10 +32,10 @@ import
3232
export
3333
osproc, chronos, presto, action_tracker,
3434
beacon_clock, beacon_chain_db, conf, light_client,
35-
attestation_pool, sync_committee_msg_pool, validator_pool,
35+
attestation_pool, sync_committee_msg_pool, validator_change_pool,
3636
eth2_network, el_manager, request_manager, sync_manager,
3737
eth2_processor, optimistic_processor, blockchain_dag, block_quarantine,
38-
base, exit_pool, message_router, validator_monitor,
38+
base, message_router, validator_monitor, validator_pool,
3939
consensus_manager, dynamic_fee_recipients
4040

4141
type

beacon_chain/consensus_object_pools/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ The pools presenet in this folder are:
2222
- blockchain_dag: an in-memory direct-acyclic graph of fully validated and verified blockchain candidates with the tail being the last finalized epoch. A block in the DAG MUST be in the fork choice and a block in the fork choice MUST be in the DAG (except for orphans following finalization). On finalization non-empty epoch blocks are stored in the beacon_chain_db.
2323
- attestation_pool:
2424
Handles the attestation received from gossip and collect them for fork choice.
25-
- exit_pool:
25+
- validator_change_pool:
2626
Handle voluntary exits and forced exits (attester slashings and proposer slashings)

beacon_chain/gossip_processing/eth2_processor.nim

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,18 @@ import
1515
../spec/datatypes/[altair, phase0, deneb],
1616
../consensus_object_pools/[
1717
blob_quarantine, block_clearance, block_quarantine, blockchain_dag,
18-
exit_pool, attestation_pool, light_client_pool, sync_committee_msg_pool],
18+
attestation_pool, light_client_pool, sync_committee_msg_pool,
19+
validator_change_pool],
1920
../validators/validator_pool,
2021
../beacon_clock,
2122
"."/[gossip_validation, block_processor, batch_validation],
2223
../nimbus_binary_common
2324

2425
export
25-
results, taskpools, block_clearance, blockchain_dag, exit_pool, attestation_pool,
26-
light_client_pool, sync_committee_msg_pool, validator_pool, beacon_clock,
27-
gossip_validation, block_processor, batch_validation, block_quarantine
26+
results, taskpools, block_clearance, blockchain_dag, attestation_pool,
27+
light_client_pool, sync_committee_msg_pool, validator_change_pool,
28+
validator_pool, beacon_clock, gossip_validation, block_processor,
29+
batch_validation, block_quarantine
2830

2931
logScope: topics = "gossip_eth2"
3032

beacon_chain/gossip_processing/gossip_validation.nim

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ import
1616
beaconstate, state_transition_block, forks, helpers, network, signatures],
1717
../consensus_object_pools/[
1818
attestation_pool, blockchain_dag, blob_quarantine, block_quarantine,
19-
exit_pool, spec_cache, light_client_pool, sync_committee_msg_pool],
19+
spec_cache, light_client_pool, sync_committee_msg_pool,
20+
validator_change_pool],
2021
".."/[beacon_clock],
2122
./batch_validation
2223

beacon_chain/rpc/rest_beacon_api.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import
1212
./rest_utils,
1313
./state_ttl_cache,
1414
../beacon_node,
15-
../consensus_object_pools/[blockchain_dag, exit_pool, spec_cache],
15+
../consensus_object_pools/[blockchain_dag, spec_cache, validator_change_pool],
1616
../spec/[deposit_snapshots, eth2_merkleization, forks, network, validator],
1717
../spec/datatypes/[phase0, altair, deneb],
1818
../validators/message_router_mev

beacon_chain/validators/beacon_validators.nim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ import
3232
eth2_merkleization, forks, helpers, network, signatures, state_transition,
3333
validator],
3434
../consensus_object_pools/[
35-
spec_cache, blockchain_dag, block_clearance, attestation_pool, exit_pool,
36-
sync_committee_msg_pool, consensus_manager],
35+
spec_cache, blockchain_dag, block_clearance, attestation_pool,
36+
sync_committee_msg_pool, validator_change_pool, consensus_manager],
3737
../el/el_manager,
3838
../networking/eth2_network,
3939
../sszdump, ../sync/sync_manager,

tests/all_tests.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import # Unit test
2626
./test_el_manager,
2727
./test_el_conf,
2828
./test_eth2_ssz_serialization,
29-
./test_exit_pool,
3029
./test_forks,
3130
./test_gossip_transition,
3231
./test_gossip_validation,
@@ -45,6 +44,7 @@ import # Unit test
4544
./test_statediff,
4645
./test_sync_committee_pool,
4746
./test_sync_manager,
47+
./test_validator_change_pool,
4848
./test_validator_pool,
4949
./test_zero_signature,
5050
./test_signing_node,

tests/test_exit_pool.nim renamed to tests/test_validator_change_pool.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import
1111
../beacon_chain/spec/[
1212
datatypes/base, forks, presets, signatures, state_transition],
1313
../beacon_chain/consensus_object_pools/[
14-
block_quarantine, blockchain_dag, exit_pool],
14+
block_quarantine, blockchain_dag, validator_change_pool],
1515
"."/[testutil, testblockutil, testdbutil]
1616

1717
func makeSignedBeaconBlockHeader(

0 commit comments

Comments
 (0)