Kaynağa Gözat

Remove `melt_request`

Fixes #809
Cesar Rodas 4 ay önce
ebeveyn
işleme
17019608bc

+ 0 - 6
crates/cdk-common/src/database/mint/mod.rs

@@ -96,12 +96,6 @@ pub trait QuotesDatabase {
     /// Remove [`mint::MeltQuote`]
     async fn remove_melt_quote(&self, quote_id: &Uuid) -> Result<(), Self::Err>;
 
-    /// Add melt request
-    async fn add_melt_request(
-        &self,
-        melt_request: MeltRequest<Uuid>,
-        ln_key: PaymentProcessorKey,
-    ) -> Result<(), Self::Err>;
     /// Get melt request
     async fn get_melt_request(
         &self,

+ 0 - 21
crates/cdk-redb/src/mint/mod.rs

@@ -541,27 +541,6 @@ impl MintQuotesDatabase for MintRedbDatabase {
         Ok(())
     }
 
-    /// Add melt request
-    async fn add_melt_request(
-        &self,
-        melt_request: MeltRequest<Uuid>,
-        ln_key: PaymentProcessorKey,
-    ) -> Result<(), Self::Err> {
-        let write_txn = self.db.begin_write().map_err(Error::from)?;
-        let mut table = write_txn.open_table(MELT_REQUESTS).map_err(Error::from)?;
-
-        table
-            .insert(
-                melt_request.quote().as_bytes(),
-                (
-                    serde_json::to_string(&melt_request)?.as_str(),
-                    serde_json::to_string(&ln_key)?.as_str(),
-                ),
-            )
-            .map_err(Error::from)?;
-
-        Ok(())
-    }
     /// Get melt request
     async fn get_melt_request(
         &self,

+ 1 - 8
crates/cdk-sqlite/src/mint/memory.rs

@@ -1,14 +1,12 @@
 //! In-memory database that is provided by the `cdk-sqlite` crate, mainly for testing purposes.
 use std::collections::HashMap;
 
-use cdk_common::common::PaymentProcessorKey;
 use cdk_common::database::{
     self, MintDatabase, MintKeysDatabase, MintProofsDatabase, MintQuotesDatabase,
 };
 use cdk_common::mint::{self, MintKeySetInfo, MintQuote};
-use cdk_common::nuts::{CurrencyUnit, Id, MeltRequest, Proofs};
+use cdk_common::nuts::{CurrencyUnit, Id, Proofs};
 use cdk_common::MintInfo;
-use uuid::Uuid;
 
 use super::MintSqliteDatabase;
 
@@ -30,7 +28,6 @@ pub async fn new_with_state(
     melt_quotes: Vec<mint::MeltQuote>,
     pending_proofs: Proofs,
     spent_proofs: Proofs,
-    melt_request: Vec<(MeltRequest<Uuid>, PaymentProcessorKey)>,
     mint_info: MintInfo,
 ) -> Result<MintSqliteDatabase, database::Error> {
     let db = empty().await?;
@@ -55,10 +52,6 @@ pub async fn new_with_state(
     db.add_proofs(pending_proofs, None).await?;
     db.add_proofs(spent_proofs, None).await?;
 
-    for (melt_request, ln_key) in melt_request {
-        db.add_melt_request(melt_request, ln_key).await?;
-    }
-
     db.set_mint_info(mint_info).await?;
 
     Ok(db)

+ 0 - 29
crates/cdk-sqlite/src/mint/mod.rs

@@ -754,35 +754,6 @@ ON CONFLICT(request_lookup_id) DO UPDATE SET
         Ok(())
     }
 
-    async fn add_melt_request(
-        &self,
-        melt_request: MeltRequest<Uuid>,
-        ln_key: PaymentProcessorKey,
-    ) -> Result<(), Self::Err> {
-        query(
-            r#"
-                INSERT INTO melt_request
-                (id, inputs, outputs, method, unit)
-                VALUES
-                (:id, :inputs, :outputs, :method, :unit)
-                ON CONFLICT(id) DO UPDATE SET
-                    inputs = excluded.inputs,
-                    outputs = excluded.outputs,
-                    method = excluded.method,
-                    unit = excluded.unit
-        "#,
-        )
-        .bind(":id", melt_request.quote().to_string())
-        .bind(":inputs", serde_json::to_string(&melt_request.inputs())?)
-        .bind(":outputs", serde_json::to_string(&melt_request.outputs())?)
-        .bind(":method", ln_key.method.to_string())
-        .bind(":unit", ln_key.unit.to_string())
-        .execute(&self.pool)
-        .await?;
-
-        Ok(())
-    }
-
     async fn get_melt_request(
         &self,
         quote_id: &Uuid,

+ 0 - 4
crates/cdk/src/mint/mod.rs

@@ -538,9 +538,7 @@ impl Mint {
 mod tests {
     use std::str::FromStr;
 
-    use cdk_common::common::PaymentProcessorKey;
     use cdk_sqlite::mint::memory::new_with_state;
-    use uuid::Uuid;
 
     use super::*;
 
@@ -555,7 +553,6 @@ mod tests {
         seed: &'a [u8],
         mint_info: MintInfo,
         supported_units: HashMap<CurrencyUnit, (u64, u8)>,
-        melt_requests: Vec<(MeltRequest<Uuid>, PaymentProcessorKey)>,
     }
 
     async fn create_mint(config: MintConfig<'_>) -> Mint {
@@ -567,7 +564,6 @@ mod tests {
                 config.melt_quotes,
                 config.pending_proofs,
                 config.spent_proofs,
-                config.melt_requests,
                 config.mint_info,
             )
             .await