consensus/dht: removed seed filtering

src/consensus/task/block_sync.rs

@@ -10,57 +10,45 @@ use log::{debug, info, warn};
 /// async task used for block syncing.
 pub async fn block_sync_task(p2p: net::P2pPtr, state: ValidatorStatePtr) -> Result<()> {
     info!("Starting blockchain sync...");
-    // We retrieve p2p network connected channels, so we can use it to
+    // we retrieve p2p network connected channels, so we can use it to
     // parallelize downloads.
-    let seeds = p2p.settings().seeds.clone();
-    let channels_map = p2p.channels().lock().await;
-    let values = channels_map.values();
     // Using len here because is_empty() uses unstable library feature
     // called 'exact_size_is_empty'.
-    if values.len() != 0 {
-        // Node iterates the channel peers to ask for their consensus state
-        for channel in values {
-            // Filtering seed channel, as they don't have registered protocols
-            if seeds.contains(&channel.address()) {
-                debug!("Seed channel, continuing..");
-                continue
+    if p2p.channels().lock().await.values().len() != 0 {
+        // Currently we will just use the last channel
+        let channel = p2p.channels().lock().await.values().last().unwrap().clone();
+
+        // Communication setup
+        let msg_subsystem = channel.get_message_subsystem();
+        msg_subsystem.add_dispatch::<BlockResponse>().await;
+        let response_sub = channel.subscribe_msg::<BlockResponse>().await?;
+
+        // Node sends the last known block hash of the canonical blockchain
+        // and loops until the response is the same block (used to utilize
+        // batch requests).
+        let mut last = state.read().await.blockchain.last()?;
+        info!("Last known block: {:?} - {:?}", last.0, last.1);
+
+        loop {
+            // Node creates a `BlockOrder` and sends it
+            let order = BlockOrder { slot: last.0, block: last.1 };
+            channel.send(order).await?;
+
+            // Node stores response data.
+            let resp = response_sub.receive().await?;
+
+            // Verify and store retrieved blocks
+            debug!("block_sync_task(): Processing received blocks");
+            state.write().await.receive_sync_blocks(&resp.blocks).await?;
+
+            let last_received = state.read().await.blockchain.last()?;
+            info!("Last received block: {:?} - {:?}", last_received.0, last_received.1);
+
+            if last == last_received {
+                break
             }
 
-            // Communication setup
-            let msg_subsystem = channel.get_message_subsystem();
-            msg_subsystem.add_dispatch::<BlockResponse>().await;
-            let response_sub = channel.subscribe_msg::<BlockResponse>().await?;
-
-            // Node sends the last known block hash of the canonical blockchain
-            // and loops until the response is the same block (used to utilize
-            // batch requests).
-            let mut last = state.read().await.blockchain.last()?;
-            info!("Last known block: {:?} - {:?}", last.0, last.1);
-
-            loop {
-                // Node creates a `BlockOrder` and sends it
-                let order = BlockOrder { slot: last.0, block: last.1 };
-                channel.send(order).await?;
-
-                // Node stores response data.
-                let resp = response_sub.receive().await?;
-
-                // Verify and store retrieved blocks
-                debug!("block_sync_task(): Processing received blocks");
-                state.write().await.receive_sync_blocks(&resp.blocks).await?;
-
-                let last_received = state.read().await.blockchain.last()?;
-                info!("Last received block: {:?} - {:?}", last_received.0, last_received.1);
-
-                if last == last_received {
-                    break
-                }
-
-                last = last_received;
-            }
-
-            // Currently we use the first channel we connect to
-            break
+            last = last_received;
         }
     } else {
         warn!("Node is not connected to other nodes");

src/consensus/task/consensus_sync.rs

@@ -1,4 +1,4 @@
-use log::{debug, info, warn};
+use log::{info, warn};
 
 use crate::{
     consensus::{
@@ -12,7 +12,6 @@ use crate::{
 /// async task used for consensus state syncing.
 pub async fn consensus_sync_task(p2p: P2pPtr, state: ValidatorStatePtr) -> Result<()> {
     info!("Starting consensus state sync...");
-    let seeds = p2p.settings().seeds.clone();
     let channels_map = p2p.channels().lock().await;
     let values = channels_map.values();
     // Using len here because is_empty() uses unstable library feature
@@ -20,12 +19,6 @@ pub async fn consensus_sync_task(p2p: P2pPtr, state: ValidatorStatePtr) -> Resul
     if values.len() != 0 {
         // Node iterates the channel peers to ask for their consensus state
         for channel in values {
-            // Filtering seed channel, as they don't have registered protocols
-            if seeds.contains(&channel.address()) {
-                debug!("Seed channel, continuing..");
-                continue
-            }
-
             // Communication setup
             let msg_subsystem = channel.get_message_subsystem();
             msg_subsystem.add_dispatch::<ConsensusResponse>().await;

src/dht/dht.rs

@@ -221,7 +221,6 @@ impl Dht {
     /// Auxilary function to sync lookup map with network
     pub async fn sync_lookup_map(&mut self) -> Result<()> {
         debug!("Starting lookup map sync...");
-        let seeds = self.p2p.settings().seeds.clone();
         let channels_map = self.p2p.channels().lock().await.clone();
         let values = channels_map.values();
         // Using len here because is_empty() uses unstable library feature
@@ -229,12 +228,6 @@ impl Dht {
         if values.len() != 0 {
             // Node iterates the channel peers to ask for their lookup map
             for channel in values {
-                // Filtering seed channel, as they don't have registered protocols
-                if seeds.contains(&channel.address()) {
-                    debug!("Seed channel, continuing..");
-                    continue
-                }
-
                 // Communication setup
                 let msg_subsystem = channel.get_message_subsystem();
                 msg_subsystem.add_dispatch::<LookupMapResponse>().await;