aljaz/cdk
1
0
Fork 0
mirror of https://github.com/aljazceru/cdk.git synced 2025-12-23 23:55:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: update regtest-rs

Browse Source
This commit is contained in:
thesimplekid
2024-12-10 13:10:47 +00:00
parent c9747900a3
commit b9df44b10a
4 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/cdk-integration-tests/Cargo.toml
View File

@@ -33,7 +33,7 @@ uuid = { version = "1", features = ["v4"] }
serde = "1"
serde_json = "1"
# ln-regtest-rs = { path = "../../../../ln-regtest-rs" }
ln-regtest-rs = { git = "https://github.com/thesimplekid/ln-regtest-rs", rev = "1d88d3d0b" }
ln-regtest-rs = { git = "https://github.com/thesimplekid/ln-regtest-rs", rev = "e0ac418675" }
lightning-invoice = { version = "0.32.0", features = ["serde", "std"] }
tracing = { version = "0.1", default-features = false, features = [
"attributes",

21
crates/cdk-integration-tests/src/init_regtest.rs
View File

@@ -15,9 +15,8 @@ use cdk_cln::Cln as CdkCln;
use ln_regtest_rs::bitcoin_client::BitcoinClient;
use ln_regtest_rs::bitcoind::Bitcoind;
use ln_regtest_rs::cln::Clnd;
use ln_regtest_rs::cln_client::ClnClient;
use ln_regtest_rs::ln_client::{ClnClient, LightningClient, LndClient};
use ln_regtest_rs::lnd::Lnd;
use ln_regtest_rs::lnd_client::LndClient;
use tokio::sync::Notify;
use tower_http::cors::CorsLayer;
use tracing_subscriber::EnvFilter;
@@ -28,8 +27,8 @@ const ZMQ_RAW_TX: &str = "tcp://127.0.0.1:28333";
const BITCOIN_RPC_USER: &str = "testuser";
const BITCOIN_RPC_PASS: &str = "testpass";
const CLN_ADDR: &str = "127.0.0.1:19846";
const LND_ADDR: &str = "0.0.0.0:18444";
const LND_RPC_ADDR: &str = "https://127.0.0.1:10009";
const LND_ADDR: &str = "0.0.0.0:18449";
const LND_RPC_ADDR: &str = "localhost:10009";
const BITCOIN_DIR: &str = "bitcoin";
const CLN_DIR: &str = "cln";
@@ -116,6 +115,7 @@ pub async fn init_lnd() -> Lnd {
get_bitcoin_dir(),
get_lnd_dir(),
LND_ADDR.parse().unwrap(),
LND_RPC_ADDR.to_string(),
BITCOIN_RPC_USER.to_string(),
BITCOIN_RPC_PASS.to_string(),
ZMQ_RAW_BLOCK.to_string(),
@@ -127,7 +127,12 @@ pub async fn init_lnd_client() -> Result<LndClient> {
let lnd_dir = get_lnd_dir();
let cert_file = lnd_dir.join("tls.cert");
let macaroon_file = lnd_dir.join("data/chain/bitcoin/regtest/admin.macaroon");
LndClient::new(LND_RPC_ADDR.parse().unwrap(), cert_file, macaroon_file).await
LndClient::new(
format!("https://{}", LND_RPC_ADDR).parse().unwrap(),
cert_file,
macaroon_file,
)
.await
}
pub async fn create_cln_backend(cln_client: &ClnClient) -> Result<CdkCln> {
@@ -254,11 +259,11 @@ pub async fn fund_ln(
cln_client: &ClnClient,
lnd_client: &LndClient,
) -> Result<()> {
let lnd_address = lnd_client.get_new_address().await?;
let lnd_address = lnd_client.get_new_onchain_address().await?;
bitcoin_client.send_to_address(&lnd_address, 2_000_000)?;
let cln_address = cln_client.get_new_address().await?;
let cln_address = cln_client.get_new_onchain_address().await?;
bitcoin_client.send_to_address(&cln_address, 2_000_000)?;
let mining_address = bitcoin_client.get_new_address()?;
@@ -282,7 +287,7 @@ pub async fn open_channel(
let cln_port = 19846;
lnd_client
.connect(cln_pubkey.to_string(), cln_address.to_string(), cln_port)
.connect_peer(cln_pubkey.to_string(), cln_address.to_string(), cln_port)
.await
.unwrap();

7
crates/cdk-integration-tests/tests/regtest.rs
View File

@@ -18,6 +18,7 @@ use cdk_integration_tests::init_regtest::{
};
use futures::{SinkExt, StreamExt};
use lightning_invoice::Bolt11Invoice;
use ln_regtest_rs::ln_client::LightningClient;
use ln_regtest_rs::InvoiceStatus;
use serde_json::json;
use tokio::time::timeout;
@@ -83,7 +84,7 @@ async fn test_regtest_mint_melt_round_trip() -> Result<()> {
assert!(mint_amount == 100.into());
let invoice = lnd_client.create_invoice(50).await?;
let invoice = lnd_client.create_invoice(Some(50)).await?;
let melt = wallet.melt_quote(invoice, None).await?;
@@ -245,7 +246,7 @@ async fn test_pay_invoice_twice() -> Result<()> {
assert_eq!(mint_amount, 100.into());
let invoice = lnd_client.create_invoice(10).await?;
let invoice = lnd_client.create_invoice(Some(10)).await?;
let melt_quote = wallet.melt_quote(invoice.clone(), None).await?;
@@ -323,7 +324,7 @@ async fn test_internal_payment() -> Result<()> {
let cln_client = init_cln_client().await?;
let payment_hash = Bolt11Invoice::from_str(&mint_quote.request)?;
let check_paid = cln_client
.check_incoming_invoice(payment_hash.payment_hash().to_string())
.check_incoming_payment_status(&payment_hash.payment_hash().to_string())
.await?;
match check_paid {