status-im
/
nimbus-eth2
mirror of https://github.com/status-im/nimbus-eth2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

move consensus_manager to consensus_object_pools (#3852)

This commit is contained in:
tersec 2022-07-13 14:13:54 +00:00 committed by GitHub
parent ce6cbd84e2
commit 06c8e10ae2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
beacon_chain/beacon_node.nim
View File

@ -15,12 +15,12 @@ import
# Local modules # Local modules
"."/[beacon_clock, beacon_chain_db, conf, light_client], "."/[beacon_clock, beacon_chain_db, conf, light_client],
./gossip_processing/[eth2_processor, block_processor, consensus_manager], ./gossip_processing/[eth2_processor, block_processor],
./networking/eth2_network, ./networking/eth2_network,
./eth1/eth1_monitor, ./eth1/eth1_monitor,
./consensus_object_pools/[ ./consensus_object_pools/[
blockchain_dag, block_quarantine, exit_pool, attestation_pool, blockchain_dag, block_quarantine, consensus_manager, exit_pool,
sync_committee_msg_pool], attestation_pool, sync_committee_msg_pool],
./spec/datatypes/[base, altair], ./spec/datatypes/[base, altair],
./sync/[optimistic_sync_light_client, sync_manager, request_manager], ./sync/[optimistic_sync_light_client, sync_manager, request_manager],
./validators/[ ./validators/[

2
beacon_chain/gossip_processing/consensus_manager.nim → beacon_chain/consensus_object_pools/consensus_manager.nim
View File

@ -13,8 +13,6 @@ import
../consensus_object_pools/[blockchain_dag, block_quarantine, attestation_pool], ../consensus_object_pools/[blockchain_dag, block_quarantine, attestation_pool],
../eth1/eth1_monitor ../eth1/eth1_monitor
# TODO: Move to "consensus_object_pools" folder
type type
ConsensusManager* = object ConsensusManager* = object
expectedSlot: Slot expectedSlot: Slot

2
beacon_chain/gossip_processing/block_processor.nim
View File

@ -13,7 +13,7 @@ import
../spec/signatures_batch, ../spec/signatures_batch,
../sszdump ../sszdump
from ./consensus_manager import from ../consensus_object_pools/consensus_manager import
ConsensusManager, updateHead, updateHeadWithExecution ConsensusManager, updateHead, updateHeadWithExecution
from ../beacon_clock import GetBeaconTimeFn, toFloatSeconds from ../beacon_clock import GetBeaconTimeFn, toFloatSeconds
from ../consensus_object_pools/block_dag import BlockRef, root, slot from ../consensus_object_pools/block_dag import BlockRef, root, slot

4
beacon_chain/validators/validator_duties.nim
View File

@ -35,11 +35,11 @@ import
validator], validator],
../consensus_object_pools/[ ../consensus_object_pools/[
spec_cache, blockchain_dag, block_clearance, attestation_pool, exit_pool, spec_cache, blockchain_dag, block_clearance, attestation_pool, exit_pool,
sync_committee_msg_pool], sync_committee_msg_pool, consensus_manager],
../eth1/eth1_monitor, ../eth1/eth1_monitor,
../networking/eth2_network, ../networking/eth2_network,
../sszdump, ../sync/sync_manager, ../sszdump, ../sync/sync_manager,
../gossip_processing/[block_processor, consensus_manager], ../gossip_processing/block_processor,
".."/[conf, beacon_clock, beacon_node], ".."/[conf, beacon_clock, beacon_node],
"."/[slashing_protection, validator_pool, keystore_management] "."/[slashing_protection, validator_pool, keystore_management]

5
tests/test_block_processor.nim
View File

@ -14,9 +14,10 @@ import
eth/keys, taskpools, eth/keys, taskpools,
../beacon_chain/beacon_clock, ../beacon_chain/beacon_clock,
../beacon_chain/spec/[beaconstate, forks, helpers, state_transition], ../beacon_chain/spec/[beaconstate, forks, helpers, state_transition],
../beacon_chain/gossip_processing/[block_processor, consensus_manager], ../beacon_chain/gossip_processing/block_processor,
../beacon_chain/consensus_object_pools/[ ../beacon_chain/consensus_object_pools/[
attestation_pool, blockchain_dag, block_quarantine, block_clearance], attestation_pool, blockchain_dag, block_quarantine, block_clearance,
consensus_manager],
../beacon_chain/eth1/eth1_monitor, ../beacon_chain/eth1/eth1_monitor,
./testutil, ./testdbutil, ./testblockutil ./testutil, ./testdbutil, ./testblockutil