is_pending_outbound fixes

protocols/request-response/src/lib.rs

@@ -431,9 +431,16 @@ where
     /// [`PeerId`] initiated by [`RequestResponse::send_request`] is still
     /// pending, i.e. waiting for a response.
     pub fn is_pending_outbound(&self, peer: &PeerId, request_id: &RequestId) -> bool {
-        self.connected.get(peer)
+        // Check if request is already sent on established connection.
+        let est_conn = self.connected.get(peer)
             .map(|cs| cs.iter().any(|c| c.pending_inbound_responses.contains(request_id)))
-            .unwrap_or(false)
+            .unwrap_or(false);
+        // Check if request is still pending to be sent.
+        let pen_conn = self.pending_outbound_requests.get(peer)
+            .map(|rps| rps.iter().any(|rp| {rp.request_id == *request_id}))
+            .unwrap_or(false);
+
+        est_conn || pen_conn
     }
 
     /// Checks whether an inbound request from the peer with the provided

protocols/request-response/tests/ping.rs

@@ -93,6 +93,7 @@ fn ping_protocol() {
         let addr = rx.next().await.unwrap();
         swarm2.add_address(&peer1_id, addr.clone());
         let mut req_id = swarm2.send_request(&peer1_id, ping.clone());
+        assert!(swarm2.is_pending_outbound(&peer1_id, &req_id));
 
         loop {
             match swarm2.next().await {
@@ -105,14 +106,19 @@ fn ping_protocol() {
                     assert_eq!(&peer, &peer1_id);
                     assert_eq!(req_id, request_id);
                     if count >= num_pings {
-                        return
+                       break 
                     } else {
                         req_id = swarm2.send_request(&peer1_id, ping.clone());
                     }
                 },
                 e => panic!("Peer2: Unexpected event: {:?}", e)
             }
         }
+
+        let req_id2 = swarm2.send_request(&peer1_id, ping.clone());
+        // check if is_pending_outbound returns false for a finished request when we have already issued a new one
+        assert!(swarm2.is_pending_outbound(&peer1_id, &req_id) == false);
+        assert!(swarm2.is_pending_outbound(&peer1_id, &req_id2));
     };
 
     async_std::task::spawn(Box::pin(peer1));