X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=ldk-sample;a=blobdiff_plain;f=src%2Fmain.rs;h=4073be9ea73faa4395955d00b8f1693f3a002405;hp=d24fcad81177ac75e66016a1b55d9e2f72807c0a;hb=90c12f0f24689326ae09637a9ad620f781d97e5c;hpb=61d7906349592aa31a670911c77183a018e399d1

diff --git a/src/main.rs b/src/main.rs
index d24fcad..4073be9 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -138,7 +138,15 @@ async fn handle_ldk_events(
 			let final_tx: Transaction =
 				encode::deserialize(&hex_utils::to_vec(&signed_tx.hex).unwrap()).unwrap();
 			// Give the funding transaction back to LDK for opening the channel.
-			channel_manager.funding_transaction_generated(&temporary_channel_id, final_tx).unwrap();
+			if channel_manager
+				.funding_transaction_generated(&temporary_channel_id, final_tx)
+				.is_err()
+			{
+				println!(
+					"\nERROR: Channel went away before we could fund it. The peer disconnected or refused the channel.");
+				print!("> ");
+				io::stdout().flush().unwrap();
+			}
 		}
 		Event::PaymentReceived { payment_hash, payment_preimage, payment_secret, amt, .. } => {
 			let mut payments = inbound_payments.lock().unwrap();
@@ -568,7 +576,7 @@ async fn start_ldk() {
 	// to avoid churn in the global network graph.
 	let chan_manager = Arc::clone(&channel_manager);
 	let network = args.network;
-	if args.ldk_announced_listen_addr.is_some() {
+	if !args.ldk_announced_listen_addr.is_empty() {
 		tokio::spawn(async move {
 			let mut interval = tokio::time::interval(Duration::from_secs(60));
 			loop {
@@ -576,7 +584,7 @@ async fn start_ldk() {
 				chan_manager.broadcast_node_announcement(
 					[0; 3],
 					args.ldk_announced_node_name,
-					vec![args.ldk_announced_listen_addr.as_ref().unwrap().clone()],
+					args.ldk_announced_listen_addr.clone(),
 				);
 			}
 		});