cerc-io/lighthouse
15
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Update handle_rpc_response blobs match arms to be consistent with block v2 protocols.

Browse Source
This commit is contained in:
Jimmy Chen 2023-06-28 16:56:52 +10:00
parent 68140fa036
commit 03a17a84da
No known key found for this signature in database
GPG Key ID: 7AAEE02659DCF690
2 changed files with 34 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
beacon_node/lighthouse_network/src/rpc/codec/ssz_snappy.rs
View File

@ -530,7 +530,7 @@ fn handle_rpc_request<T: EthSpec>(
fn handle_rpc_response<T: EthSpec>( fn handle_rpc_response<T: EthSpec>(
versioned_protocol: SupportedProtocol, versioned_protocol: SupportedProtocol,
decoded_buffer: &[u8], decoded_buffer: &[u8],
mut fork_name: Option<ForkName>, fork_name: Option<ForkName>,
) -> Result<Option<RPCResponse<T>>, RPCError> { ) -> Result<Option<RPCResponse<T>>, RPCError> {
match versioned_protocol { match versioned_protocol {
SupportedProtocol::StatusV1 => Ok(Some(RPCResponse::Status( SupportedProtocol::StatusV1 => Ok(Some(RPCResponse::Status(
@ -546,46 +546,38 @@ fn handle_rpc_response<T: EthSpec>(
SupportedProtocol::BlocksByRootV1 => Ok(Some(RPCResponse::BlocksByRoot(Arc::new( SupportedProtocol::BlocksByRootV1 => Ok(Some(RPCResponse::BlocksByRoot(Arc::new(
SignedBeaconBlock::Base(SignedBeaconBlockBase::from_ssz_bytes(decoded_buffer)?), SignedBeaconBlock::Base(SignedBeaconBlockBase::from_ssz_bytes(decoded_buffer)?),
)))), )))),
SupportedProtocol::BlobsByRangeV1 => { SupportedProtocol::BlobsByRangeV1 => match fork_name {
let fork_name = fork_name.take().ok_or_else(|| { Some(ForkName::Deneb) => Ok(Some(RPCResponse::BlobsByRange(Arc::new(
RPCError::ErrorResponse(
RPCResponseErrorCode::InvalidRequest,
format!(
"No context bytes provided for {:?} response",
versioned_protocol
),
)
})?;
match fork_name {
ForkName::Deneb => Ok(Some(RPCResponse::BlobsByRange(Arc::new(
BlobSidecar::from_ssz_bytes(decoded_buffer)?, BlobSidecar::from_ssz_bytes(decoded_buffer)?,
)))), )))),
_ => Err(RPCError::ErrorResponse( Some(_) => Err(RPCError::ErrorResponse(
RPCResponseErrorCode::InvalidRequest, RPCResponseErrorCode::InvalidRequest,
"Invalid fork name for blobs by range".to_string(), "Invalid fork name for blobs by range".to_string(),
)), )),
} None => Err(RPCError::ErrorResponse(
}
SupportedProtocol::BlobsByRootV1 => {
let fork_name = fork_name.take().ok_or_else(|| {
RPCError::ErrorResponse(
RPCResponseErrorCode::InvalidRequest, RPCResponseErrorCode::InvalidRequest,
format!( format!(
"No context bytes provided for {:?} response", "No context bytes provided for {:?} response",
versioned_protocol versioned_protocol
), ),
) )),
})?; },
match fork_name { SupportedProtocol::BlobsByRootV1 => match fork_name {
ForkName::Deneb => Ok(Some(RPCResponse::SidecarByRoot(Arc::new( Some(ForkName::Deneb) => Ok(Some(RPCResponse::SidecarByRoot(Arc::new(
BlobSidecar::from_ssz_bytes(decoded_buffer)?, BlobSidecar::from_ssz_bytes(decoded_buffer)?,
)))), )))),
_ => Err(RPCError::ErrorResponse( Some(_) => Err(RPCError::ErrorResponse(
RPCResponseErrorCode::InvalidRequest, RPCResponseErrorCode::InvalidRequest,
"Invalid fork name for block and blobs by root".to_string(), "Invalid fork name for blobs by root".to_string(),
)), )),
} None => Err(RPCError::ErrorResponse(
} RPCResponseErrorCode::InvalidRequest,
format!(
"No context bytes provided for {:?} response",
versioned_protocol
),
)),
},
SupportedProtocol::PingV1 => Ok(Some(RPCResponse::Pong(Ping { SupportedProtocol::PingV1 => Ok(Some(RPCResponse::Pong(Ping {
data: u64::from_ssz_bytes(decoded_buffer)?, data: u64::from_ssz_bytes(decoded_buffer)?,
}))), }))),

2
beacon_node/network/src/beacon_processor/worker/rpc_methods.rs
View File

@ -375,7 +375,7 @@ impl<T: BeaconChainTypes> Worker<T> {
send_on_drop: SendOnDrop, send_on_drop: SendOnDrop,
peer_id: PeerId, peer_id: PeerId,
request_id: PeerRequestId, request_id: PeerRequestId,
mut req: BlocksByRangeRequest, req: BlocksByRangeRequest,
) { ) {
debug!(self.log, "Received BlocksByRange Request"; debug!(self.log, "Received BlocksByRange Request";
"peer_id" => %peer_id, "peer_id" => %peer_id,