Merge remote-tracking branch 'upstream/main' into lnd-partial-payments

cashubtc · Jan 28, 2025 · b750cd1 · b750cd1
2 parents b56d956 + e3fb7f9
commit b750cd1
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/crates/cdk-integration-tests/src/init_pure_tests.rs b/crates/cdk-integration-tests/src/init_pure_tests.rs
@@ -167,7 +167,7 @@ pub async fn create_and_start_test_mint() -> anyhow::Result<Arc<Mint>> {
     mint_builder = mint_builder.add_ln_backend(
         CurrencyUnit::Sat,
         PaymentMethod::Bolt11,
-        MintMeltLimits::default(),
+        MintMeltLimits::new(1, 1_000),
         ln_fake_backend,
     );
 

diff --git a/crates/cdk-integration-tests/tests/regtest.rs b/crates/cdk-integration-tests/tests/regtest.rs
@@ -19,6 +19,7 @@ use cdk_integration_tests::init_regtest::{
     get_cln_dir, get_lnd_cert_file_path, get_lnd_dir, get_lnd_macaroon_path, get_mint_port,
     get_mint_url, get_mint_ws_url, LND_RPC_ADDR, LND_TWO_RPC_ADDR,
 };
+use cdk_integration_tests::wait_for_mint_to_be_paid;
 use futures::{join, SinkExt, StreamExt};
 use lightning_invoice::Bolt11Invoice;
 use ln_regtest_rs::ln_client::{ClnClient, LightningClient, LndClient};
@@ -95,6 +96,8 @@ async fn test_regtest_mint_melt_round_trip() -> Result<()> {
 
     lnd_client.pay_invoice(mint_quote.request).await.unwrap();
 
+    wait_for_mint_to_be_paid(&wallet, &mint_quote.id).await?;
+
     let proofs = wallet
         .mint(&mint_quote.id, SplitTarget::default(), None)
         .await?;
@@ -177,6 +180,8 @@ async fn test_regtest_mint_melt() -> Result<()> {
 
     lnd_client.pay_invoice(mint_quote.request).await?;
 
+    wait_for_mint_to_be_paid(&wallet, &mint_quote.id).await?;
+
     let proofs = wallet
         .mint(&mint_quote.id, SplitTarget::default(), None)
         .await?;
@@ -205,6 +210,8 @@ async fn test_restore() -> Result<()> {
 
     lnd_client.pay_invoice(mint_quote.request).await?;
 
+    wait_for_mint_to_be_paid(&wallet, &mint_quote.id).await?;
+
     let _mint_amount = wallet
         .mint(&mint_quote.id, SplitTarget::default(), None)
         .await?;
@@ -265,6 +272,8 @@ async fn test_pay_invoice_twice() -> Result<()> {
         .await
         .expect("Could not pay invoice");
 
+    wait_for_mint_to_be_paid(&wallet, &mint_quote.id).await?;
+
     let proofs = wallet
         .mint(&mint_quote.id, SplitTarget::default(), None)
         .await?;
@@ -319,6 +328,8 @@ async fn test_internal_payment() -> Result<()> {
 
     lnd_client.pay_invoice(mint_quote.request).await?;
 
+    wait_for_mint_to_be_paid(&wallet, &mint_quote.id).await?;
+
     let _mint_amount = wallet
         .mint(&mint_quote.id, SplitTarget::default(), None)
         .await?;
@@ -343,6 +354,8 @@ async fn test_internal_payment() -> Result<()> {
 
     let _melted = wallet.melt(&melt.id).await.unwrap();
 
+    wait_for_mint_to_be_paid(&wallet, &mint_quote.id).await?;
+
     let _wallet_2_mint = wallet_2
         .mint(&mint_quote.id, SplitTarget::default(), None)
         .await

diff --git a/crates/cdk/src/mint/builder.rs b/crates/cdk/src/mint/builder.rs
@@ -242,8 +242,8 @@ impl MintBuilder {
     }
 }
 
-/// Mint Melt Limits
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Default)]
+/// Mint and Melt Limits
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub struct MintMeltLimits {
     /// Min mint amount
     pub mint_min: Amount,
@@ -256,7 +256,7 @@ pub struct MintMeltLimits {
 }
 
 impl MintMeltLimits {
-    /// Create new [`MintMeltLimits`]
+    /// Create new [`MintMeltLimits`]. The `min` and `max` limits apply to both minting and melting.
     pub fn new(min: u64, max: u64) -> Self {
         Self {
             mint_min: min.into(),

diff --git a/justfile b/justfile
@@ -47,6 +47,9 @@ test: build
   fi
   cargo test --lib
 
+  # Run pure integration tests
+  cargo test -p cdk-integration-tests --test integration_tests_pure
+
 # run `cargo clippy` on everything
 clippy *ARGS="--locked --offline --workspace --all-targets":
   cargo clippy {{ARGS}}