gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-03-21 13:54:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Rust Edition to 2024 (#7766)

Browse Source 
* #7749

Thanks @dknopik and @michaelsproul for your help!
This commit is contained in:
chonghe
2025-08-13 11:04:31 +08:00
committed by GitHub
parent bd6b8b6a65
commit 522bd9e9c6
468 changed files with 3594 additions and 3396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
beacon_node/lighthouse_network/src/peer_manager/peerdb/client.rs
View File

@@ -127,12 +127,12 @@ fn client_from_agent_version(agent_version: &str) -> (ClientKind, String, String
}
Some("teku") => {
let kind = ClientKind::Teku;
if agent_split.next().is_some() {
if let Some(agent_version) = agent_split.next() {
version = agent_version.into();
if let Some(agent_os_version) = agent_split.next() {
os_version = agent_os_version.into();
}
if agent_split.next().is_some()
&& let Some(agent_version) = agent_split.next()
{
version = agent_version.into();
if let Some(agent_os_version) = agent_split.next() {
os_version = agent_os_version.into();
}
}
(kind, version, os_version)
@@ -143,24 +143,24 @@ fn client_from_agent_version(agent_version: &str) -> (ClientKind, String, String
}
Some("Prysm") => {
let kind = ClientKind::Prysm;
if agent_split.next().is_some() {
if let Some(agent_version) = agent_split.next() {
version = agent_version.into();
if let Some(agent_os_version) = agent_split.next() {
os_version = agent_os_version.into();
}
if agent_split.next().is_some()
&& let Some(agent_version) = agent_split.next()
{
version = agent_version.into();
if let Some(agent_os_version) = agent_split.next() {
os_version = agent_os_version.into();
}
}
(kind, version, os_version)
}
Some("nimbus") => {
let kind = ClientKind::Nimbus;
if agent_split.next().is_some() {
if let Some(agent_version) = agent_split.next() {
version = agent_version.into();
if let Some(agent_os_version) = agent_split.next() {
os_version = agent_os_version.into();
}
if agent_split.next().is_some()
&& let Some(agent_version) = agent_split.next()
{
version = agent_version.into();
if let Some(agent_os_version) = agent_split.next() {
os_version = agent_os_version.into();
}
}
(kind, version, os_version)

38
beacon_node/lighthouse_network/src/peer_manager/peerdb/peer_info.rs
View File

@@ -3,19 +3,19 @@ use super::score::{PeerAction, Score, ScoreState};
use super::sync_status::SyncStatus;
use crate::discovery::Eth2Enr;
use crate::{rpc::MetaData, types::Subnet};
use PeerConnectionStatus::*;
use discv5::Enr;
use eth2::types::{PeerDirection, PeerState};
use libp2p::core::multiaddr::{Multiaddr, Protocol};
use serde::{
ser::{SerializeStruct, Serializer},
Serialize,
ser::{SerializeStruct, Serializer},
};
use std::collections::HashSet;
use std::net::IpAddr;
use std::time::Instant;
use strum::AsRefStr;
use types::{DataColumnSubnetId, EthSpec};
use PeerConnectionStatus::*;
/// Information about a given connected peer.
#[derive(Clone, Debug, Serialize)]
@@ -95,15 +95,15 @@ impl<E: EthSpec> PeerInfo<E> {
if let Some(meta_data) = &self.meta_data {
match subnet {
Subnet::Attestation(id) => {
return meta_data.attnets().get(**id as usize).unwrap_or(false)
return meta_data.attnets().get(**id as usize).unwrap_or(false);
}
Subnet::SyncCommittee(id) => {
return meta_data
.syncnets()
.is_ok_and(|s| s.get(**id as usize).unwrap_or(false))
.is_ok_and(|s| s.get(**id as usize).unwrap_or(false));
}
Subnet::DataColumn(subnet_id) => {
return self.is_assigned_to_custody_subnet(subnet_id)
return self.is_assigned_to_custody_subnet(subnet_id);
}
}
}
@@ -179,10 +179,10 @@ impl<E: EthSpec> PeerInfo<E> {
pub fn long_lived_subnet_count(&self) -> usize {
if let Some(meta_data) = self.meta_data.as_ref() {
return meta_data.attnets().num_set_bits();
} else if let Some(enr) = self.enr.as_ref() {
if let Ok(attnets) = enr.attestation_bitfield::<E>() {
return attnets.num_set_bits();
}
} else if let Some(enr) = self.enr.as_ref()
&& let Ok(attnets) = enr.attestation_bitfield::<E>()
{
return attnets.num_set_bits();
}
0
}
@@ -247,20 +247,20 @@ impl<E: EthSpec> PeerInfo<E> {
if !meta_data.attnets().is_zero() && !self.subnets.is_empty() {
return true;
}
if let Ok(sync) = meta_data.syncnets() {
if !sync.is_zero() {
return true;
}
if let Ok(sync) = meta_data.syncnets()
&& !sync.is_zero()
{
return true;
}
}
// We may not have the metadata but may have an ENR. Lets check that
if let Some(enr) = self.enr.as_ref() {
if let Ok(attnets) = enr.attestation_bitfield::<E>() {
if !attnets.is_zero() && !self.subnets.is_empty() {
return true;
}
}
if let Some(enr) = self.enr.as_ref()
&& let Ok(attnets) = enr.attestation_bitfield::<E>()
&& !attnets.is_zero()
&& !self.subnets.is_empty()
{
return true;
}
false
}

6
beacon_node/lighthouse_network/src/peer_manager/peerdb/score.rs
View File

@@ -332,11 +332,7 @@ impl Score {
Some(v) => {
// Only reverse when none of the items is NAN,
// so that NAN's are never considered.
if reverse {
v.reverse()
} else {
v
}
if reverse { v.reverse() } else { v }
}
None if self.score().is_nan() && !other.score().is_nan() => Ordering::Less,
None if !self.score().is_nan() && other.score().is_nan() => Ordering::Greater,