Merge pull request #8 from benthecarman/cashu-tests

Author: benthecarman

.github/workflows/tests.yml

@@ -2,6 +2,7 @@ name: Tests
 
 on:
   pull_request:
+  push:
   workflow_dispatch:
 
 jobs:
@@ -17,6 +18,12 @@ jobs:
           override: true
           profile: minimal
 
+      - name: Install Protoc
+        uses: arduino/setup-protoc@v3
+        with:
+          version: "30.2"
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+
       - uses: actions/cache@v3
         with:
           path: |
@@ -36,3 +43,6 @@ jobs:
 
       - name: Run tests
         run: cargo test --features _test-utils
+
+      - name: Run cashu tests
+        run: cargo test --features _cashu-tests

ci/check-lint.sh

@@ -4,7 +4,7 @@ set -x
 
 RUSTC_MINOR_VERSION=$(rustc --version | awk '{ split($2,a,"."); print a[2] }')
 
-cargo clippy -- -D warnings \
+cargo clippy --features _test-utils -- -D warnings \
 	`# We use this for sat groupings` \
 	-A clippy::inconsistent-digit-grouping \
 	`# Some stuff we do sometimes when its reasonable` \

justfile

@@ -2,7 +2,10 @@ default:
     @just --list
 
 test *args:
-    cargo test {{args}} --features _test-utils -p orange-sdk
+    cargo test {{ args }} --features _test-utils -p orange-sdk
+
+test-cashu *args:
+    cargo test {{ args }} --features _cashu-tests -p orange-sdk
 
 cli:
     cd examples/cli && cargo run

orange-sdk/Cargo.toml

@@ -8,6 +8,7 @@ default = ["spark"]
 spark = ["spark-wallet", "uuid"]
 cashu = ["cdk", "serde_json"]
 _test-utils = ["corepc-node", "cashu", "uuid/v7", "rand"]
+_cashu-tests = ["_test-utils", "cdk-ldk-node", "cdk/mint", "cdk-sqlite", "cdk-axum", "axum"]
 
 [dependencies]
 graduated-rebalancer = { path = "../graduated-rebalancer", version = "0.1.0" }
@@ -25,3 +26,7 @@ serde_json = { version = "1.0", optional = true }
 async-trait = "0.1"
 
 corepc-node = { version = "0.8.0", features = ["29_0", "download"], optional = true }
+cdk-ldk-node = { version = "0.12.0", optional = true }
+cdk-sqlite = { version = "0.12.0", optional = true }
+cdk-axum = { version = "0.12.0", optional = true }
+axum = { version = "0.8.1", optional = true }

orange-sdk/src/lib.rs

@@ -527,7 +527,14 @@ impl Wallet {
 			)),
 			#[cfg(feature = "_test-utils")]
 			ExtraConfig::Dummy(cfg) => Arc::new(Box::new(
-				DummyTrustedWallet::new(cfg.uuid, &cfg.lsp, &cfg.bitcoind, cfg.rt.clone()).await,
+				DummyTrustedWallet::new(
+					cfg.uuid,
+					&cfg.lsp,
+					&cfg.bitcoind,
+					Arc::clone(&event_queue),
+					Arc::clone(&runtime),
+				)
+				.await,
 			)),
 		};
 

orange-sdk/src/trusted_wallet/cashu/mod.rs

@@ -244,10 +244,21 @@ impl TrustedWalletInterface for Cashu {
 				},
 			};
 
-			// Execute the melt
-			let _melt_response = self.cashu_wallet.melt(&quote.id).await.map_err(|e| {
-				TrustedError::WalletOperationFailed(format!("Failed to execute melt: {e}"))
-			})?;
+			// Execute the melt in separate thread, do not block on it being successful/failed
+			let cashu_wallet = Arc::clone(&self.cashu_wallet);
+			let logger = Arc::clone(&self.logger);
+			let quote_id = quote.id.clone();
+			tokio::spawn(async move {
+				// todo react with events too
+				match cashu_wallet.melt(&quote_id).await {
+					Ok(_) => {
+						log_info!(logger, "Successfully sent for quote: {quote_id}");
+					},
+					Err(e) => {
+						log_error!(logger, "Failed to melt quote {quote_id}: {e}",);
+					},
+				}
+			});
 
 			// Convert quote ID to a 32-byte array for consistency
 			// We'll use the quote ID as the payment identifier

orange-sdk/src/trusted_wallet/dummy.rs

@@ -1,7 +1,8 @@
 //! A dummy implementation of `TrustedWalletInterface` for testing purposes.
 
+use crate::EventQueue;
 use crate::bitcoin::hashes::Hash;
-use crate::store::TxStatus;
+use crate::store::{PaymentId, TxStatus};
 use crate::trusted_wallet::{Payment, TrustedError, TrustedWalletInterface};
 use bitcoin_payment_instructions::PaymentMethod;
 use bitcoin_payment_instructions::amount::Amount;
@@ -44,7 +45,9 @@ pub struct DummyTrustedWalletExtraConfig {
 
 impl DummyTrustedWallet {
 	/// Creates a new `DummyTrustedWallet` instance.
-	pub(crate) async fn new(uuid: Uuid, lsp: &Node, bitcoind: &Bitcoind, rt: Arc<Runtime>) -> Self {
+	pub(crate) async fn new(
+		uuid: Uuid, lsp: &Node, bitcoind: &Bitcoind, event_queue: Arc<EventQueue>, rt: Arc<Runtime>,
+	) -> Self {
 		let mut builder = ldk_node::Builder::new();
 		builder.set_network(Network::Regtest);
 		let mut seed: [u8; 64] = [0; 64];
@@ -105,7 +108,7 @@ impl DummyTrustedWallet {
 							bal.fetch_sub(payment.amount.milli_sats(), Ordering::SeqCst);
 						}
 					},
-					Event::PaymentReceived { payment_id, amount_msat, .. } => {
+					Event::PaymentReceived { payment_id, amount_msat, payment_hash, .. } => {
 						// convert id
 						let id = payment_id.unwrap().0;
 
@@ -128,6 +131,17 @@ impl DummyTrustedWallet {
 						};
 						payments.push(new);
 						bal.fetch_add(amount_msat, Ordering::SeqCst);
+
+						// Send a PaymentReceived event
+						event_queue
+							.add_event(crate::Event::PaymentReceived {
+								payment_id: PaymentId::Trusted(id),
+								payment_hash,
+								amount_msat,
+								custom_records: vec![],
+								lsp_fee_msats: None,
+							})
+							.unwrap();
 					},
 					Event::PaymentForwarded { .. } => {},
 					Event::PaymentClaimable { .. } => {},
@@ -142,6 +156,14 @@ impl DummyTrustedWallet {
 			}
 		});
 
+		// wait for ldk to be ready
+		for _ in 0..10 {
+			if ldk_node.status().is_listening {
+				break;
+			}
+			tokio::time::sleep(Duration::from_secs(1)).await;
+		}
+
 		// have LSP open channel to node
 		lsp.open_channel(ldk_node.node_id(), socket_addr, 1_000_000, Some(500_000_000), None)
 			.unwrap();

orange-sdk/src/trusted_wallet/mod.rs

@@ -70,7 +70,14 @@ pub trait TrustedWalletInterface: Send + Sync + private::Sealed {
 		&self, method: PaymentMethod, amount: Amount,
 	) -> Pin<Box<dyn Future<Output = Result<Amount, TrustedError>> + Send + '_>>;
 
-	/// Pays to the given payment method with the specified amount.
+	/// Pays to the given payment method with the specified amount. This should not await
+	/// the result of the payment, it should only initiate it and return the payment ID.
+	///
+	/// This should later emit a [`PaymentSuccessful`] or [`PaymentFailed`] event
+	/// when the payment is completed or failed.
+	///
+	/// [`PaymentSuccessful`]: `crate::event::Event::PaymentSuccessful`
+	/// [`PaymentFailed`]: `crate::event::Event::PaymentFailed`
 	fn pay(
 		&self, method: PaymentMethod, amount: Amount,
 	) -> Pin<Box<dyn Future<Output = Result<[u8; 32], TrustedError>> + Send + '_>>;