Merge remote-tracking branch 'origin/release-v7.0.0' into unstable

This commit is contained in:
Michael Sproul
2025-02-24 13:59:40 +11:00
39 changed files with 195 additions and 189 deletions

View File

@@ -201,7 +201,7 @@ impl<E: EthSpec> NetworkBehaviour for PeerManager<E> {
.peers
.read()
.peer_info(&peer_id)
.map_or(true, |peer| !peer.has_future_duty())
.is_none_or(|peer| !peer.has_future_duty())
{
return Err(ConnectionDenied::new(
"Connection to peer rejected: too many connections",
@@ -240,7 +240,7 @@ impl<E: EthSpec> NetworkBehaviour for PeerManager<E> {
.peers
.read()
.peer_info(&peer_id)
.map_or(true, |peer| !peer.has_future_duty())
.is_none_or(|peer| !peer.has_future_duty())
{
return Err(ConnectionDenied::new(
"Connection to peer rejected: too many connections",