Updated dehashed

myOmikron · Sep 7, 2023 · 3c30284 · 3c30284
1 parent 51e013d
commit 3c30284
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 22 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/leech/Cargo.toml b/leech/Cargo.toml
@@ -73,7 +73,7 @@ reqwest = { version = "~0.11", features = ["json", "trust-dns", "rustls-tls-nati
 url = { version = "~2" }
 
 # dehashed api
-dehashed-rs = { version = "0.3", features = ["tokio"] }
+dehashed-rs = { version = "~0.3", features = ["tokio"] }
 
 [build-dependencies]
 tonic-build = { version = "~0.9" }

diff --git a/leech/src/modules/dehashed/mod.rs b/leech/src/modules/dehashed/mod.rs
@@ -17,14 +17,18 @@ pub async fn query(
     let api = DehashedApi::new(email, api_key)?;
     let scheduler = api.start_scheduler();
     let s_tx = scheduler.retrieve_sender();
-    let (tx, mut rx) = oneshot::channel();
+    let (tx, rx) = oneshot::channel();
     if let Err(err) = s_tx.send(ScheduledRequest::new(query, tx)).await {
         error!("Couldn't send to dehashed scheduler: {err}");
         return Err(DehashedError::DehashedSchedulerUnreachable);
     }
 
-    match rx.try_recv() {
+    match rx.await {
         Ok(x) => Ok(x?),
-        Err(_) => Err(DehashedError::DehashedSchedulerUnreachable),
+        Err(x) => {
+            error!("{x}");
+
+            Err(DehashedError::DehashedSchedulerUnreachable)
+        }
     }
 }