session: don't add manual peers to hostlist

By extension, don't share manual peers with other nodes on the network.

This commit also updates the net integration test.

src/net/session/mod.rs

@@ -71,7 +71,7 @@ pub async fn remove_sub_on_stop(p2p: P2pPtr, channel: ChannelPtr, type_id: Sessi
     );
 
     // Downgrade to greylist this is a outbound or manual session.
-    if type_id & (SESSION_MANUAL | SESSION_OUTBOUND) != 0 {
+    if type_id & SESSION_OUTBOUND != 0 {
         debug!(
             target: "net::session::remove_sub_on_stop()",
             "Downgrading {}", addr,
@@ -164,8 +164,8 @@ pub trait Session: Sync {
         // Perform handshake
         protocol_version.run(executor.clone()).await?;
 
-        // Upgrade to goldlist if this is a outbound or manual session.
-        if self.type_id() & (SESSION_MANUAL | SESSION_OUTBOUND) != 0 {
+        // Upgrade to goldlist if this is a outbound session.
+        if self.type_id() & SESSION_OUTBOUND != 0 {
             debug!(
                 target: "net::session::perform_handshake_protocols()",
                 "Upgrading {}", channel.address(),

src/net/tests.rs

@@ -191,7 +191,6 @@ async fn get_random_gold_host(
     info!("========================================================");
 
     let list = hosts.container.hostlists[HostColor::Gold as usize].read().await;
-    // TODO: This assert fails ~10% of the time. Need to figure out why.
     assert!(!list.is_empty());
     let position = rand::thread_rng().gen_range(0..list.len());
     let entry = &list[position];
@@ -334,6 +333,11 @@ async fn p2p_test_real(ex: Arc<Executor<'static>>) {
     info!("Peer successfully received addrs!");
     info!("========================================================");
 
+    info!("========================================================");
+    info!("Waiting 5s for outbound loop to connect...");
+    info!("========================================================");
+    sleep(5).await;
+
     // ===========================================================
     // 6. Select a random gold peer from one of the nodes and kill
     //    it.
@@ -393,39 +397,12 @@ async fn p2p_test_real(ex: Arc<Executor<'static>>) {
     info!("========================================================");
 
     for p2p in manual_instances.clone() {
-        let goldlist = p2p.hosts().container.fetch_all(HostColor::Gold).await;
-        assert!(goldlist.len() == N_CONNS);
+        // We should have (N_CONNS outbound + N_CONNS inbound)
+        // connections at this point.
+        let channels = p2p.hosts().channels().await;
+        assert!(channels.len() == N_CONNS * 2);
     }
 
-    info!("========================================================");
-    info!("Manual session connected successfully!");
-    info!("========================================================");
-
-    info!("========================================================");
-    info!("Selecting a random gold entry...");
-    info!("========================================================");
-
-    let random_node_index = rand::thread_rng().gen_range(0..manual_instances.len());
-    let ((addr, _), _) = get_random_gold_host(&manual_instances, random_node_index).await;
-
-    kill_node(&manual_instances, addr.clone()).await;
-
-    info!("========================================================");
-    info!("Waiting for greylist downgrade sequence to occur...");
-    info!("========================================================");
-
-    // ===========================================================
-    // 7. Verify the peer has been removed from the Gold list.
-    // ===========================================================
-    manual_instances[random_node_index]
-        .hosts()
-        .container
-        .contains(HostColor::Grey as usize, &addr)
-        .await;
-    info!("========================================================");
-    info!("Greylist downgrade occured successfully!");
-    info!("========================================================");
-
     info!("========================================================");
     info!("Manual session successful! Shutting down manual test...");
     info!("========================================================");