X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fcli.rs;h=56c788fa3b72e2042c8b68d09b58d62acac70cdd;hb=b630ab9aecd9cae3ca264aaafb1af70ce81de0d7;hp=21c40236e18e9ec6f0793102e4888eae452cf319;hpb=d9e9c01d33f291cf4846c0406a3e00c9ecbd543d;p=ldk-sample

diff --git a/src/cli.rs b/src/cli.rs
index 21c4023..56c788f 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -26,7 +26,6 @@ use std::path::Path;
 use std::str::FromStr;
 use std::sync::Arc;
 use std::time::Duration;
-use tokio::runtime::Handle;
 use tokio::sync::mpsc;
 
 pub(crate) struct LdkUserInfo {
@@ -98,11 +97,11 @@ pub(crate) fn parse_startup_args() -> Result<LdkUserInfo, ()> {
 	})
 }
 
-pub(crate) fn poll_for_user_input(
+pub(crate) async fn poll_for_user_input(
 	peer_manager: Arc<PeerManager>, channel_manager: Arc<ChannelManager>,
 	router: Arc<NetGraphMsgHandler<Arc<dyn chain::Access>, Arc<FilesystemLogger>>>,
 	payment_storage: PaymentInfoStorage, node_privkey: SecretKey, event_notifier: mpsc::Sender<()>,
-	ldk_data_dir: String, logger: Arc<FilesystemLogger>, runtime_handle: Handle, network: Network,
+	ldk_data_dir: String, logger: Arc<FilesystemLogger>, network: Network,
 ) {
 	println!("LDK startup successful. To view available commands: \"help\".\nLDK logs are available at <your-supplied-ldk-data-dir-path>/.ldk/logs");
 	let stdin = io::stdin();
@@ -149,7 +148,6 @@ pub(crate) fn poll_for_user_input(
 						peer_addr,
 						peer_manager.clone(),
 						event_notifier.clone(),
-						runtime_handle.clone(),
 					)
 					.is_err()
 					{
@@ -160,10 +158,10 @@ pub(crate) fn poll_for_user_input(
 
 					// let private_channel = match words.next().as_ref().map(String::as_str) {
 					let announce_channel = match words.next() {
-						Some("--public") | Some("--public=true") | Some("--public true") => true,
-						Some("--public=false") | Some("--public false") => false,
+						Some("--public") | Some("--public=true") => true,
+						Some("--public=false") => false,
 						Some(_) => {
-							println!("ERROR: invalid `--public` command format");
+							println!("ERROR: invalid `--public` command format. Valid formats: `--public`, `--public=true` `--public=false`");
 							print!("> ");
 							io::stdout().flush().unwrap();
 							continue;
@@ -328,7 +326,6 @@ pub(crate) fn poll_for_user_input(
 						peer_addr,
 						peer_manager.clone(),
 						event_notifier.clone(),
-						runtime_handle.clone(),
 					)
 					.is_ok()
 					{
@@ -448,7 +445,7 @@ fn list_payments(payment_storage: PaymentInfoStorage) {
 
 pub(crate) fn connect_peer_if_necessary(
 	pubkey: PublicKey, peer_addr: SocketAddr, peer_manager: Arc<PeerManager>,
-	event_notifier: mpsc::Sender<()>, runtime: Handle,
+	event_notifier: mpsc::Sender<()>,
 ) -> Result<(), ()> {
 	for node_pubkey in peer_manager.get_peer_node_ids() {
 		if node_pubkey == pubkey {
@@ -459,7 +456,7 @@ pub(crate) fn connect_peer_if_necessary(
 		Ok(stream) => {
 			let peer_mgr = peer_manager.clone();
 			let event_ntfns = event_notifier.clone();
-			runtime.spawn(async move {
+			tokio::spawn(async move {
 				lightning_net_tokio::setup_outbound(peer_mgr, event_ntfns, pubkey, stream).await;
 			});
 			let mut peer_connected = false;