refactor(l1): move the contact table into the discovery server

cmd/ethrex/initializers.rs

@@ -469,6 +469,7 @@ pub async fn init_network(
     let discovery_config = DiscoveryConfig {
         discv4_enabled: opts.discv4_enabled,
         discv5_enabled: opts.discv5_enabled,
+        target_peers: opts.target_peers,
         nat_extip_set: opts.nat_extip.is_some(),
     };
 
@@ -926,8 +927,7 @@ pub async fn init_l1(
         record: local_node_record,
     }));
 
-    let peer_table =
-        PeerTableServer::spawn(local_p2p_node.node_id(), opts.target_peers, store.clone());
+    let peer_table = PeerTableServer::spawn(opts.target_peers);
 
     // TODO: Check every module starts properly.
     let tracker = TaskTracker::new();
@@ -951,7 +951,8 @@ pub async fn init_l1(
 
     let initiator = RLPxInitiator::spawn(p2p_context.clone());
 
-    let peer_handler = PeerHandler::new(peer_table.clone(), initiator);
+    let peer_handler =
+        PeerHandler::new(peer_table.clone(), initiator, p2p_context.discovery.clone());
 
     init_rpc_api(
         &opts,

cmd/ethrex/l2/initializers.rs

@@ -299,11 +299,7 @@ pub async fn init_l2(
         if !opts.sequencer_opts.based {
             blockchain.set_synced();
         }
-        let peer_table = PeerTableServer::spawn(
-            local_p2p_node.node_id(),
-            opts.node_opts.target_peers,
-            store.clone(),
-        );
+        let peer_table = PeerTableServer::spawn(opts.node_opts.target_peers);
         let p2p_context = P2PContext::new(
             local_p2p_node.clone(),
             network_config,
@@ -335,7 +331,7 @@ pub async fn init_l2(
         )
         .expect("P2P context could not be created");
         let initiator = RLPxInitiator::spawn(p2p_context.clone());
-        let peer_handler = PeerHandler::new(peer_table, initiator);
+        let peer_handler = PeerHandler::new(peer_table, initiator, p2p_context.discovery.clone());
 
         // Create SyncManager
         let syncer = SyncManager::new(