Merge remote-tracking branch 'upstream/unstable'

beacon_node/lighthouse_network/src/service/mod.rs

@@ -1383,14 +1383,21 @@ impl<AppReqId: ReqId, E: EthSpec> Network<AppReqId, E> {
             // Silencing this event breaks the API contract with RPC where every request ends with
             // - A stream termination event, or
             // - An RPCError event
-            if !matches!(event.event, HandlerEvent::Err(HandlerErr::Outbound { .. })) {
+            return if let HandlerEvent::Err(HandlerErr::Outbound {
+                id: RequestId::Application(id),
+                error,
+                ..
+            }) = event.event
+            {
+                Some(NetworkEvent::RPCFailed { peer_id, id, error })
+            } else {
                 debug!(
                     self.log,
                     "Ignoring rpc message of disconnecting peer";
                     event
                 );
-                return None;
-            }
+                None
+            };
         }
 
         let handler_id = event.conn_id;