From: Jeffrey Czyz <jkczyz@gmail.com>
Date: Tue, 18 Oct 2022 14:35:12 +0000 (-0500)
Subject: Merge pull request #79 from MaxFangX/fix-blocksource-impl
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=523ca2dafd555d8b5fe49107f0c4ed9509553a51;hp=7a95c69c4b465f555c01e582cb1f9bde2de2c374;p=ldk-sample

Merge pull request #79 from MaxFangX/fix-blocksource-impl

impl `BlockSource` on `BitcoindClient` instead of `&BitcoindClient`
---

diff --git a/src/cli.rs b/src/cli.rs
index f50d3f9..7d86515 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -19,7 +19,7 @@ use lightning_invoice::payment::PaymentError;
 use lightning_invoice::{utils, Currency, Invoice};
 use std::env;
 use std::io;
-use std::io::{BufRead, Write};
+use std::io::Write;
 use std::net::{IpAddr, SocketAddr, ToSocketAddrs};
 use std::ops::Deref;
 use std::path::Path;
@@ -150,15 +150,14 @@ pub(crate) async fn poll_for_user_input<E: EventHandler>(
 	println!("LDK startup successful. To view available commands: \"help\".");
 	println!("LDK logs are available at <your-supplied-ldk-data-dir-path>/.ldk/logs");
 	println!("Local Node ID is {}.", channel_manager.get_our_node_id());
-	let stdin = io::stdin();
-	let mut line_reader = stdin.lock().lines();
 	loop {
 		print!("> ");
 		io::stdout().flush().unwrap(); // Without flushing, the `>` doesn't print
-		let line = match line_reader.next() {
-			Some(l) => l.unwrap(),
-			None => break,
-		};
+		let mut line = String::new();
+		if let Err(e) = io::stdin().read_line(&mut line) {
+			break println!("ERROR: {e:#}");
+		}
+
 		let mut words = line.split_whitespace();
 		if let Some(word) = words.next() {
 			match word {
diff --git a/src/main.rs b/src/main.rs
index 6229967..9ecc5e3 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -508,8 +508,10 @@ async fn start_ldk() {
 	let mut cache = UnboundedCache::new();
 	let mut chain_tip: Option<poll::ValidatedBlockHeader> = None;
 	if restarting_node {
-		let mut chain_listeners =
-			vec![(channel_manager_blockhash, &channel_manager as &dyn chain::Listen)];
+		let mut chain_listeners = vec![(
+			channel_manager_blockhash,
+			&channel_manager as &(dyn chain::Listen + Send + Sync),
+		)];
 
 		for (blockhash, channel_monitor) in channelmonitors.drain(..) {
 			let outpoint = channel_monitor.get_funding_txo().0;
@@ -521,8 +523,10 @@ async fn start_ldk() {
 		}
 
 		for monitor_listener_info in chain_listener_channel_monitors.iter_mut() {
-			chain_listeners
-				.push((monitor_listener_info.0, &monitor_listener_info.1 as &dyn chain::Listen));
+			chain_listeners.push((
+				monitor_listener_info.0,
+				&monitor_listener_info.1 as &(dyn chain::Listen + Send + Sync),
+			));
 		}
 		chain_tip = Some(
 			init::synchronize_listeners(