fix: split req-resp behaviour

libp2p::request_response expects protocols to be equivalent between them,
and negotiates with the peer which one to use. Since we specified the status
first in the list of protocols, it seems to default to that one when we
send a request.

Author: MegaRedHand

crates/net/p2p/src/lib.rs

@@ -73,23 +73,26 @@ pub async fn start_p2p(
     let gossipsub = libp2p::gossipsub::Behaviour::new(MessageAuthenticity::Anonymous, config)
         .expect("failed to initiate behaviour");
 
-    let req_resp = request_response::Behaviour::new(
-        vec![
-            (
-                StreamProtocol::new(STATUS_PROTOCOL_V1),
-                request_response::ProtocolSupport::Full,
-            ),
-            (
-                StreamProtocol::new(BLOCKS_BY_ROOT_PROTOCOL_V1),
-                request_response::ProtocolSupport::Full,
-            ),
-        ],
+    let status_req_resp = request_response::Behaviour::new(
+        vec![(
+            StreamProtocol::new(STATUS_PROTOCOL_V1),
+            request_response::ProtocolSupport::Full,
+        )],
+        Default::default(),
+    );
+
+    let blocks_by_root_req_resp = request_response::Behaviour::new(
+        vec![(
+            StreamProtocol::new(BLOCKS_BY_ROOT_PROTOCOL_V1),
+            request_response::ProtocolSupport::Full,
+        )],
         Default::default(),
     );
 
     let behavior = Behaviour {
         gossipsub,
-        req_resp,
+        status_req_resp,
+        blocks_by_root_req_resp,
     };
 
     // TODO: set peer scoring params
@@ -166,7 +169,8 @@ pub async fn start_p2p(
 #[derive(NetworkBehaviour)]
 pub(crate) struct Behaviour {
     gossipsub: libp2p::gossipsub::Behaviour,
-    req_resp: request_response::Behaviour<Codec>,
+    status_req_resp: request_response::Behaviour<Codec>,
+    blocks_by_root_req_resp: request_response::Behaviour<req_resp::Codec>,
 }
 
 pub(crate) struct P2PServer {
@@ -204,7 +208,10 @@ async fn event_loop(mut server: P2PServer) {
 
 async fn handle_swarm_event(server: &mut P2PServer, event: SwarmEvent<BehaviourEvent>) {
     match event {
-        SwarmEvent::Behaviour(BehaviourEvent::ReqResp(req_resp_event)) => {
+        SwarmEvent::Behaviour(BehaviourEvent::StatusReqResp(req_resp_event)) => {
+            req_resp::handle_req_resp_message(server, req_resp_event).await;
+        }
+        SwarmEvent::Behaviour(BehaviourEvent::BlocksByRootReqResp(req_resp_event)) => {
             req_resp::handle_req_resp_message(server, req_resp_event).await;
         }
         SwarmEvent::Behaviour(BehaviourEvent::Gossipsub(
@@ -228,7 +235,7 @@ async fn handle_swarm_event(server: &mut P2PServer, event: SwarmEvent<BehaviourE
                 server
                     .swarm
                     .behaviour_mut()
-                    .req_resp
+                    .status_req_resp
                     .send_request(&peer_id, Request::Status(our_status));
             } else {
                 info!(%peer_id, %direction, "Added peer connection");

crates/net/p2p/src/req_resp/handlers.rs

@@ -68,7 +68,7 @@ async fn handle_status_request(
     server
         .swarm
         .behaviour_mut()
-        .req_resp
+        .status_req_resp
         .send_response(
             channel,
             Response::new(ResponseResult::Success, ResponsePayload::Status(our_status)),
@@ -153,6 +153,6 @@ pub async fn fetch_block_from_peer(
     server
         .swarm
         .behaviour_mut()
-        .req_resp
+        .blocks_by_root_req_resp
         .send_request(&peer, Request::BlocksByRoot(request));
 }