move consensus_manager to consensus_object_pools (#3852)

beacon_chain/beacon_node.nim

@@ -15,12 +15,12 @@ import
 
   # Local modules
   "."/[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,
   ./eth1/eth1_monitor,
   ./consensus_object_pools/[
-    blockchain_dag, block_quarantine, exit_pool, attestation_pool,
-    sync_committee_msg_pool],
+    blockchain_dag, block_quarantine, consensus_manager, exit_pool,
+    attestation_pool, sync_committee_msg_pool],
   ./spec/datatypes/[base, altair],
   ./sync/[optimistic_sync_light_client, sync_manager, request_manager],
   ./validators/[

beacon_chain/consensus_object_pools/consensus_manager.nim

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

beacon_chain/gossip_processing/block_processor.nim

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

beacon_chain/validators/validator_duties.nim

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

tests/test_block_processor.nim

@@ -14,9 +14,10 @@ import
   eth/keys, taskpools,
   ../beacon_chain/beacon_clock,
   ../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/[
-    attestation_pool, blockchain_dag, block_quarantine, block_clearance],
+    attestation_pool, blockchain_dag, block_quarantine, block_clearance,
+    consensus_manager],
   ../beacon_chain/eth1/eth1_monitor,
   ./testutil, ./testdbutil, ./testblockutil