refactor: move keysets to mint and remove config

crates/cdk/src/mint/config.rs

@@ -1,50 +0,0 @@
-//! Active mint configuration
-//!
-//! This is the active configuration that can be updated at runtime.
-use std::collections::HashMap;
-use std::sync::Arc;
-
-use arc_swap::ArcSwap;
-
-use super::{Id, MintKeySet};
-
-/// Mint Inner configuration
-pub struct Config {
-    /// Active Mint Keysets
-    pub keysets: HashMap<Id, MintKeySet>,
-}
-
-/// Mint configuration
-///
-/// This struct is used to configure the mint, and it is wrapped inside a ArcSwap, so it can be
-/// updated at runtime without locking the shared config nor without requiriming a mutable reference
-/// to the config
-///
-/// ArcSwap is used instead of a RwLock since the updates should be less frequent than the reads
-#[derive(Clone)]
-pub struct SwappableConfig {
-    config: Arc<ArcSwap<Config>>,
-}
-
-impl SwappableConfig {
-    /// Creates a new configuration instance
-    pub fn new(keysets: HashMap<Id, MintKeySet>) -> Self {
-        let inner = Config { keysets };
-
-        Self {
-            config: Arc::new(ArcSwap::from_pointee(inner)),
-        }
-    }
-
-    /// Gets an Arc of the current configuration
-    pub fn load(&self) -> Arc<Config> {
-        self.config.load().clone()
-    }
-
-    /// Replaces the current keysets with a new one
-    pub fn set_keysets(&self, keysets: HashMap<Id, MintKeySet>) {
-        let new_inner = Config { keysets };
-
-        self.config.store(Arc::new(new_inner));
-    }
-}

crates/cdk/src/mint/keysets.rs

@@ -16,9 +16,9 @@ impl Mint {
     pub async fn keyset_pubkeys(&self, keyset_id: &Id) -> Result<KeysResponse, Error> {
         self.ensure_keyset_loaded(keyset_id).await?;
         let keyset = self
-            .config
-            .load()
             .keysets
+            .read()
+            .await
             .get(keyset_id)
             .ok_or(Error::UnknownKeySet)?
             .clone();
@@ -41,9 +41,9 @@ impl Mint {
 
         Ok(KeysResponse {
             keysets: self
-                .config
-                .load()
                 .keysets
+                .read()
+                .await
                 .values()
                 .filter_map(|k| match active_keysets.contains(&k.id) {
                     true => Some(k.clone().into()),
@@ -82,8 +82,7 @@ impl Mint {
     #[instrument(skip(self))]
     pub async fn keyset(&self, id: &Id) -> Result<Option<KeySet>, Error> {
         self.ensure_keyset_loaded(id).await?;
-        let config = self.config.load();
-        let keysets = &config.keysets;
+        let keysets = self.keysets.read().await;
         let keyset = keysets.get(id).map(|k| k.clone().into());
         Ok(keyset)
     }
@@ -118,9 +117,8 @@ impl Mint {
         self.localstore.add_keyset_info(keyset_info).await?;
         self.localstore.set_active_keyset(unit, id).await?;
 
-        let mut keysets = self.config.load().keysets.clone();
+        let mut keysets = self.keysets.write().await;
         keysets.insert(id, keyset);
-        self.config.set_keysets(keysets);
 
         Ok(())
     }
@@ -128,11 +126,14 @@ impl Mint {
     /// Ensure Keyset is loaded in mint
     #[instrument(skip(self))]
     pub async fn ensure_keyset_loaded(&self, id: &Id) -> Result<(), Error> {
-        if self.config.load().keysets.contains_key(id) {
-            return Ok(());
+        {
+            let keysets = self.keysets.read().await;
+            if keysets.contains_key(id) {
+                return Ok(());
+            }
         }
 
-        let mut keysets = self.config.load().keysets.clone();
+        let mut keysets = self.keysets.write().await;
         let keyset_info = self
             .localstore
             .get_keyset_info(id)
@@ -140,7 +141,6 @@ impl Mint {
             .ok_or(Error::UnknownKeySet)?;
         let id = keyset_info.id;
         keysets.insert(id, self.generate_keyset(keyset_info));
-        self.config.set_keysets(keysets);
 
         Ok(())
     }