cleanup

beacon_node/lighthouse_network/src/rpc/codec/ssz_snappy.rs

@@ -410,7 +410,7 @@ fn context_bytes<T: EthSpec>(
                     // NOTE: If you are adding another fork type here, be sure to modify the
                     //       `fork_context.to_context_bytes()` function to support it as well!
                     SignedBeaconBlock::Eip4844 { .. } => {
-                        // Merge context being `None` implies that "merge never happened".
+                        // Eip4844 context being `None` implies that "merge never happened".
                         fork_context.to_context_bytes(ForkName::Eip4844)
                     }
                     SignedBeaconBlock::Merge { .. } => {

beacon_node/lighthouse_network/src/rpc/protocol.rs

@@ -475,7 +475,7 @@ impl<TSpec: EthSpec> InboundRequest<TSpec> {
                 ProtocolId::new(Protocol::BlocksByRoot, Version::V1, Encoding::SSZSnappy),
             ],
             InboundRequest::BlobsByRange(_) => vec![ProtocolId::new(
-                Protocol::BlocksByRoot,
+                Protocol::BlobsByRange,
                 Version::V1,
                 Encoding::SSZSnappy,
             )],

beacon_node/lighthouse_network/src/rpc/rate_limiter.rs

@@ -100,7 +100,7 @@ pub struct RPCRateLimiterBuilder {
     bbrange_quota: Option<Quota>,
     /// Quota for the BlocksByRoot protocol.
     bbroots_quota: Option<Quota>,
-    /// Quota for the BlocksByRange protocol.
+    /// Quota for the BlobsByRange protocol.
     blbrange_quota: Option<Quota>,
 }
 

beacon_node/lighthouse_network/src/service/api_types.rs

@@ -33,7 +33,7 @@ pub enum Request {
     Status(StatusMessage),
     /// A blocks by range request.
     BlocksByRange(BlocksByRangeRequest),
-    /// A bloibs by range request.
+    /// A blobs by range request.
     BlobsByRange(BlobsByRangeRequest),
     /// A request blocks root request.
     BlocksByRoot(BlocksByRootRequest),

beacon_node/lighthouse_network/src/types/pubsub.rs

@@ -175,10 +175,6 @@ impl<T: EthSpec> PubsubMessage<T> {
                                     SignedBeaconBlockEip4844::from_ssz_bytes(data)
                                         .map_err(|e| format!("{:?}", e))?,
                                 ),
-                                Some(ForkName::Eip4844) => SignedBeaconBlock::<T>::Eip4844(
-                                    SignedBeaconBlockEip4844::from_ssz_bytes(data)
-                                        .map_err(|e| format!("{:?}", e))?,
-                                ),
                                 None => {
                                     return Err(format!(
                                         "Unknown gossipsub fork digest: {:?}",