Merge pull request #34 from lightningdevkit/2021-08-fix-33

Correctly parse args without port but with net

diff --git a/src/cli.rs b/src/cli.rs
index d4d7e9ed4263079d84f3e3e42d1efc269f8f5404..476ea81efd6803e393f237bd5965333767b00bc2 100644 (file)
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -70,7 +70,10 @@ pub(crate) fn parse_startup_args() -> Result<LdkUserInfo, ()> {
        let mut ldk_peer_port_set = true;
        let ldk_peer_listening_port: u16 = match env::args().skip(3).next().map(|p| p.parse()) {
                Some(Ok(p)) => p,
-               Some(Err(e)) => panic!("{}", e),
+               Some(Err(_)) => {
+                       ldk_peer_port_set = false;
+                       9735
+               }
                None => {
                        ldk_peer_port_set = false;
                        9735
@@ -84,7 +87,9 @@ pub(crate) fn parse_startup_args() -> Result<LdkUserInfo, ()> {
        let network: Network = match env::args().skip(arg_idx).next().as_ref().map(String::as_str) {
                Some("testnet") => Network::Testnet,
                Some("regtest") => Network::Regtest,
-               Some(_) => panic!("Unsupported network provided. Options are: `regtest`, `testnet`"),
+               Some(net) => {
+                       panic!("Unsupported network provided. Options are: `regtest`, `testnet`. Got {}", net);
+               }
                None => Network::Testnet,
        };