Better naming for structs

I think the `subscription_manager` was a bit unintuitive; I think
`pubsub_manager` is a much more descriptive name.

crates/cdk-axum/src/ws/subscribe.rs

@@ -4,7 +4,7 @@ use super::{
 };
 use cdk::{
     nuts::nut17::{NotificationPayload, Params},
-    subscription::SubId,
+    pub_sub::SubId,
 };
 
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
@@ -43,12 +43,7 @@ impl WsHandle for Method {
         if context.subscriptions.contains_key(&sub_id) {
             return Err(WsError::InvalidParams);
         }
-        let mut subscription = context
-            .state
-            .mint
-            .subscription_manager
-            .subscribe(self.0)
-            .await;
+        let mut subscription = context.state.mint.pubsub_manager.subscribe(self.0).await;
         let publisher = context.publisher.clone();
         context.subscriptions.insert(
             sub_id.clone(),

crates/cdk-axum/src/ws/unsubscribe.rs

@@ -1,5 +1,5 @@
 use super::{handler::WsHandle, WsContext, WsError};
-use cdk::subscription::SubId;
+use cdk::pub_sub::SubId;
 
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 pub struct Method {

crates/cdk-mintd/src/main.rs

@@ -533,7 +533,7 @@ async fn check_pending_mint_quotes(
                     mint.localstore
                         .update_mint_quote_state(&quote.id, state)
                         .await?;
-                    mint.subscription_manager
+                    mint.pubsub_manager
                         .mint_quote_bolt11_status(&quote, state);
                 }
             }
@@ -630,7 +630,7 @@ async fn check_pending_melt_quotes(
                     .update_melt_quote_state(&pending_quote.id, pay_invoice_response.status)
                     .await?;
 
-                mint.subscription_manager.melt_quote_status(
+                mint.pubsub_manager.melt_quote_status(
                     &pending_quote,
                     None,
                     None,

crates/cdk/src/lib.rs

@@ -20,7 +20,7 @@ pub mod util;
 #[cfg(feature = "wallet")]
 pub mod wallet;
 
-pub mod subscription;
+pub mod pub_sub;
 
 pub mod fees;
 

crates/cdk/src/mint/melt.rs

@@ -132,7 +132,7 @@ impl Mint {
 
         let quote: MeltQuoteBolt11Response = quote.into();
 
-        self.subscription_manager
+        self.pubsub_manager
             .broadcast(NotificationPayload::MeltQuoteBolt11Response(quote.clone()));
 
         Ok(quote)
@@ -394,7 +394,7 @@ impl Mint {
             .await?;
 
         if let Ok(Some(quote)) = self.localstore.get_melt_quote(&melt_request.quote).await {
-            self.subscription_manager
+            self.pubsub_manager
                 .melt_quote_status(&quote, None, None, MeltQuoteState::Unpaid);
         }
 
@@ -639,7 +639,7 @@ impl Mint {
             .update_melt_quote_state(&melt_request.quote, MeltQuoteState::Paid)
             .await?;
 
-        self.subscription_manager.melt_quote_status(
+        self.pubsub_manager.melt_quote_status(
             &quote,
             payment_preimage.clone(),
             None,

crates/cdk/src/mint/mint_nut04.rs

@@ -116,7 +116,7 @@ impl Mint {
 
         let quote: MintQuoteBolt11Response = quote.into();
 
-        self.subscription_manager
+        self.pubsub_manager
             .broadcast(NotificationPayload::MintQuoteBolt11Response(quote.clone()));
 
         Ok(quote)
@@ -214,7 +214,7 @@ impl Mint {
                 .update_mint_quote_state(&mint_quote.id, MintQuoteState::Paid)
                 .await?;
 
-            self.subscription_manager
+            self.pubsub_manager
                 .mint_quote_bolt11_status(&mint_quote, MintQuoteState::Paid);
         }
         Ok(())
@@ -283,7 +283,7 @@ impl Mint {
                 .await
                 .unwrap();
 
-            self.subscription_manager
+            self.pubsub_manager
                 .mint_quote_bolt11_status(&mint_quote, MintQuoteState::Paid);
 
             return Err(Error::BlindedMessageAlreadySigned);
@@ -312,7 +312,7 @@ impl Mint {
             .update_mint_quote_state(&mint_request.quote, MintQuoteState::Issued)
             .await?;
 
-        self.subscription_manager
+        self.pubsub_manager
             .mint_quote_bolt11_status(&mint_quote, MintQuoteState::Issued);
 
         Ok(nut04::MintBolt11Response {

crates/cdk/src/mint/mod.rs

@@ -47,7 +47,7 @@ pub struct Mint {
     /// Ln backends for mint
     pub ln: HashMap<LnKey, Arc<dyn MintLightning<Err = cdk_lightning::Error> + Send + Sync>>,
     /// Subscription manager
-    pub subscription_manager: Arc<SubscriptionManager>,
+    pub pubsub_manager: Arc<PubSubManager>,
     /// Active Mint Keysets
     keysets: Arc<RwLock<HashMap<Id, MintKeySet>>>,
     secp_ctx: Secp256k1<secp256k1::All>,
@@ -172,7 +172,7 @@ impl Mint {
         Ok(Self {
             mint_url: MintUrl::from_str(mint_url)?,
             keysets: Arc::new(RwLock::new(active_keysets)),
-            subscription_manager: Default::default(),
+            pubsub_manager: Default::default(),
             secp_ctx,
             quote_ttl,
             xpriv,

crates/cdk/src/nuts/mod.rs

@@ -48,4 +48,4 @@ pub use nut12::{BlindSignatureDleq, ProofDleq};
 pub use nut14::HTLCWitness;
 pub use nut15::{Mpp, MppMethodSettings, Settings as NUT15Settings};
 
-pub use nut17::{NotificationPayload, Manager as SubscriptionManager};
+pub use nut17::{NotificationPayload, PubSubManager};

crates/cdk/src/nuts/nut17.rs

@@ -5,7 +5,7 @@ use crate::{
         MeltQuoteBolt11Response, MeltQuoteState, MintQuoteBolt11Response, MintQuoteState,
         ProofState,
     },
-    subscription::{self, Index, Indexable},
+    pub_sub::{self, Index, Indexable},
 };
 use serde::{Deserialize, Serialize};
 use std::ops::Deref;
@@ -22,7 +22,7 @@ pub struct Params {
     pub id: SubId,
 }
 
-pub use crate::subscription::SubId;
+pub use crate::pub_sub::SubId;
 
 use super::BlindSignature;
 
@@ -110,20 +110,21 @@ impl From<Params> for Vec<Index<(String, Kind)>> {
 
 /// Manager
 #[derive(Default)]
-/// Subscription Manager
+/// Publish–subscribe manager
 ///
-/// This is the Subscription Manager for the cdk crate
-pub struct Manager(subscription::Manager<NotificationPayload, (String, Kind)>);
+/// Nut-17 implementation is system-wide and not only through the WebSocket, so
+/// it is possible for another part of the system to subscribe to events.
+pub struct PubSubManager(pub_sub::Manager<NotificationPayload, (String, Kind)>);
 
-impl Deref for Manager {
-    type Target = subscription::Manager<NotificationPayload, (String, Kind)>;
+impl Deref for PubSubManager {
+    type Target = pub_sub::Manager<NotificationPayload, (String, Kind)>;
 
     fn deref(&self) -> &Self::Target {
         &self.0
     }
 }
 
-impl Manager {
+impl PubSubManager {
     /// Helper function to emit a MintQuoteBolt11Response status
     pub fn mint_quote_bolt11_status(&self, quote: &MintQuote, new_state: MintQuoteState) {
         self.broadcast(
@@ -172,7 +173,7 @@ mod test {
 
     #[tokio::test]
     async fn active_and_drop() {
-        let manager = Manager::default();
+        let manager = PubSubManager::default();
         let params = Params {
             kind: Kind::ProofState,
             filters: vec!["x".to_string()],
@@ -197,7 +198,7 @@ mod test {
 
     #[tokio::test]
     async fn broadcast() {
-        let manager = Manager::default();
+        let manager = PubSubManager::default();
         let mut subscriptions = [
             manager
                 .subscribe(Params {
@@ -255,7 +256,7 @@ mod test {
 
     #[tokio::test]
     async fn json_test() {
-        let manager = Manager::default();
+        let manager = PubSubManager::default();
         let mut subscription = manager
             .subscribe::<Params>(
                 serde_json::from_str(r#"{"kind":"proof_state","filters":["02194603ffa36356f4a56b7df9371fc3192472351453ec7398b8da8117e7c3e104"],"subId":"uno"}"#)

crates/cdk/src/subscription/mod.rs → crates/cdk/src/pub_sub/mod.rs

@@ -1,6 +1,13 @@
-//! Subscription manager
+//! Publish–subscribe pattern.
 //!
-//! This is an attempt to implement [NUT-17](https://github.com/cashubtc/nuts/blob/main/17.md)
+//! This is a generic implementation for
+//! [NUT-17(https://github.com/cashubtc/nuts/blob/main/17.md) with a type
+//! agnostic Publish-subscribe manager.
+//!
+//! The manager has a method for subscribers to subscribe to events with a
+//! generic type that must be converted to a vector of indexes.
+//!
+//! Events are also generic that should implement the `Indexable` trait.
 use serde::{Deserialize, Serialize};
 use std::{
     cmp::Ordering,