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

Improve rpc logic (#6400)

Browse Source 
* update rpc imports to be explicit

* avoid exposing HandlerEvent outside RPC

it's unnecessary.

* handle Pongs at RPC handler level
This commit is contained in:
João Oliveira
2024-09-17 07:12:21 +01:00
committed by GitHub
parent e0ccadbae2
commit 2f6ad34795
4 changed files with 64 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
beacon_node/lighthouse_network/src/service/mod.rs
View File

@@ -10,7 +10,11 @@ use crate::peer_manager::{
};
use crate::peer_manager::{MIN_OUTBOUND_ONLY_FACTOR, PEER_EXCESS_FACTOR, PRIORITY_PEER_EXCESS};
use crate::rpc::methods::MetadataRequest;
use crate::rpc::*;
use crate::rpc::{
methods, BlocksByRangeRequest, GoodbyeReason, HandlerErr, InboundRequest, NetworkParams,
OutboundRequest, Protocol, RPCCodedResponse, RPCError, RPCMessage, RPCReceived, RPCResponse,
RPCResponseErrorCode, ResponseTermination, RPC,
};
use crate::service::behaviour::BehaviourEvent;
pub use crate::service::behaviour::Gossipsub;
use crate::types::{
@@ -1128,16 +1132,6 @@ impl<E: EthSpec> Network<E> {
.send_request(peer_id, id, OutboundRequest::Ping(ping));
}
/// Sends a Pong response to the peer.
fn pong(&mut self, id: PeerRequestId, peer_id: PeerId) {
let ping = crate::rpc::Ping {
data: *self.network_globals.local_metadata.read().seq_number(),
};
trace!(self.log, "Sending Pong"; "request_id" => id.1, "peer_id" => %peer_id);
let event = RPCCodedResponse::Success(RPCResponse::Pong(ping));
self.eth2_rpc_mut().send_response(peer_id, id, event);
}
/// Sends a METADATA request to a peer.
fn send_meta_data_request(&mut self, peer_id: PeerId) {
let event = if self.fork_context.spec.is_peer_das_scheduled() {
@@ -1406,10 +1400,7 @@ impl<E: EthSpec> Network<E> {
let peer_id = event.peer_id;
// Do not permit Inbound events from peers that are being disconnected, or RPC requests.
if !self.peer_manager().is_connected(&peer_id)
&& (matches!(event.event, HandlerEvent::Err(HandlerErr::Inbound { .. }))
|| matches!(event.event, HandlerEvent::Ok(RPCReceived::Request(..))))
{
if !self.peer_manager().is_connected(&peer_id) {
debug!(
self.log,
"Ignoring rpc message of disconnecting peer";
@@ -1420,8 +1411,8 @@ impl<E: EthSpec> Network<E> {
let handler_id = event.conn_id;
// The METADATA and PING RPC responses are handled within the behaviour and not propagated
match event.event {
HandlerEvent::Err(handler_err) => {
match event.message {
Err(handler_err) => {
match handler_err {
HandlerErr::Inbound {
id: _,
@@ -1456,15 +1447,13 @@ impl<E: EthSpec> Network<E> {
}
}
}
HandlerEvent::Ok(RPCReceived::Request(id, request)) => {
Ok(RPCReceived::Request(id, request)) => {
let peer_request_id = (handler_id, id);
match request {
/* Behaviour managed protocols: Ping and Metadata */
InboundRequest::Ping(ping) => {
// inform the peer manager and send the response
self.peer_manager_mut().ping_request(&peer_id, ping.data);
// send a ping response
self.pong(peer_request_id, peer_id);
None
}
InboundRequest::MetaData(req) => {
@@ -1587,7 +1576,7 @@ impl<E: EthSpec> Network<E> {
}
}
}
HandlerEvent::Ok(RPCReceived::Response(id, resp)) => {
Ok(RPCReceived::Response(id, resp)) => {
match resp {
/* Behaviour managed protocols */
RPCResponse::Pong(ping) => {
@@ -1640,7 +1629,7 @@ impl<E: EthSpec> Network<E> {
),
}
}
HandlerEvent::Ok(RPCReceived::EndOfStream(id, termination)) => {
Ok(RPCReceived::EndOfStream(id, termination)) => {
let response = match termination {
ResponseTermination::BlocksByRange => Response::BlocksByRange(None),
ResponseTermination::BlocksByRoot => Response::BlocksByRoot(None),
@@ -1651,10 +1640,6 @@ impl<E: EthSpec> Network<E> {
};
self.build_response(id, peer_id, response)
}
HandlerEvent::Close(_) => {
// NOTE: This is handled in the RPC behaviour.
None
}
}
}