diff --git a/beacon_node/beacon_chain/src/execution_payload_envelope_streamer.rs b/beacon_node/beacon_chain/src/execution_payload_envelope_streamer.rs index e6522d7beb..a30682e3a5 100644 --- a/beacon_node/beacon_chain/src/execution_payload_envelope_streamer.rs +++ b/beacon_node/beacon_chain/src/execution_payload_envelope_streamer.rs @@ -21,7 +21,7 @@ pub struct PayloadEnvelopeStreamer { _check_caches: CheckCaches, } -// TODO(gloas) eventually we'll need to expand this to support loading blinded payload envelopes from the dsb +// TODO(gloas) eventually we'll need to expand this to support loading blinded payload envelopes from the db // and fetching the execution payload from the EL. See BlockStreamer impl as an example impl PayloadEnvelopeStreamer { pub fn new( @@ -43,7 +43,7 @@ impl PayloadEnvelopeStreamer { })) } - // TODO(gloas) simply a strub impl for now. Should check some exec payload envelope cache + // TODO(gloas) simply a stub impl for now. Should check some exec payload envelope cache // and return the envelope if it exists in the cache fn check_payload_envelope_cache( &self, diff --git a/beacon_node/lighthouse_network/src/rpc/codec.rs b/beacon_node/lighthouse_network/src/rpc/codec.rs index ea615452da..ceb7090b21 100644 --- a/beacon_node/lighthouse_network/src/rpc/codec.rs +++ b/beacon_node/lighthouse_network/src/rpc/codec.rs @@ -77,7 +77,7 @@ impl SSZSnappyInboundCodec { }, RpcSuccessResponse::BlocksByRange(res) => res.as_ssz_bytes(), RpcSuccessResponse::BlocksByRoot(res) => res.as_ssz_bytes(), - RpcSuccessResponse::PayloadEnvelopesbyRange(res) => res.as_ssz_bytes(), + RpcSuccessResponse::PayloadEnvelopesByRange(res) => res.as_ssz_bytes(), RpcSuccessResponse::PayloadEnvelopesByRoot(res) => res.as_ssz_bytes(), RpcSuccessResponse::BlobsByRange(res) => res.as_ssz_bytes(), RpcSuccessResponse::BlobsByRoot(res) => res.as_ssz_bytes(), @@ -669,7 +669,7 @@ fn handle_rpc_response( SignedBeaconBlock::Base(SignedBeaconBlockBase::from_ssz_bytes(decoded_buffer)?), )))), SupportedProtocol::PayloadEnvelopesByRangeV1 => { - Ok(Some(RpcSuccessResponse::PayloadEnvelopesbyRange(Arc::new( + Ok(Some(RpcSuccessResponse::PayloadEnvelopesByRange(Arc::new( SignedExecutionPayloadEnvelope::from_ssz_bytes(decoded_buffer)?, )))) } diff --git a/beacon_node/lighthouse_network/src/rpc/methods.rs b/beacon_node/lighthouse_network/src/rpc/methods.rs index a07ad8d183..8113a0b5c1 100644 --- a/beacon_node/lighthouse_network/src/rpc/methods.rs +++ b/beacon_node/lighthouse_network/src/rpc/methods.rs @@ -516,7 +516,7 @@ impl BlocksByRootRequest { } } -/// Reqwuest a number of execution payload envelopes from a peer +/// Request a number of execution payload envelopes from a peer. #[derive(Clone, Debug, PartialEq)] pub struct PayloadEnvelopesByRootRequest { /// The list of beacon block roots used to request execution payload envelopes. @@ -626,7 +626,7 @@ pub enum RpcSuccessResponse { /// A response to a get EXECUTION_PAYLOAD_ENVELOPES_BY_RANGE request. A None response signifies /// the end of the batch. - PayloadEnvelopesbyRange(Arc>), + PayloadEnvelopesByRange(Arc>), /// A response to a get EXECUTION_PAYLOAD_ENVELOPES_BY_ROOT request. PayloadEnvelopesByRoot(Arc>), @@ -795,7 +795,7 @@ impl RpcSuccessResponse { RpcSuccessResponse::Status(_) => Protocol::Status, RpcSuccessResponse::BlocksByRange(_) => Protocol::BlocksByRange, RpcSuccessResponse::BlocksByRoot(_) => Protocol::BlocksByRoot, - RpcSuccessResponse::PayloadEnvelopesbyRange(_) => Protocol::PayloadEnvelopesByRange, + RpcSuccessResponse::PayloadEnvelopesByRange(_) => Protocol::PayloadEnvelopesByRange, RpcSuccessResponse::PayloadEnvelopesByRoot(_) => Protocol::PayloadEnvelopesByRoot, RpcSuccessResponse::BlobsByRange(_) => Protocol::BlobsByRange, RpcSuccessResponse::BlobsByRoot(_) => Protocol::BlobsByRoot, @@ -815,7 +815,7 @@ impl RpcSuccessResponse { pub fn slot(&self) -> Option { match self { Self::BlocksByRange(r) | Self::BlocksByRoot(r) => Some(r.slot()), - Self::PayloadEnvelopesByRoot(r) | Self::PayloadEnvelopesbyRange(r) => Some(r.slot()), + Self::PayloadEnvelopesByRoot(r) | Self::PayloadEnvelopesByRange(r) => Some(r.slot()), Self::BlobsByRange(r) | Self::BlobsByRoot(r) => Some(r.slot()), Self::DataColumnsByRange(r) | Self::DataColumnsByRoot(r) => Some(r.slot()), Self::LightClientBootstrap(r) => Some(r.get_slot()), @@ -866,7 +866,7 @@ impl std::fmt::Display for RpcSuccessResponse { RpcSuccessResponse::BlocksByRoot(block) => { write!(f, "BlocksByRoot: Block slot: {}", block.slot()) } - RpcSuccessResponse::PayloadEnvelopesbyRange(envelope) => { + RpcSuccessResponse::PayloadEnvelopesByRange(envelope) => { write!( f, "ExecutionPayloadEnvelopesByRange: Envelope slot: {}", diff --git a/beacon_node/lighthouse_network/src/service/api_types.rs b/beacon_node/lighthouse_network/src/service/api_types.rs index 6277fc7dec..486a443857 100644 --- a/beacon_node/lighthouse_network/src/service/api_types.rs +++ b/beacon_node/lighthouse_network/src/service/api_types.rs @@ -163,7 +163,7 @@ pub enum Response { BlocksByRoot(Option>>), /// A response to a get `EXECUTION_PAYLOAD_ENVELOPES_BY_ROOT` request. PayloadEnvelopesByRoot(Option>>), - /// A response to a get `EXECUTION_PAYLOAD_ENVELOPES_BYH_RANGE` request. + /// A response to a get `EXECUTION_PAYLOAD_ENVELOPES_BY_RANGE` request. PayloadEnvelopesByRange(Option>>), /// A response to a get BLOBS_BY_ROOT request. BlobsByRoot(Option>>), @@ -195,7 +195,7 @@ impl std::convert::From> for RpcResponse { None => RpcResponse::StreamTermination(ResponseTermination::PayloadEnvelopesByRoot), }, Response::PayloadEnvelopesByRange(r) => match r { - Some(p) => RpcResponse::Success(RpcSuccessResponse::PayloadEnvelopesbyRange(p)), + Some(p) => RpcResponse::Success(RpcSuccessResponse::PayloadEnvelopesByRange(p)), None => { RpcResponse::StreamTermination(ResponseTermination::PayloadEnvelopesByRange) } diff --git a/beacon_node/lighthouse_network/src/service/mod.rs b/beacon_node/lighthouse_network/src/service/mod.rs index 304f7f5baf..6c503d3e10 100644 --- a/beacon_node/lighthouse_network/src/service/mod.rs +++ b/beacon_node/lighthouse_network/src/service/mod.rs @@ -1661,7 +1661,7 @@ impl Network { RpcSuccessResponse::BlocksByRoot(resp) => { self.build_response(id, peer_id, Response::BlocksByRoot(Some(resp))) } - RpcSuccessResponse::PayloadEnvelopesbyRange(resp) => self.build_response( + RpcSuccessResponse::PayloadEnvelopesByRange(resp) => self.build_response( id, peer_id, Response::PayloadEnvelopesByRange(Some(resp)), diff --git a/beacon_node/network/src/network_beacon_processor/rpc_methods.rs b/beacon_node/network/src/network_beacon_processor/rpc_methods.rs index 412814a5cb..88d3697c9d 100644 --- a/beacon_node/network/src/network_beacon_processor/rpc_methods.rs +++ b/beacon_node/network/src/network_beacon_processor/rpc_methods.rs @@ -286,7 +286,7 @@ impl NetworkBeaconProcessor { ); } - /// Handle a `ExecutionPayloadEnvelopes` request from the peer. + /// Handle a `ExecutionPayloadEnvelopesByRoot` request from the peer. async fn handle_payload_envelopes_by_root_request_inner( self: Arc, peer_id: PeerId,