gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-04-26 01:03:40 +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

25
beacon_node/network/src/service.rs
View File

@@ -1,31 +1,31 @@
use crate::NetworkConfig;
use crate::metrics;
use crate::nat;
use crate::network_beacon_processor::InvalidBlockStorage;
use crate::persisted_dht::{clear_dht, load_dht, persist_dht};
use crate::router::{Router, RouterMessage};
use crate::subnet_service::{SubnetService, SubnetServiceMessage, Subscription};
use crate::NetworkConfig;
use beacon_chain::{BeaconChain, BeaconChainTypes};
use beacon_processor::BeaconProcessorSend;
use futures::channel::mpsc::Sender;
use futures::future::OptionFuture;
use futures::prelude::*;
use lighthouse_network::rpc::methods::RpcResponse;
use lighthouse_network::Enr;
use lighthouse_network::rpc::InboundRequestId;
use lighthouse_network::rpc::RequestType;
use lighthouse_network::rpc::methods::RpcResponse;
use lighthouse_network::service::Network;
use lighthouse_network::types::GossipKind;
use lighthouse_network::Enr;
use lighthouse_network::{prometheus_client::registry::Registry, MessageAcceptance};
use lighthouse_network::{
rpc::{GoodbyeReason, RpcErrorResponse},
Context, PeerAction, PubsubMessage, ReportSource, Response, Subnet,
rpc::{GoodbyeReason, RpcErrorResponse},
};
use lighthouse_network::{MessageAcceptance, prometheus_client::registry::Registry};
use lighthouse_network::{
service::api_types::AppRequestId,
types::{core_topics_to_subscribe, GossipEncoding, GossipTopic},
MessageId, NetworkEvent, NetworkGlobals, PeerId,
service::api_types::AppRequestId,
types::{GossipEncoding, GossipTopic, core_topics_to_subscribe},
};
use logging::crit;
use std::collections::BTreeSet;
@@ -393,13 +393,12 @@ impl<T: BeaconChainTypes> NetworkService<T> {
let mut result = vec![fork_context.context_bytes(current_epoch)];
if let Some(next_digest_epoch) = spec.next_digest_epoch(current_epoch) {
if current_slot.saturating_add(Slot::new(SUBSCRIBE_DELAY_SLOTS))
if let Some(next_digest_epoch) = spec.next_digest_epoch(current_epoch)
&& current_slot.saturating_add(Slot::new(SUBSCRIBE_DELAY_SLOTS))
>= next_digest_epoch.start_slot(T::EthSpec::slots_per_epoch())
{
let next_digest = fork_context.context_bytes(next_digest_epoch);
result.push(next_digest);
}
{
let next_digest = fork_context.context_bytes(next_digest_epoch);
result.push(next_digest);
}
result