Use dyn HttpClientMethods in Wallet

cashubtc · Oct 30, 2024 · ba643ff · ba643ff
1 parent 24dbfde
commit ba643ff
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 15 deletions.
diff --git a/crates/cdk/src/wallet/client.rs b/crates/cdk/src/wallet/client.rs
@@ -1,5 +1,7 @@
 //! Wallet client
 
+use std::fmt::Debug;
+
 use async_trait::async_trait;
 use reqwest::Client;
 use serde_json::Value;
@@ -374,7 +376,7 @@ impl HttpClientMethods for HttpClient {
 
 /// Http Client Methods
 #[async_trait]
-pub trait HttpClientMethods {
+pub trait HttpClientMethods: Debug {
     /// Get Active Mint Keys [NUT-01]
     async fn get_mint_keys(&self, mint_url: MintUrl) -> Result<Vec<KeySet>, Error>;
 

diff --git a/crates/cdk/src/wallet/keysets.rs b/crates/cdk/src/wallet/keysets.rs
@@ -6,8 +6,6 @@ use crate::nuts::Keys;
 use crate::Error;
 use crate::Wallet;
 
-use super::client::HttpClientMethods;
-
 impl Wallet {
     /// Get keys for mint keyset
     ///

diff --git a/crates/cdk/src/wallet/melt.rs b/crates/cdk/src/wallet/melt.rs
@@ -12,7 +12,6 @@ use crate::{
     Amount, Error, Wallet,
 };
 
-use super::client::HttpClientMethods;
 use super::MeltQuote;
 
 impl Wallet {

diff --git a/crates/cdk/src/wallet/mint.rs b/crates/cdk/src/wallet/mint.rs
@@ -1,6 +1,5 @@
 use tracing::instrument;
 
-use super::client::HttpClientMethods;
 use super::MintQuote;
 use crate::nuts::nut00::ProofsMethods;
 use crate::{

diff --git a/crates/cdk/src/wallet/mod.rs b/crates/cdk/src/wallet/mod.rs
@@ -56,7 +56,7 @@ pub struct Wallet {
     /// The targeted amount of proofs to have at each size
     pub target_proof_count: usize,
     xpriv: Xpriv,
-    client: HttpClient,
+    client: Arc<dyn HttpClientMethods>,
 }
 
 impl Wallet {
@@ -89,16 +89,16 @@ impl Wallet {
         Ok(Self {
             mint_url: MintUrl::from_str(mint_url)?,
             unit,
-            client: HttpClient::new(),
+            client: Arc::new(HttpClient::new()),
             localstore,
             xpriv,
             target_proof_count: target_proof_count.unwrap_or(3),
         })
     }
 
     /// Change HTTP client
-    pub fn set_client(&mut self, client: HttpClient) {
-        self.client = client;
+    pub fn set_client<C: HttpClientMethods + 'static>(&mut self, client: C) {
+        self.client = Arc::new(client);
     }
 
     /// Fee required for proof set

diff --git a/crates/cdk/src/wallet/proofs.rs b/crates/cdk/src/wallet/proofs.rs
@@ -10,8 +10,6 @@ use crate::{
     Amount, Error, Wallet,
 };
 
-use super::client::HttpClientMethods;
-
 impl Wallet {
     /// Get unspent proofs for mint
     #[instrument(skip(self))]

diff --git a/crates/cdk/src/wallet/receive.rs b/crates/cdk/src/wallet/receive.rs
@@ -16,8 +16,6 @@ use crate::{
     Amount, Error, Wallet, SECP256K1,
 };
 
-use super::client::HttpClientMethods;
-
 impl Wallet {
     /// Receive proofs
     #[instrument(skip_all)]

diff --git a/crates/cdk/src/wallet/swap.rs b/crates/cdk/src/wallet/swap.rs
@@ -16,8 +16,6 @@ use crate::Amount;
 use crate::Error;
 use crate::Wallet;
 
-use super::client::HttpClientMethods;
-
 impl Wallet {
     /// Swap
     #[instrument(skip(self, input_proofs))]