Merge pull request #10 from valentinewallace/fix-log

Fix badly formatted log

diff --combined src/cli.rs
index 9a0227ca8038319ed699726b004d06c70c906345,dc8bb407942e289ffaec47eb37b5922bfb2dd1f2..c0aad1562d64f89a47d6f5dca5ee8e7ccb7938cc
--- 1/src/cli.rs
--- 2/src/cli.rs
+++ b/src/cli.rs
@@@ -9,7 -9,6 +9,7 @@@ use bitcoin::secp256k1::key::PublicKey
  use lightning::chain;
  use lightning::chain::keysinterface::KeysManager;
  use lightning::ln::features::InvoiceFeatures;
 +use lightning::ln::msgs::NetAddress;
  use lightning::ln::{PaymentHash, PaymentSecret};
  use lightning::routing::network_graph::NetGraphMsgHandler;
  use lightning::routing::router;
@@@ -19,7 -18,7 +19,7 @@@ use lightning_invoice::{utils, Currency
  use std::env;
  use std::io;
  use std::io::{BufRead, Write};
 -use std::net::{SocketAddr, ToSocketAddrs};
 +use std::net::{IpAddr, SocketAddr, ToSocketAddrs};
  use std::ops::Deref;
  use std::path::Path;
  use std::str::FromStr;
@@@ -34,14 -33,12 +34,14 @@@ pub(crate) struct LdkUserInfo 
        pub(crate) bitcoind_rpc_host: String,
        pub(crate) ldk_storage_dir_path: String,
        pub(crate) ldk_peer_listening_port: u16,
 +      pub(crate) ldk_announced_listen_addr: Option<NetAddress>,
 +      pub(crate) ldk_announced_node_name: [u8; 32],
        pub(crate) network: Network,
  }
  
  pub(crate) fn parse_startup_args() -> Result<LdkUserInfo, ()> {
        if env::args().len() < 3 {
 -              println!("ldk-tutorial-node requires 3 arguments: `cargo run <bitcoind-rpc-username>:<bitcoind-rpc-password>@<bitcoind-rpc-host>:<bitcoind-rpc-port> ldk_storage_directory_path [<ldk-incoming-peer-listening-port>] [bitcoin-network]`");
 +              println!("ldk-tutorial-node requires 3 arguments: `cargo run <bitcoind-rpc-username>:<bitcoind-rpc-password>@<bitcoind-rpc-host>:<bitcoind-rpc-port> ldk_storage_directory_path [<ldk-incoming-peer-listening-port>] [bitcoin-network] [announced-listen-addr announced-node-name]`");
                return Err(());
        }
        let bitcoind_rpc_info = env::args().skip(1).next().unwrap();
@@@ -87,32 -84,6 +87,32 @@@
                Some(_) => panic!("Unsupported network provided. Options are: `regtest`, `testnet`"),
                None => Network::Testnet,
        };
 +
 +      let ldk_announced_listen_addr = match env::args().skip(arg_idx + 1).next().as_ref() {
 +              Some(s) => match IpAddr::from_str(s) {
 +                      Ok(IpAddr::V4(a)) => {
 +                              Some(NetAddress::IPv4 { addr: a.octets(), port: ldk_peer_listening_port })
 +                      }
 +                      Ok(IpAddr::V6(a)) => {
 +                              Some(NetAddress::IPv6 { addr: a.octets(), port: ldk_peer_listening_port })
 +                      }
 +                      Err(_) => panic!("Failed to parse announced-listen-addr into an IP address"),
 +              },
 +              None => None,
 +      };
 +
 +      let ldk_announced_node_name = match env::args().skip(arg_idx + 2).next().as_ref() {
 +              Some(s) => {
 +                      if s.len() > 32 {
 +                              panic!("Node Alias can not be longer than 32 bytes");
 +                      }
 +                      let mut bytes = [0; 32];
 +                      bytes[..s.len()].copy_from_slice(s.as_bytes());
 +                      bytes
 +              }
 +              None => [0; 32],
 +      };
 +
        Ok(LdkUserInfo {
                bitcoind_rpc_username,
                bitcoind_rpc_password,
@@@ -120,8 -91,6 +120,8 @@@
                bitcoind_rpc_port,
                ldk_storage_dir_path,
                ldk_peer_listening_port,
 +              ldk_announced_listen_addr,
 +              ldk_announced_node_name,
                network,
        })
  }
@@@ -424,22 -393,19 +424,22 @@@ fn list_channels(channel_manager: Arc<C
                println!("");
                println!("\t{{");
                println!("\t\tchannel_id: {},", hex_utils::hex_str(&chan_info.channel_id[..]));
 +              if let Some(funding_txo) = chan_info.funding_txo {
 +                      println!("\t\tfunding_txid: {},", funding_txo.txid);
 +              }
                println!(
                        "\t\tpeer_pubkey: {},",
                        hex_utils::hex_str(&chan_info.remote_network_id.serialize())
                );
 -              let mut pending_channel = false;
 -              match chan_info.short_channel_id {
 -                      Some(id) => println!("\t\tshort_channel_id: {},", id),
 -                      None => {
 -                              pending_channel = true;
 -                      }
 +              if let Some(id) = chan_info.short_channel_id {
 +                      println!("\t\tshort_channel_id: {},", id);
                }
 -              println!("\t\tpending_open: {},", pending_channel);
 +              println!("\t\tis_confirmed_onchain: {},", chan_info.is_funding_locked);
                println!("\t\tchannel_value_satoshis: {},", chan_info.channel_value_satoshis);
 +              if chan_info.is_usable {
 +                      println!("\t\tavailable_balance_for_send_msat: {},", chan_info.outbound_capacity_msat);
 +                      println!("\t\tavailable_balance_for_recv_msat: {},", chan_info.inbound_capacity_msat);
 +              }
                println!("\t\tchannel_can_send_payments: {},", chan_info.is_usable);
                println!("\t}},");
        }
@@@ -672,8 -638,7 +672,7 @@@ pub(crate) fn parse_peer_info
        if peer_addr_str.is_none() || peer_addr_str.is_none() {
                return Err(std::io::Error::new(
                        std::io::ErrorKind::Other,
-                       "ERROR: incorrectly formatted peer
-               info. Should be formatted as: `pubkey@host:port`",
+                       "ERROR: incorrectly formatted peer info. Should be formatted as: `pubkey@host:port`",
                ));
        }