X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain.rs;h=653ad8e9fa90b10c0790d451d7251153a1c95a7d;hb=fdd4a78ee3b6198b9a4e48ea8e8464f53baa716e;hp=b024e9354ef220429fea58c841688dde7b2b1a28;hpb=a73d564d2b7f0733578747ed1c2604bd880efcd9;p=ldk-sample

diff --git a/src/main.rs b/src/main.rs
index b024e93..653ad8e 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -168,10 +168,10 @@ async fn handle_ldk_events(
 					let status = match loop_channel_manager.claim_funds(payment_preimage.unwrap()) {
 						true => {
 							println!(
-					          		    "\nEVENT: received payment from payment hash {} of {} millisatoshis",
-					          		    hex_utils::hex_str(&payment_hash.0),
-					          		    amt
-					              );
+								"\nEVENT: received payment from payment hash {} of {} millisatoshis",
+								hex_utils::hex_str(&payment_hash.0),
+								amt
+							);
 							print!("> ");
 							io::stdout().flush().unwrap();
 							HTLCStatus::Succeeded
@@ -290,6 +290,22 @@ async fn start_ldk() {
 		}
 	};
 
+	// Check that the bitcoind we've connected to is running the network we expect
+	let bitcoind_chain = bitcoind_client.get_blockchain_info().await.chain;
+	if bitcoind_chain
+		!= match args.network {
+			bitcoin::Network::Bitcoin => "main",
+			bitcoin::Network::Testnet => "test",
+			bitcoin::Network::Regtest => "regtest",
+			bitcoin::Network::Signet => "signet",
+		} {
+		println!(
+			"Chain argument ({}) didn't match bitcoind chain ({})",
+			args.network, bitcoind_chain
+		);
+		return;
+	}
+
 	// ## Setup
 	// Step 1: Initialize the FeeEstimator
 
@@ -466,14 +482,19 @@ async fn start_ldk() {
 	let event_notifier = event_ntfn_sender.clone();
 	let listening_port = args.ldk_peer_listening_port;
 	tokio::spawn(async move {
-		let listener = std::net::TcpListener::bind(format!("0.0.0.0:{}", listening_port)).unwrap();
+		let listener =
+			tokio::net::TcpListener::bind(format!("0.0.0.0:{}", listening_port)).await.unwrap();
 		loop {
 			let peer_mgr = peer_manager_connection_handler.clone();
 			let notifier = event_notifier.clone();
-			let tcp_stream = listener.accept().unwrap().0;
+			let tcp_stream = listener.accept().await.unwrap().0;
 			tokio::spawn(async move {
-				lightning_net_tokio::setup_inbound(peer_mgr.clone(), notifier.clone(), tcp_stream)
-					.await;
+				lightning_net_tokio::setup_inbound(
+					peer_mgr.clone(),
+					notifier.clone(),
+					tcp_stream.into_std().unwrap(),
+				)
+				.await;
 			});
 		}
 	});