Merge pull request #246 from ngutech21/feat-wallet-tx-handling

Feat wallet tx handling
ngutech21 · Feb 26, 2024 · 7496b81 · 7496b81
2 parents d9072cc + ad92219
commit 7496b81
Show file tree

Hide file tree

Showing 9 changed files with 233 additions and 322 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/moksha-mint/src/error.rs b/moksha-mint/src/error.rs
@@ -77,8 +77,8 @@ pub enum MokshaMintError {
     #[error("Currency not supported {0}")]
     CurrencyNotSupported(CurrencyUnit),
 
-    #[error("Not Enough tokens: {0}")]
-    NotEnoughTokens(String),
+    #[error("Not Enough tokens. Required amount {0}")]
+    NotEnoughTokens(u64),
 
     #[error("Lnd error: {0}")]
     Lnd(#[from] Status),

diff --git a/moksha-mint/src/mint.rs b/moksha-mint/src/mint.rs
@@ -253,10 +253,7 @@ impl Mint {
         let proofs_amount = proofs.total_amount();
 
         if proofs_amount < quote.amount {
-            return Err(MokshaMintError::NotEnoughTokens(format!(
-                "Required amount: {}",
-                quote.amount
-            )));
+            return Err(MokshaMintError::NotEnoughTokens(quote.amount));
         }
 
         self.check_used_proofs(proofs).await?;

diff --git a/moksha-wallet/Cargo.toml b/moksha-wallet/Cargo.toml
@@ -35,7 +35,7 @@ tokio = { version = "1.35.1", features = ["rt", "sync"] }
 [target.'cfg(not(target_family="wasm"))'.dependencies]
 reqwest = { version = "0.11.23", features = ["serde_json", "json", "rustls-tls"], default-features = false }
 tokio = { version = "1.35.1", features = ["rt", "rt-multi-thread", "macros"] }
-sqlx = { version = "0.7.3", default-features = false, features = ["sqlite", "runtime-tokio", "tls-native-tls", "migrate", "macros"] }
+sqlx = { version = "0.7.3", default-features = false, features = ["sqlite", "runtime-tokio", "tls-rustls", "migrate", "macros"] }
 
 [dev-dependencies]
 tempfile = "3.9.0"