pool: add RelayPool::is_shutdown method

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

Author: yukibtc

CHANGELOG.md

@@ -102,6 +102,7 @@
 * pool: add `AdmitPolicy` trait ([Yuki Kishimoto])
 * pool: add `ReqExitPolicy::WaitForEvents` variant ([Yuki Kishimoto])
 * pool: add `RelayPoolBuilder` ([Yuki Kishimoto])
+* pool: add `RelayPool::is_shutdown` method ([Yuki Kishimoto])
 * ffi: add Mac Catalyst support in Swift package ([Yuki Kishimoto])
 * js: add `KindStandard` enum ([Yuki Kishimoto])
 

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

@@ -26,7 +26,7 @@ pub(super) type Relays = HashMap<RelayUrl, Relay>;
 pub(super) struct AtomicPrivateData {
     pub(super) relays: RwLock<Relays>,
     pub(super) subscriptions: RwLock<HashMap<SubscriptionId, Filter>>,
-    shutdown: AtomicBool,
+    pub(super) shutdown: AtomicBool,
 }
 
 #[derive(Debug, Clone)]
@@ -66,10 +66,6 @@ impl InnerRelayPool {
         }
     }
 
-    pub(super) fn is_shutdown(&self) -> bool {
-        self.atomic.shutdown.load(Ordering::SeqCst)
-    }
-
     pub async fn shutdown(&self) {
         // Mark as shutdown
         // If the previous value was `true`,

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

@@ -6,6 +6,7 @@
 
 use std::collections::{HashMap, HashSet};
 use std::future::Future;
+use std::sync::atomic::Ordering;
 use std::sync::{Arc, Mutex};
 use std::time::Duration;
 
@@ -114,6 +115,12 @@ impl RelayPool {
         }
     }
 
+    /// Check if the relay pool is shutdown.
+    #[inline]
+    pub fn is_shutdown(&self) -> bool {
+        self.inner.atomic.shutdown.load(Ordering::SeqCst)
+    }
+
     /// Completely shutdown pool
     ///
     /// This method disconnects and removes all relays from the [`RelayPool`] and then
@@ -257,7 +264,7 @@ impl RelayPool {
         let url: RelayUrl = url.try_into_url()?;
 
         // Check if the pool has been shutdown
-        if self.inner.is_shutdown() {
+        if self.is_shutdown() {
             return Err(Error::Shutdown);
         }
 
@@ -1296,13 +1303,13 @@ mod tests {
 
         pool.connect().await;
 
-        assert!(!pool.inner.is_shutdown());
+        assert!(!pool.is_shutdown());
 
         tokio::time::sleep(Duration::from_secs(1)).await;
 
         pool.shutdown().await;
 
-        assert!(pool.inner.is_shutdown());
+        assert!(pool.is_shutdown());
 
         assert!(matches!(
             pool.add_relay(&url, RelayOptions::default())