net: small integration test tweaks

src/net/tests.rs

@@ -31,8 +31,8 @@ use crate::{
 };
 
 // Number of nodes to spawn and number of peers each node connects to
-const N_NODES: usize = 5;
-const N_CONNS: usize = 3;
+const N_NODES: usize = 10;
+const N_CONNS: usize = 5;
 
 #[test]
 fn p2p_test() {
@@ -64,8 +64,8 @@ fn p2p_test() {
     cfg.add_filter_ignore("net::tcp".to_string());
 
     simplelog::TermLogger::init(
-        //simplelog::LevelFilter::Info,
-        simplelog::LevelFilter::Debug,
+        simplelog::LevelFilter::Info,
+        //simplelog::LevelFilter::Debug,
         //simplelog::LevelFilter::Trace,
         cfg.build(),
         simplelog::TerminalMode::Mixed,
@@ -116,13 +116,13 @@ async fn hostlist_propagation(ex: Arc<Executor<'static>>) {
     for i in 0..N_NODES {
         // Everyone will connect to N_CONNS random peers.
         let mut peers = vec![];
-        //for _ in 0..N_CONNS {
-        //    let mut port = 13200 + i;
-        //    while port == 13200 + i {
-        //        port = 13200 + rng.gen_range(0..N_NODES);
-        //    }
-        //    peers.push(Url::parse(&format!("tcp://127.0.0.1:{}", port)).unwrap());
-        //}
+        for _ in 0..N_CONNS {
+            let mut port = 13200 + i;
+            while port == 13200 + i {
+                port = 13200 + rng.gen_range(0..N_NODES);
+            }
+            peers.push(Url::parse(&format!("tcp://127.0.0.1:{}", port)).unwrap());
+        }
         let settings = Settings {
             localnet: true,
             inbound_addrs: vec![Url::parse(&format!("tcp://127.0.0.1:{}", 13200 + i)).unwrap()],
@@ -147,30 +147,30 @@ async fn hostlist_propagation(ex: Arc<Executor<'static>>) {
         p2p.clone().start().await.unwrap();
     }
 
-    //info!("Waiting until all peers connect");
-    //sleep(5).await;
+    info!("Waiting until all peers connect");
+    sleep(5).await;
 
-    //info!("Inspecting hostlists...");
-    //for p2p in p2p_instances.iter() {
-    //    let hosts = p2p.hosts();
+    info!("Inspecting hostlists...");
+    for p2p in p2p_instances.iter() {
+        let hosts = p2p.hosts();
 
-    //    let greylist = hosts.greylist.read().await;
-    //    let whitelist = hosts.whitelist.read().await;
-    //    let anchorlist = hosts.anchorlist.read().await;
+        let greylist = hosts.greylist.read().await;
+        let whitelist = hosts.whitelist.read().await;
+        let anchorlist = hosts.anchorlist.read().await;
 
-    //    info!("Node {}", p2p.settings().node_id);
-    //    for (i, (url, last_seen)) in greylist.iter().enumerate() {
-    //        info!("Greylist entry {}: {}, {}", i, url, last_seen);
-    //    }
+        info!("Node {}", p2p.settings().node_id);
+        for (i, (url, last_seen)) in greylist.iter().enumerate() {
+            info!("Greylist entry {}: {}, {}", i, url, last_seen);
+        }
 
-    //    for (i, (url, last_seen)) in whitelist.iter().enumerate() {
-    //        info!("Whitelist entry {}: {}, {}", i, url, last_seen);
-    //    }
+        for (i, (url, last_seen)) in whitelist.iter().enumerate() {
+            info!("Whitelist entry {}: {}, {}", i, url, last_seen);
+        }
 
-    //    for (i, (url, last_seen)) in anchorlist.iter().enumerate() {
-    //        info!("Anchorlist entry {}: {}, {}", i, url, last_seen);
-    //    }
-    //}
+        for (i, (url, last_seen)) in anchorlist.iter().enumerate() {
+            info!("Anchorlist entry {}: {}, {}", i, url, last_seen);
+        }
+    }
 
     // Stop the P2P network
     for p2p in p2p_instances.iter() {