refactor(iroh-net): Delete some unused testing infrastructure

iroh-net/src/netcheck.rs

@@ -383,10 +383,6 @@ struct Actor {
     reports: Reports,
 
     // Actor configuration.
-    /// Whether the client should try to reach things other than localhost.
-    ///
-    /// This is set to true in tests to avoid probing the local LAN's router, etc.
-    skip_external_network: bool,
     /// The port mapper client, if those are requested.
     ///
     /// The port mapper is responsible for talking to routers via UPnP and the like to try
@@ -414,7 +410,6 @@ impl Actor {
             receiver,
             sender,
             reports: Default::default(),
-            skip_external_network: false,
             port_mapper,
             in_flight_stun_requests: Default::default(),
             current_report_run: None,
@@ -516,7 +511,6 @@ impl Actor {
             self.addr(),
             self.reports.last.clone(),
             self.port_mapper.clone(),
-            self.skip_external_network,
             derp_map,
             stun_sock_v4,
             stun_sock_v6,

iroh-net/src/netcheck/reportgen.rs

@@ -83,7 +83,6 @@ impl Client {
         netcheck: netcheck::Addr,
         last_report: Option<Arc<Report>>,
         port_mapper: Option<portmapper::Client>,
-        skip_external_network: bool,
         derp_map: DerpMap,
         stun_sock4: Option<Arc<UdpSocket>>,
         stun_sock6: Option<Arc<UdpSocket>>,
@@ -99,7 +98,6 @@ impl Client {
             netcheck: netcheck.clone(),
             last_report,
             port_mapper,
-            skip_external_network,
             incremental,
             derp_map,
             stun_sock4,
@@ -170,7 +168,6 @@ struct Actor {
     last_report: Option<Arc<Report>>,
     /// The portmapper client, if there is one.
     port_mapper: Option<portmapper::Client>,
-    skip_external_network: bool,
     /// The DERP configuration.
     derp_map: DerpMap,
     /// Socket to send IPv4 STUN requests from.
@@ -226,7 +223,6 @@ impl Actor {
     async fn run_inner(&mut self) -> Result<()> {
         debug!(
             port_mapper = %self.port_mapper.is_some(),
-            skip_external_network=%self.skip_external_network,
             "reportstate actor starting",
         );
 
@@ -266,7 +262,6 @@ impl Actor {
                     self.report.portmap_probe = pm;
                     port_mapping.inner = None;
                     self.outstanding_tasks.port_mapper = false;
-                    trace!("portmapper future done");
                 }
 
                 // Check for probes finishing.
@@ -418,10 +413,11 @@ impl Actor {
         // duration of the slowest derp. For initial ones, double that.
         let enough_derps = std::cmp::min(self.derp_map.len(), ENOUGH_NODES);
         if self.report.derp_latency.len() == enough_derps {
-            let mut timeout = self.report.derp_latency.max_latency();
-            if !self.incremental {
-                timeout *= 2;
-            }
+            let timeout = self.report.derp_latency.max_latency();
+            let timeout = match self.incremental {
+                true => timeout,
+                false => timeout * 2,
+            };
             let reportcheck = self.addr();
             debug!(
                 reports=self.report.derp_latency.len(),
@@ -474,12 +470,13 @@ impl Actor {
     /// Stops further probes.
     ///
     /// This makes sure that no further probes are run and also cancels the captive portal
-    /// task if there were successful probes.  Be sure to only handle this after all the
-    /// required [`ProbeReport`]s have been processed.
+    /// and portmapper tasks if there were successful probes.  Be sure to only handle this
+    /// after all the required [`ProbeReport`]s have been processed.
     fn handle_abort_probes(&mut self) {
         trace!("handle abort probes");
         self.outstanding_tasks.probes = false;
         if self.report.udp {
+            self.outstanding_tasks.port_mapper = false;
             self.outstanding_tasks.captive_task = false;
         }
     }
@@ -491,23 +488,21 @@ impl Actor {
         &mut self,
     ) -> MaybeFuture<Pin<Box<impl Future<Output = Option<portmapper::ProbeOutput>>>>> {
         let mut port_mapping = MaybeFuture::default();
-        if !self.skip_external_network {
-            if let Some(port_mapper) = self.port_mapper.clone() {
-                port_mapping.inner = Some(Box::pin(async move {
-                    match port_mapper.probe().await {
-                        Ok(Ok(res)) => Some(res),
-                        Ok(Err(err)) => {
-                            warn!("skipping port mapping: {err:?}");
-                            None
-                        }
-                        Err(recv_err) => {
-                            warn!("skipping port mapping: {recv_err:?}");
-                            None
-                        }
+        if let Some(port_mapper) = self.port_mapper.clone() {
+            port_mapping.inner = Some(Box::pin(async move {
+                match port_mapper.probe().await {
+                    Ok(Ok(res)) => Some(res),
+                    Ok(Err(err)) => {
+                        warn!("skipping port mapping: {err:?}");
+                        None
                     }
-                }));
-                self.outstanding_tasks.port_mapper = true;
-            }
+                    Err(recv_err) => {
+                        warn!("skipping port mapping: {recv_err:?}");
+                        None
+                    }
+                }
+            }));
+            self.outstanding_tasks.port_mapper = true;
         }
         port_mapping
     }