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

Merge branch 'unstable' of https://github.com/sigp/lighthouse into merge-unstable-deneb-aug-24

Browse Source
This commit is contained in:
realbigsean
2023-08-24 14:34:32 -04:00
parent 8ed77d4550 14924dbc95
commit f90b190d9a
8 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
beacon_node/lighthouse_network/src/discovery/mod.rs
View File

@@ -647,7 +647,7 @@ impl<TSpec: EthSpec> Discovery<TSpec> {
if subnet_queries.len() == MAX_SUBNETS_IN_QUERY || self.queued_queries.is_empty() {
// This query is for searching for peers of a particular subnet
// Drain subnet_queries so we can re-use it as we continue to process the queue
let grouped_queries: Vec<SubnetQuery> = subnet_queries.drain(..).collect();
let grouped_queries: Vec<SubnetQuery> = std::mem::take(&mut subnet_queries);
self.start_subnet_query(grouped_queries);
processed = true;
}

3
beacon_node/lighthouse_network/src/peer_manager/mod.rs
View File

@@ -981,6 +981,7 @@ impl<TSpec: EthSpec> PeerManager<TSpec> {
macro_rules! prune_peers {
($filter: expr) => {
let filter = $filter;
for (peer_id, info) in self
.network_globals
.peers
@@ -988,7 +989,7 @@ impl<TSpec: EthSpec> PeerManager<TSpec> {
.worst_connected_peers()
.iter()
.filter(|(_, info)| {
!info.has_future_duty() && !info.is_trusted() && $filter(*info)
!info.has_future_duty() && !info.is_trusted() && filter(*info)
})
{
if peers_to_prune.len()