jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix the peer removal expect

Browse Source
This commit is contained in:
kamalbuilds
2025-08-25 03:38:05 +05:30
parent edd5383e43
commit 4e88d19747
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
crates/net/network/src/network.rs
View File

@ -149,7 +149,7 @@ impl<N: NetworkPrimitives> NetworkHandle<N> {
pub async fn transactions_handle(&self) -> Option<TransactionsHandle<N>> { pub async fn transactions_handle(&self) -> Option<TransactionsHandle<N>> {
let (tx, rx) = oneshot::channel(); let (tx, rx) = oneshot::channel();
let _ = self.manager().send(NetworkHandleMessage::GetTransactionsHandle(tx)); let _ = self.manager().send(NetworkHandleMessage::GetTransactionsHandle(tx));
rx.await.unwrap() rx.await.ok().flatten()
} }
/// Send message to gracefully shutdown node. /// Send message to gracefully shutdown node.
@ -266,7 +266,8 @@ impl<N: NetworkPrimitives> PeersInfo for NetworkHandle<N> {
builder.udp6(local_node_record.udp_port); builder.udp6(local_node_record.udp_port);
builder.tcp6(local_node_record.tcp_port); builder.tcp6(local_node_record.tcp_port);
} }
builder.build(&self.inner.secret_key).expect("valid enr") builder.build(&self.inner.secret_key)
.expect("ENR builder should always succeed with valid IP and ports")
} }
} }

7
crates/net/network/src/peers.rs
View File

@ -647,8 +647,11 @@ impl PeersManager {
// remove peer if it has been marked for removal // remove peer if it has been marked for removal
if remove_peer { if remove_peer {
let (peer_id, _) = self.peers.remove_entry(peer_id).expect("peer must exist"); if let Some((peer_id, _)) = self.peers.remove_entry(peer_id) {
self.queued_actions.push_back(PeerAction::PeerRemoved(peer_id)); self.queued_actions.push_back(PeerAction::PeerRemoved(peer_id));
} else {
tracing::warn!(target: "net::peers", "Attempted to remove non-existent peer: {:?}", peer_id);
}
} else if let Some(backoff_until) = backoff_until { } else if let Some(backoff_until) = backoff_until {
// otherwise, backoff the peer if marked as such // otherwise, backoff the peer if marked as such
self.backoff_peer_until(*peer_id, backoff_until); self.backoff_peer_until(*peer_id, backoff_until);

4
crates/net/network/src/session/active.rs
View File

@ -391,7 +391,7 @@ impl<N: NetworkPrimitives> ActiveSession<N> {
}; };
self.terminate_message = Some((self.to_session_manager.inner().clone(), msg)); self.terminate_message = Some((self.to_session_manager.inner().clone(), msg));
self.poll_terminate_message(cx).expect("message is set") self.poll_terminate_message(cx).unwrap_or(Poll::Ready(()))
} }
/// Report back that this session has been closed due to an error /// Report back that this session has been closed due to an error
@ -402,7 +402,7 @@ impl<N: NetworkPrimitives> ActiveSession<N> {
error, error,
}; };
self.terminate_message = Some((self.to_session_manager.inner().clone(), msg)); self.terminate_message = Some((self.to_session_manager.inner().clone(), msg));
self.poll_terminate_message(cx).expect("message is set") self.poll_terminate_message(cx).unwrap_or(Poll::Ready(()))
} }
/// Starts the disconnect process /// Starts the disconnect process