From 6bd4c0c89967a7d02f15720f6377f08090541235 Mon Sep 17 00:00:00 2001
From: thesimplekid <tsk@thesimplekid.com>
Date: Wed, 20 Nov 2024 11:41:32 +0000
Subject: [PATCH] feat: update regtest

---
 .../src/bin/regtest_mint.rs                   |  5 +++
 .../cdk-integration-tests/src/init_regtest.rs | 32 ++++++++++++-------
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/crates/cdk-integration-tests/src/bin/regtest_mint.rs b/crates/cdk-integration-tests/src/bin/regtest_mint.rs
index 63ec122f..83b4b56c 100644
--- a/crates/cdk-integration-tests/src/bin/regtest_mint.rs
+++ b/crates/cdk-integration-tests/src/bin/regtest_mint.rs
@@ -8,6 +8,7 @@ use cdk_integration_tests::init_regtest::{
 };
 use cdk_redb::MintRedbDatabase;
 use cdk_sqlite::MintSqliteDatabase;
+use ln_regtest_rs::ln_client::LightningClient;
 use tracing_subscriber::EnvFilter;
 
 #[tokio::main]
@@ -41,11 +42,15 @@ async fn main() -> Result<()> {
 
     let cln_client = init_cln_client().await?;
 
+    cln_client.wait_chain_sync().await.unwrap();
+
     let mut lnd = init_lnd().await;
     lnd.start_lnd().unwrap();
 
     let lnd_client = init_lnd_client().await.unwrap();
 
+    lnd_client.wait_chain_sync().await.unwrap();
+
     fund_ln(&bitcoin_client, &cln_client, &lnd_client)
         .await
         .unwrap();
diff --git a/crates/cdk-integration-tests/src/init_regtest.rs b/crates/cdk-integration-tests/src/init_regtest.rs
index 0e504334..92cc7128 100644
--- a/crates/cdk-integration-tests/src/init_regtest.rs
+++ b/crates/cdk-integration-tests/src/init_regtest.rs
@@ -176,11 +176,15 @@ where
     Ok(())
 }
 
-pub async fn fund_ln(
+pub async fn fund_ln<C1, C2>(
     bitcoin_client: &BitcoinClient,
-    cln_client: &ClnClient,
-    lnd_client: &LndClient,
-) -> Result<()> {
+    cln_client: &C1,
+    lnd_client: &C2,
+) -> Result<()>
+where
+    C1: LightningClient,
+    C2: LightningClient,
+{
     let lnd_address = lnd_client.get_new_onchain_address().await?;
 
     bitcoin_client.send_to_address(&lnd_address, 2_000_000)?;
@@ -197,16 +201,20 @@ pub async fn fund_ln(
     Ok(())
 }
 
-pub async fn open_channel(
+pub async fn open_channel<C1, C2>(
     bitcoin_client: &BitcoinClient,
-    cln_client: &ClnClient,
-    lnd_client: &LndClient,
-) -> Result<()> {
-    let cln_info = cln_client.get_info().await?;
+    cln_client: &C1,
+    lnd_client: &C2,
+) -> Result<()>
+where
+    C1: LightningClient,
+    C2: LightningClient,
+{
+    let cln_info = cln_client.get_connect_info().await?;
 
-    let cln_pubkey = cln_info.id;
-    let cln_address = "127.0.0.1";
-    let cln_port = 19846;
+    let cln_pubkey = cln_info.pubkey;
+    let cln_address = cln_info.address;
+    let cln_port = cln_info.port;
 
     lnd_client
         .connect_peer(cln_pubkey.to_string(), cln_address.to_string(), cln_port)