Update Rust Edition to 2024 (#7766)

* #7749

Thanks @dknopik and @michaelsproul for your help!

beacon_node/lighthouse_network/src/discovery/enr.rs

@@ -2,11 +2,11 @@
 
 pub use discv5::enr::CombinedKey;
 
-use super::enr_ext::CombinedKeyExt;
-use super::enr_ext::{EnrExt, QUIC6_ENR_KEY, QUIC_ENR_KEY};
 use super::ENR_FILENAME;
-use crate::types::{Enr, EnrAttestationBitfield, EnrSyncCommitteeBitfield};
+use super::enr_ext::CombinedKeyExt;
+use super::enr_ext::{EnrExt, QUIC_ENR_KEY, QUIC6_ENR_KEY};
 use crate::NetworkConfig;
+use crate::types::{Enr, EnrAttestationBitfield, EnrSyncCommitteeBitfield};
 use alloy_rlp::bytes::Bytes;
 use libp2p::identity::Keypair;
 use lighthouse_version::{client_name, version};

beacon_node/lighthouse_network/src/discovery/enr_ext.rs

@@ -3,7 +3,7 @@
 use crate::{Enr, Multiaddr, PeerId};
 use discv5::enr::{CombinedKey, CombinedPublicKey};
 use libp2p::core::multiaddr::Protocol;
-use libp2p::identity::{ed25519, secp256k1, KeyType, Keypair, PublicKey};
+use libp2p::identity::{KeyType, Keypair, PublicKey, ed25519, secp256k1};
 use tiny_keccak::{Hasher, Keccak};
 
 pub const QUIC_ENR_KEY: &str = "quic";
@@ -164,21 +164,21 @@ impl EnrExt for Enr {
     fn multiaddr_p2p_tcp(&self) -> Vec<Multiaddr> {
         let peer_id = self.peer_id();
         let mut multiaddrs: Vec<Multiaddr> = Vec::new();
-        if let Some(ip) = self.ip4() {
-            if let Some(tcp) = self.tcp4() {
-                let mut multiaddr: Multiaddr = ip.into();
-                multiaddr.push(Protocol::Tcp(tcp));
-                multiaddr.push(Protocol::P2p(peer_id));
-                multiaddrs.push(multiaddr);
-            }
+        if let Some(ip) = self.ip4()
+            && let Some(tcp) = self.tcp4()
+        {
+            let mut multiaddr: Multiaddr = ip.into();
+            multiaddr.push(Protocol::Tcp(tcp));
+            multiaddr.push(Protocol::P2p(peer_id));
+            multiaddrs.push(multiaddr);
         }
-        if let Some(ip6) = self.ip6() {
-            if let Some(tcp6) = self.tcp6() {
-                let mut multiaddr: Multiaddr = ip6.into();
-                multiaddr.push(Protocol::Tcp(tcp6));
-                multiaddr.push(Protocol::P2p(peer_id));
-                multiaddrs.push(multiaddr);
-            }
+        if let Some(ip6) = self.ip6()
+            && let Some(tcp6) = self.tcp6()
+        {
+            let mut multiaddr: Multiaddr = ip6.into();
+            multiaddr.push(Protocol::Tcp(tcp6));
+            multiaddr.push(Protocol::P2p(peer_id));
+            multiaddrs.push(multiaddr);
         }
         multiaddrs
     }
@@ -190,21 +190,21 @@ impl EnrExt for Enr {
     fn multiaddr_p2p_udp(&self) -> Vec<Multiaddr> {
         let peer_id = self.peer_id();
         let mut multiaddrs: Vec<Multiaddr> = Vec::new();
-        if let Some(ip) = self.ip4() {
-            if let Some(udp) = self.udp4() {
-                let mut multiaddr: Multiaddr = ip.into();
-                multiaddr.push(Protocol::Udp(udp));
-                multiaddr.push(Protocol::P2p(peer_id));
-                multiaddrs.push(multiaddr);
-            }
+        if let Some(ip) = self.ip4()
+            && let Some(udp) = self.udp4()
+        {
+            let mut multiaddr: Multiaddr = ip.into();
+            multiaddr.push(Protocol::Udp(udp));
+            multiaddr.push(Protocol::P2p(peer_id));
+            multiaddrs.push(multiaddr);
         }
-        if let Some(ip6) = self.ip6() {
-            if let Some(udp6) = self.udp6() {
-                let mut multiaddr: Multiaddr = ip6.into();
-                multiaddr.push(Protocol::Udp(udp6));
-                multiaddr.push(Protocol::P2p(peer_id));
-                multiaddrs.push(multiaddr);
-            }
+        if let Some(ip6) = self.ip6()
+            && let Some(udp6) = self.udp6()
+        {
+            let mut multiaddr: Multiaddr = ip6.into();
+            multiaddr.push(Protocol::Udp(udp6));
+            multiaddr.push(Protocol::P2p(peer_id));
+            multiaddrs.push(multiaddr);
         }
         multiaddrs
     }
@@ -212,22 +212,22 @@ impl EnrExt for Enr {
     /// Returns a list of multiaddrs if the ENR has an `ip` and a `quic` key **or** an `ip6` and a `quic6`.
     fn multiaddr_quic(&self) -> Vec<Multiaddr> {
         let mut multiaddrs: Vec<Multiaddr> = Vec::new();
-        if let Some(quic_port) = self.quic4() {
-            if let Some(ip) = self.ip4() {
-                let mut multiaddr: Multiaddr = ip.into();
-                multiaddr.push(Protocol::Udp(quic_port));
-                multiaddr.push(Protocol::QuicV1);
-                multiaddrs.push(multiaddr);
-            }
+        if let Some(quic_port) = self.quic4()
+            && let Some(ip) = self.ip4()
+        {
+            let mut multiaddr: Multiaddr = ip.into();
+            multiaddr.push(Protocol::Udp(quic_port));
+            multiaddr.push(Protocol::QuicV1);
+            multiaddrs.push(multiaddr);
         }
 
-        if let Some(quic6_port) = self.quic6() {
-            if let Some(ip6) = self.ip6() {
-                let mut multiaddr: Multiaddr = ip6.into();
-                multiaddr.push(Protocol::Udp(quic6_port));
-                multiaddr.push(Protocol::QuicV1);
-                multiaddrs.push(multiaddr);
-            }
+        if let Some(quic6_port) = self.quic6()
+            && let Some(ip6) = self.ip6()
+        {
+            let mut multiaddr: Multiaddr = ip6.into();
+            multiaddr.push(Protocol::Udp(quic6_port));
+            multiaddr.push(Protocol::QuicV1);
+            multiaddrs.push(multiaddr);
         }
         multiaddrs
     }
@@ -235,19 +235,19 @@ impl EnrExt for Enr {
     /// Returns a list of multiaddrs if the ENR has an `ip` and either a `tcp` or `udp` key **or** an `ip6` and either a `tcp6` or `udp6`.
     fn multiaddr_tcp(&self) -> Vec<Multiaddr> {
         let mut multiaddrs: Vec<Multiaddr> = Vec::new();
-        if let Some(ip) = self.ip4() {
-            if let Some(tcp) = self.tcp4() {
-                let mut multiaddr: Multiaddr = ip.into();
-                multiaddr.push(Protocol::Tcp(tcp));
-                multiaddrs.push(multiaddr);
-            }
+        if let Some(ip) = self.ip4()
+            && let Some(tcp) = self.tcp4()
+        {
+            let mut multiaddr: Multiaddr = ip.into();
+            multiaddr.push(Protocol::Tcp(tcp));
+            multiaddrs.push(multiaddr);
         }
-        if let Some(ip6) = self.ip6() {
-            if let Some(tcp6) = self.tcp6() {
-                let mut multiaddr: Multiaddr = ip6.into();
-                multiaddr.push(Protocol::Tcp(tcp6));
-                multiaddrs.push(multiaddr);
-            }
+        if let Some(ip6) = self.ip6()
+            && let Some(tcp6) = self.tcp6()
+        {
+            let mut multiaddr: Multiaddr = ip6.into();
+            multiaddr.push(Protocol::Tcp(tcp6));
+            multiaddrs.push(multiaddr);
         }
         multiaddrs
     }

beacon_node/lighthouse_network/src/discovery/mod.rs

@@ -8,11 +8,11 @@ pub mod enr_ext;
 
 // Allow external use of the lighthouse ENR builder
 use crate::service::TARGET_SUBNET_PEERS;
-use crate::{metrics, ClearDialError};
+use crate::{ClearDialError, metrics};
 use crate::{Enr, NetworkConfig, NetworkGlobals, Subnet, SubnetDiscovery};
-use discv5::{enr::NodeId, Discv5};
-pub use enr::{build_enr, load_enr_from_disk, use_or_load_enr, CombinedKey, Eth2Enr};
-pub use enr_ext::{peer_id_to_node_id, CombinedKeyExt, EnrExt};
+use discv5::{Discv5, enr::NodeId};
+pub use enr::{CombinedKey, Eth2Enr, build_enr, load_enr_from_disk, use_or_load_enr};
+pub use enr_ext::{CombinedKeyExt, EnrExt, peer_id_to_node_id};
 pub use libp2p::identity::{Keypair, PublicKey};
 
 use alloy_rlp::bytes::Bytes;
@@ -21,14 +21,14 @@ use futures::prelude::*;
 use futures::stream::FuturesUnordered;
 use libp2p::core::transport::PortUse;
 use libp2p::multiaddr::Protocol;
-use libp2p::swarm::behaviour::{DialFailure, FromSwarm};
 use libp2p::swarm::THandlerInEvent;
+use libp2p::swarm::behaviour::{DialFailure, FromSwarm};
 pub use libp2p::{
-    core::{transport::ListenerId, ConnectedPoint, Multiaddr},
+    core::{ConnectedPoint, Multiaddr, transport::ListenerId},
     identity::PeerId,
     swarm::{
-        dummy::ConnectionHandler, ConnectionId, DialError, NetworkBehaviour, NotifyHandler,
-        SubstreamProtocol, ToSwarm,
+        ConnectionId, DialError, NetworkBehaviour, NotifyHandler, SubstreamProtocol, ToSwarm,
+        dummy::ConnectionHandler,
     },
 };
 use logging::crit;
@@ -1132,7 +1132,10 @@ impl<E: EthSpec> NetworkBehaviour for Discovery<E> {
                             self.update_enr_quic_port(port, false)
                         }
                         _ => {
-                            debug!(?addr, "Encountered unacceptable multiaddr for listening (unsupported transport)");
+                            debug!(
+                                ?addr,
+                                "Encountered unacceptable multiaddr for listening (unsupported transport)"
+                            );
                             return;
                         }
                     },
@@ -1154,7 +1157,10 @@ impl<E: EthSpec> NetworkBehaviour for Discovery<E> {
                             self.update_enr_quic_port(port, true)
                         }
                         _ => {
-                            debug!(?addr, "Encountered unacceptable multiaddr for listening (unsupported transport)");
+                            debug!(
+                                ?addr,
+                                "Encountered unacceptable multiaddr for listening (unsupported transport)"
+                            );
                             return;
                         }
                     },

beacon_node/lighthouse_network/src/discovery/subnet_predicate.rs

@@ -3,8 +3,8 @@ use super::*;
 use crate::types::{EnrAttestationBitfield, EnrSyncCommitteeBitfield};
 use std::ops::Deref;
 use tracing::trace;
-use types::data_column_custody_group::compute_subnets_for_node;
 use types::ChainSpec;
+use types::data_column_custody_group::compute_subnets_for_node;
 
 /// Returns the predicate for a given subnet.
 pub fn subnet_predicate<E>(