Merge branch 'stefan/rpc_bug' into 'master'

fix: transport rpc SendError should time out See merge request dfinity-lab/public/ic!15946
dfinity · Nov 8, 2023 · 9704222 · ilbertt · Nov 12, 2023 · stefanneamtu
2 parents 273e4c4 + b8e9f5e
commit 9704222
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/rs/p2p/consensus_manager/src/receiver.rs b/rs/p2p/consensus_manager/src/receiver.rs
@@ -419,15 +419,13 @@ where
                             break;
                         }
 
-                        rpc_response = transport.rpc(&peer, request) => {
-                            if let Ok(response) = rpc_response {
-                                if let StatusCode::OK = response.status() {
-                                    if let Ok(message) =
-                                        bincode::deserialize::<Artifact::Message>(response.body())
-                                    {
-                                        result = DownloadResult::Completed(message, peer);
-                                        break;
-                                    }
+                        Ok(response) = transport.rpc(&peer, request) => {
+                            if let StatusCode::OK = response.status() {
+                                if let Ok(message) =
+                                    bincode::deserialize::<Artifact::Message>(response.body())
+                                {
+                                    result = DownloadResult::Completed(message, peer);
+                                    break;
                                 }
                             }
                             metrics.download_task_artifact_download_errors_total.inc();