pool: remove Error::OneShotRecvError variant

Signed-off-by: Yuki Kishimoto <[email protected]>

Author: yukibtc

CHANGELOG.md

@@ -145,6 +145,7 @@
 * database: remove `Order` enum ([Yuki Kishimoto])
 * database: remove `order` arg from `NostrDatabase::query` ([Yuki Kishimoto])
 * pool: remove high latency log ([Yuki Kishimoto])
+* pool: remove `Error::OneShotRecvError` variant ([Yuki Kishimoto])
 * zapper: remove `Err` from `NostrZapper` and unnecessary variants from `ZapperError` ([Yuki Kishimoto])
 * js(nostr): remove `Keys::vanity` ([Yuki Kishimoto])
 * cli: remove `reverse` flag from `query` command

crates/nostr-relay-pool/src/relay/error.rs

@@ -77,9 +77,6 @@ pub enum Error {
     /// Batch event empty
     #[error("batch event cannot be empty")]
     BatchEventEmpty,
-    /// Impossible to receive oneshot message
-    #[error("impossible to recv msg")]
-    OneShotRecvError,
     /// Read actions disabled
     #[error("read actions are disabled for this relay")]
     ReadDisabled,

crates/nostr-relay-pool/src/relay/internal.rs

@@ -1085,14 +1085,8 @@ impl InternalRelay {
             // Wait for oneshot reply
             match time::timeout(Some(opts.timeout), rx).await {
                 Some(result) => match result {
-                    Ok(val) => {
-                        if val {
-                            Ok(())
-                        } else {
-                            Err(Error::MessageNotSent)
-                        }
-                    }
-                    Err(_) => Err(Error::OneShotRecvError),
+                    Ok(true) => Ok(()),
+                    Ok(false) | Err(_) => Err(Error::MessageNotSent),
                 },
                 None => Err(Error::RecvTimeout),
             }