address review

sigp · Jan 22, 2024 · adf2796 · adf2796
1 parent 76d3963
commit adf2796
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/beacon_node/lighthouse_network/src/service/mod.rs b/beacon_node/lighthouse_network/src/service/mod.rs
@@ -1582,7 +1582,7 @@ impl<AppReqId: ReqId, TSpec: EthSpec> Network<AppReqId, TSpec> {
         }
     }
 
-    fn parse_upnp_event(&mut self, event: libp2p::upnp::Event) {
+    fn inject_upnp_event(&mut self, event: libp2p::upnp::Event) {
         match event {
             libp2p::upnp::Event::NewExternalAddr(addr) => {
                 info!(self.log, "UPnP route established"; "addr" => %addr);
@@ -1646,7 +1646,7 @@ impl<AppReqId: ReqId, TSpec: EthSpec> Network<AppReqId, TSpec> {
                     BehaviourEvent::Identify(ie) => self.inject_identify_event(ie),
                     BehaviourEvent::PeerManager(pe) => self.inject_pm_event(pe),
                     BehaviourEvent::Upnp(e) => {
-                        self.parse_upnp_event(e);
+                        self.inject_upnp_event(e);
                         None
                     }
                     BehaviourEvent::ConnectionLimits(le) => void::unreachable(le),

diff --git a/beacon_node/lighthouse_network/src/service/utils.rs b/beacon_node/lighthouse_network/src/service/utils.rs
@@ -7,7 +7,7 @@ use crate::{GossipTopic, NetworkConfig};
 use futures::future::Either;
 use libp2p::core::{multiaddr::Multiaddr, muxing::StreamMuxerBox, transport::Boxed};
 use libp2p::identity::{secp256k1, Keypair};
-use libp2p::{core, gossipsub, noise, yamux, PeerId, Transport, TransportExt};
+use libp2p::{core, gossipsub, noise, yamux, PeerId, Transport};
 use prometheus_client::registry::Registry;
 use slog::{debug, warn};
 use ssz::Decode;
@@ -62,8 +62,7 @@ pub fn build_transport(
         // Enables Quic
         // The default quic configuration suits us for now.
         let quic_config = libp2p::quic::Config::new(&local_private_key);
-        let (quic, quic_bandwidth) =
-            libp2p::quic::tokio::Transport::new(quic_config).with_bandwidth_logging();
+        let quic = libp2p::quic::tokio::Transport::new(quic_config);
         let transport = tcp
             .or_transport(quic)
             .map(|either_output, _| match either_output {

diff --git a/beacon_node/network/src/nat.rs b/beacon_node/network/src/nat.rs
@@ -37,7 +37,10 @@ pub async fn construct_upnp_mappings(
     };
 
     if is_private {
-        bail!("Gateway's external address is a private address: {external_address}");
+        bail!(
+            "Gateway's external address is a private address: {}",
+            external_address
+        );
     }
 
     loop {
@@ -50,7 +53,7 @@ pub async fn construct_upnp_mappings(
                 "Lighthouse Discovery port",
             )
             .await
-            .context("Could not UPnP map port: {port} on the gateway")?;
+            .context("Could not UPnP map port: {} on the gateway", port)?;
         debug!(log, "Discovery UPnP port mapped"; "port" => %port);
         sleep(Duration::from_secs(MAPPING_TIMEOUT)).await;
     }

diff --git a/beacon_node/network/src/service.rs b/beacon_node/network/src/service.rs
@@ -229,7 +229,11 @@ impl<T: BeaconChainTypes> NetworkService<T> {
             "Backfill is disabled. DO NOT RUN IN PRODUCTION"
         );
 
-        if let (true, Some(v4)) = (config.upnp_enabled, config.listen_addrs().v4()) {
+        if let (true, false, Some(v4)) = (
+            config.upnp_enabled,
+            config.disable_discovery,
+            config.listen_addrs().v4(),
+        ) {
             let nw = network_log.clone();
             let v4 = v4.clone();
             tokio::spawn(async move {