Rename structs

crates/cdk/src/mint/config.rs

@@ -10,7 +10,7 @@ use super::{Id, MintInfo, MintKeySet};
 use crate::mint_url::MintUrl;
 
 /// Mint Inner configuration
-pub struct Inner {
+pub struct Config {
     /// Active Mint Keysets
     pub keysets: HashMap<Id, MintKeySet>,
     /// Mint url
@@ -27,72 +27,72 @@ pub struct Inner {
 ///
 /// ArcSwap is used instead of a RwLock since the updates should be less frequent than the reads
 #[derive(Clone)]
-pub struct Config {
-    inner: Arc<ArcSwap<Inner>>,
+pub struct SwappableConfig {
+    config: Arc<ArcSwap<Config>>,
 }
 
-impl Config {
+impl SwappableConfig {
     /// Creates a new configuration instance
     pub fn new(mint_url: MintUrl, mint_info: MintInfo, keysets: HashMap<Id, MintKeySet>) -> Self {
-        let inner = Inner {
+        let inner = Config {
             keysets,
             mint_info,
             mint_url,
         };
 
         Self {
-            inner: Arc::new(ArcSwap::from_pointee(inner)),
+            config: Arc::new(ArcSwap::from_pointee(inner)),
         }
     }
 
     /// Gets an Arc of the current configuration
-    pub fn get_config(&self) -> Arc<Inner> {
-        self.inner.load().clone()
+    pub fn load(&self) -> Arc<Config> {
+        self.config.load().clone()
     }
 
     /// Gets a copy of the mint url
     pub fn mint_url(&self) -> MintUrl {
-        self.get_config().mint_url.clone()
+        self.load().mint_url.clone()
     }
 
     /// Replace the current mint url with a new one
     pub fn set_mint_url(&self, mint_url: MintUrl) {
-        let current_inner = self.get_config();
-        let new_inner = Inner {
+        let current_inner = self.load();
+        let new_inner = Config {
             mint_url,
             mint_info: current_inner.mint_info.clone(),
             keysets: current_inner.keysets.clone(),
         };
 
-        self.inner.store(Arc::new(new_inner));
+        self.config.store(Arc::new(new_inner));
     }
 
     /// Gets a copy of the mint info
     pub fn mint_info(&self) -> MintInfo {
-        self.get_config().mint_info.clone()
+        self.load().mint_info.clone()
     }
 
     /// Replaces the current mint info with a new one
     pub fn set_mint_info(&self, mint_info: MintInfo) {
-        let current_inner = self.get_config();
-        let new_inner = Inner {
+        let current_inner = self.load();
+        let new_inner = Config {
             mint_info,
             mint_url: current_inner.mint_url.clone(),
             keysets: current_inner.keysets.clone(),
         };
 
-        self.inner.store(Arc::new(new_inner));
+        self.config.store(Arc::new(new_inner));
     }
 
     /// Replaces the current keysets with a new one
     pub fn set_keysets(&self, keysets: HashMap<Id, MintKeySet>) {
-        let current_inner = self.get_config();
-        let new_inner = Inner {
+        let current_inner = self.load();
+        let new_inner = Config {
             mint_info: current_inner.mint_info.clone(),
             mint_url: current_inner.mint_url.clone(),
             keysets,
         };
 
-        self.inner.store(Arc::new(new_inner));
+        self.config.store(Arc::new(new_inner));
     }
 }

crates/cdk/src/mint/keysets.rs

@@ -17,7 +17,7 @@ impl Mint {
         self.ensure_keyset_loaded(keyset_id).await?;
         let keyset = self
             .config
-            .get_config()
+            .load()
             .keysets
             .get(keyset_id)
             .ok_or(Error::UnknownKeySet)?
@@ -42,7 +42,7 @@ impl Mint {
         Ok(KeysResponse {
             keysets: self
                 .config
-                .get_config()
+                .load()
                 .keysets
                 .values()
                 .filter_map(|k| match active_keysets.contains(&k.id) {
@@ -82,7 +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.get_config();
+        let config = self.config.load();
         let keysets = &config.keysets;
         let keyset = keysets.get(id).map(|k| k.clone().into());
         Ok(keyset)
@@ -118,7 +118,7 @@ impl Mint {
         self.localstore.add_keyset_info(keyset_info).await?;
         self.localstore.set_active_keyset(unit, id).await?;
 
-        let mut keysets = self.config.get_config().keysets.clone();
+        let mut keysets = self.config.load().keysets.clone();
         keysets.insert(id, keyset);
         self.config.set_keysets(keysets);
 
@@ -128,11 +128,11 @@ 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.get_config().keysets.contains_key(id) {
+        if self.config.load().keysets.contains_key(id) {
             return Ok(());
         }
 
-        let mut keysets = self.config.get_config().keysets.clone();
+        let mut keysets = self.config.load().keysets.clone();
         let keyset_info = self
             .localstore
             .get_keyset_info(id)