Merge of #6566

ZcashFoundation · Apr 26, 2023 · 7ffeea8 · 7ffeea8
2 parents e831e1b + 710812f
commit 7ffeea8
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/zebra-network/src/peer/client.rs b/zebra-network/src/peer/client.rs
@@ -621,8 +621,13 @@ impl Service<Request> for Client {
             Ok(()) => {
                 // The receiver end of the oneshot is itself a future.
                 rx.map(|oneshot_recv_result| {
-                    oneshot_recv_result
-                        .expect("ClientRequest oneshot sender must not be dropped before send")
+                    // The ClientRequest oneshot sender should not be dropped before sending a
+                    // response. But sometimes that happens during process or connection shutdown.
+                    // So we just return a generic error here.
+                    match oneshot_recv_result {
+                        Ok(result) => result,
+                        Err(oneshot::Canceled) => Err(PeerError::ConnectionDropped.into()),
+                    }
                 })
                 .boxed()
             }