pool: remove result clone from batch_msg_to and batch_event_to relay pool methods

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

Author: yukibtc

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

@@ -13,6 +13,7 @@
 pub mod pool;
 pub mod prelude;
 pub mod relay;
+mod util;
 
 pub use self::pool::options::RelayPoolOptions;
 pub use self::pool::{RelayPool, RelayPoolNotification, SendEventOutput, SendOutput};

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

@@ -21,7 +21,7 @@ use super::options::RelayPoolOptions;
 use super::{Error, RelayPoolNotification, SendEventOutput, SendOutput};
 use crate::relay::options::{FilterOptions, NegentropyOptions, RelayOptions, RelaySendOptions};
 use crate::relay::{Relay, RelayBlacklist};
-use crate::SubscribeOptions;
+use crate::{util, SubscribeOptions};
 
 #[derive(Debug, Clone)]
 pub struct InternalRelayPool {
@@ -60,8 +60,8 @@ impl InternalRelayPool {
             relays: Arc::new(RwLock::new(HashMap::new())),
             notification_sender,
             subscriptions: Arc::new(RwLock::new(HashMap::new())),
-            blacklist: RelayBlacklist::empty(), // TODO: allow to initialize pool with custom blacklist?
-                                                //opts,
+            blacklist: RelayBlacklist::empty(),
+            //opts,
         }
     }
 
@@ -315,13 +315,13 @@ impl InternalRelayPool {
                 handle.join().await?;
             }
 
-            let result = result.lock().await;
+            let result: SendOutput = util::take_mutex_ownership(result).await;
 
             if result.success.is_empty() {
                 return Err(Error::MsgNotSent);
             }
 
-            Ok(result.clone()) // TODO: remove clone
+            Ok(result)
         }
     }
 
@@ -438,13 +438,13 @@ impl InternalRelayPool {
                 handle.join().await?;
             }
 
-            let result = result.lock().await;
+            let result: SendOutput = util::take_mutex_ownership(result).await;
 
             if result.success.is_empty() {
                 return Err(Error::EventNotPublished);
             }
 
-            Ok(result.clone()) // TODO: remove clone
+            Ok(result)
         }
     }
 

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

@@ -0,0 +1,24 @@
+// Copyright (c) 2022-2023 Yuki Kishimoto
+// Copyright (c) 2023-2024 Rust Nostr Developers
+// Distributed under the MIT software license
+
+use std::sync::Arc;
+
+use tokio::sync::Mutex;
+
+/// Take ownership of `T` from `Arc<Mutex<T>>`.
+///
+/// Try to take ownership of result without clone.
+/// Clone if fail to unwrap inner value of `Arc`.
+pub(crate) async fn take_mutex_ownership<T>(val: Arc<Mutex<T>>) -> T
+where
+    T: Clone,
+{
+    match Arc::try_unwrap(val) {
+        Ok(mutex) => mutex.into_inner(),
+        Err(arc) => {
+            let lock = arc.lock().await;
+            lock.clone()
+        }
+    }
+}