refactor(cdk/cdk_database): rename add_active_keyset to set_active_keyset

CHANGELOG.md

@@ -29,8 +29,9 @@
 ### Changed
 - cdk(wallet): `fn send` returns `Token` so the user can use the struct of convert it to a v3 or v4 string ([thesimplekid]).
 - cdk(wallet): Publicly export `MultiMintWallet` ([thesimplekid]).
-- cdk-database: Get `pending` and `spent` `proofs` by `ys` or `secrets` instead of a single proofs ([thesimplekid]).
-- cdk-database: Change `add_blind_signature` to `add_blind_signatures` ([thesimplekid]).
+- cdk(cdk-database): Get `pending` and `spent` `proofs` by `ys` or `secrets` instead of a single proofs ([thesimplekid]).
+- cdk(cdk-database): Change `add_blind_signature` to `add_blind_signatures` ([thesimplekid]).
+- cdk(cdk-database): Rename `add_active_keyset` to `set_active_keyset` ([thesimplekid]).
 
 ### Added
 - cdk(NUT-11): Add `Copy` on `SigFlag` ([thesimplekid]).

crates/cdk-redb/src/mint/mod.rs

@@ -133,7 +133,7 @@ impl MintRedbDatabase {
 impl MintDatabase for MintRedbDatabase {
     type Err = cdk_database::Error;
 
-    async fn add_active_keyset(&self, unit: CurrencyUnit, id: Id) -> Result<(), Self::Err> {
+    async fn set_active_keyset(&self, unit: CurrencyUnit, id: Id) -> Result<(), Self::Err> {
         let db = self.db.lock().await;
 
         let write_txn = db.begin_write().map_err(Error::from)?;

crates/cdk-sqlite/src/mint/mod.rs

@@ -57,7 +57,7 @@ impl MintSqliteDatabase {
 impl MintDatabase for MintSqliteDatabase {
     type Err = cdk_database::Error;
 
-    async fn add_active_keyset(&self, unit: CurrencyUnit, id: Id) -> Result<(), Self::Err> {
+    async fn set_active_keyset(&self, unit: CurrencyUnit, id: Id) -> Result<(), Self::Err> {
         let mut transaction = self.pool.begin().await.map_err(Error::from)?;
         sqlx::query(
             r#"
@@ -67,7 +67,6 @@ WHERE unit IS ?;
         "#,
         )
         .bind(unit.to_string())
-        .bind(id.to_string())
         .execute(&mut transaction)
         .await
         .map_err(Error::from)?;
@@ -90,6 +89,7 @@ AND id IS ?;
 
         Ok(())
     }
+
     async fn get_active_keyset_id(&self, unit: &CurrencyUnit) -> Result<Option<Id>, Self::Err> {
         let rec = sqlx::query(
             r#"
@@ -115,6 +115,7 @@ AND unit IS ?
             Id::from_str(rec.try_get("id").map_err(Error::from)?).map_err(Error::from)?,
         ))
     }
+
     async fn get_active_keysets(&self) -> Result<HashMap<CurrencyUnit, Id>, Self::Err> {
         let recs = sqlx::query(
             r#"
@@ -125,7 +126,6 @@ WHERE active = 1
         )
         .fetch_all(&self.pool)
         .await
-        // TODO: should check if error is not found and return none
         .map_err(Error::from)?;
 
         let keysets = recs
@@ -160,7 +160,6 @@ VALUES (?, ?, ?, ?, ?, ?, ?, ?);
         .bind(quote.request_lookup_id)
         .execute(&self.pool)
         .await
-        // TODO: should check if error is not found and return none
         .map_err(Error::from)?;
 
         Ok(())

crates/cdk/src/cdk_database/mint_memory.rs

@@ -70,7 +70,7 @@ impl MintMemoryDatabase {
 impl MintDatabase for MintMemoryDatabase {
     type Err = Error;
 
-    async fn add_active_keyset(&self, unit: CurrencyUnit, id: Id) -> Result<(), Self::Err> {
+    async fn set_active_keyset(&self, unit: CurrencyUnit, id: Id) -> Result<(), Self::Err> {
         self.active_keysets.write().await.insert(unit, id);
         Ok(())
     }

crates/cdk/src/cdk_database/mod.rs

@@ -164,7 +164,7 @@ pub trait MintDatabase {
     type Err: Into<Error> + From<Error>;
 
     /// Add Active Keyset
-    async fn add_active_keyset(&self, unit: CurrencyUnit, id: Id) -> Result<(), Self::Err>;
+    async fn set_active_keyset(&self, unit: CurrencyUnit, id: Id) -> Result<(), Self::Err>;
     /// Get Active Keyset
     async fn get_active_keyset_id(&self, unit: &CurrencyUnit) -> Result<Option<Id>, Self::Err>;
     /// Get all Active Keyset

crates/cdk/src/mint/mod.rs

@@ -102,7 +102,7 @@ impl Mint {
                             let mut keyset_info = highest_index_keyset;
                             keyset_info.active = true;
                             localstore.add_keyset_info(keyset_info).await?;
-                            localstore.add_active_keyset(unit, id).await?;
+                            localstore.set_active_keyset(unit, id).await?;
                             continue;
                         } else {
                             highest_index_keyset.derivation_path_index.unwrap_or(0) + 1
@@ -123,7 +123,7 @@ impl Mint {
 
                         let id = keyset_info.id;
                         localstore.add_keyset_info(keyset_info).await?;
-                        localstore.add_active_keyset(unit, id).await?;
+                        localstore.set_active_keyset(unit, id).await?;
                         active_keysets.insert(id, keyset);
                     }
                 }
@@ -143,7 +143,7 @@ impl Mint {
                     );
                     let id = keyset_info.id;
                     localstore.add_keyset_info(keyset_info).await?;
-                    localstore.add_active_keyset(CurrencyUnit::Sat, id).await?;
+                    localstore.set_active_keyset(CurrencyUnit::Sat, id).await?;
                     active_keysets.insert(id, keyset);
                 }
             }
@@ -438,7 +438,7 @@ impl Mint {
         );
         let id = keyset_info.id;
         self.localstore.add_keyset_info(keyset_info).await?;
-        self.localstore.add_active_keyset(unit, id).await?;
+        self.localstore.set_active_keyset(unit, id).await?;
 
         let mut keysets = self.keysets.write().await;
         keysets.insert(id, keyset);