moves Results request above SubscribeResults request to avoid dup…

…licate results.
ZcashFoundation · Feb 16, 2024 · dd95bc3 · dd95bc3
1 parent 7fb4124
commit dd95bc3
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/zebra-grpc/src/server.rs b/zebra-grpc/src/server.rs
@@ -79,15 +79,11 @@ where
 
         let keys: Vec<_> = keys.into_iter().map(|(key, _start_at)| key).collect();
 
-        let ScanServiceResponse::SubscribeResults(mut results_receiver) = self
+        let ScanServiceResponse::Results(results) = self
             .scan_service
             .clone()
             .ready()
-            .and_then(|service| {
-                service.call(ScanServiceRequest::SubscribeResults(
-                    keys.iter().cloned().collect(),
-                ))
-            })
+            .and_then(|service| service.call(ScanServiceRequest::Results(keys.clone())))
             .await
             .map_err(|err| Status::unknown(format!("scan service returned error: {err}")))?
         else {
@@ -96,11 +92,15 @@ where
             ));
         };
 
-        let ScanServiceResponse::Results(results) = self
+        let ScanServiceResponse::SubscribeResults(mut results_receiver) = self
             .scan_service
             .clone()
             .ready()
-            .and_then(|service| service.call(ScanServiceRequest::Results(keys.clone())))
+            .and_then(|service| {
+                service.call(ScanServiceRequest::SubscribeResults(
+                    keys.iter().cloned().collect(),
+                ))
+            })
             .await
             .map_err(|err| Status::unknown(format!("scan service returned error: {err}")))?
         else {