X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fcli.rs;h=00eb04787cb9fdefa3df35ffeccd58ca67b1f517;hb=f21537916008cc7c1030466363cd19dc82b8623f;hp=197c0ecf607a763f88873099d44da96982bd188f;hpb=a7728724beffc6f71f55919e1c195ec10b886ba0;p=ldk-sample

diff --git a/src/cli.rs b/src/cli.rs
index 197c0ec..00eb047 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -352,7 +352,7 @@ pub(crate) async fn poll_for_user_input<E: EventHandler>(
 				"nodeinfo" => node_info(channel_manager.clone(), peer_manager.clone()),
 				"listpeers" => list_peers(peer_manager.clone()),
 				"signmessage" => {
-					const MSG_STARTPOS: usize = "signmsg".len() + 1;
+					const MSG_STARTPOS: usize = "signmessage".len() + 1;
 					if line.as_bytes().len() <= MSG_STARTPOS {
 						println!("ERROR: signmsg requires a message");
 						continue;
@@ -388,8 +388,14 @@ fn help() {
 fn node_info(channel_manager: Arc<ChannelManager>, peer_manager: Arc<PeerManager>) {
 	println!("\t{{");
 	println!("\t\t node_pubkey: {}", channel_manager.get_our_node_id());
-	println!("\t\t num_channels: {}", channel_manager.list_channels().len());
-	println!("\t\t num_usable_channels: {}", channel_manager.list_usable_channels().len());
+	let chans = channel_manager.list_channels();
+	println!("\t\t num_channels: {}", chans.len());
+	println!("\t\t num_usable_channels: {}", chans.iter().filter(|c| c.is_usable).count());
+	let local_balance_msat = chans
+		.iter()
+		.map(|c| c.unspendable_punishment_reserve.unwrap_or(0) * 1000 + c.outbound_capacity_msat)
+		.sum::<u64>();
+	println!("\t\t local_balance_msat: {}", local_balance_msat);
 	println!("\t\t num_peers: {}", peer_manager.get_peer_node_ids().len());
 	println!("\t}},");
 }
@@ -486,6 +492,16 @@ pub(crate) async fn connect_peer_if_necessary(
 			return Ok(());
 		}
 	}
+	let res = do_connect_peer(pubkey, peer_addr, peer_manager).await;
+	if res.is_err() {
+		println!("ERROR: failed to connect to peer");
+	}
+	res
+}
+
+pub(crate) async fn do_connect_peer(
+	pubkey: PublicKey, peer_addr: SocketAddr, peer_manager: Arc<PeerManager>,
+) -> Result<(), ()> {
 	match lightning_net_tokio::connect_outbound(Arc::clone(&peer_manager), pubkey, peer_addr).await
 	{
 		Some(connection_closed_future) => {
@@ -493,24 +509,19 @@ pub(crate) async fn connect_peer_if_necessary(
 			loop {
 				match futures::poll!(&mut connection_closed_future) {
 					std::task::Poll::Ready(_) => {
-						println!("ERROR: Peer disconnected before we finished the handshake");
 						return Err(());
 					}
 					std::task::Poll::Pending => {}
 				}
 				// Avoid blocking the tokio context by sleeping a bit
 				match peer_manager.get_peer_node_ids().iter().find(|id| **id == pubkey) {
-					Some(_) => break,
+					Some(_) => return Ok(()),
 					None => tokio::time::sleep(Duration::from_millis(10)).await,
 				}
 			}
 		}
-		None => {
-			println!("ERROR: failed to connect to peer");
-			return Err(());
-		}
+		None => Err(()),
 	}
-	Ok(())
 }
 
 fn open_channel(