X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fcli.rs;h=66fc3164ecbbc180733417bd08c87e2b2b559567;hb=6f53265d3ed57646a96ffa96b3acba6b4fbb55dd;hp=d4d7e9ed4263079d84f3e3e42d1efc269f8f5404;hpb=5de2381e960870d9b58960e1db79a0a899d68d01;p=ldk-sample

diff --git a/src/cli.rs b/src/cli.rs
index d4d7e9e..66fc316 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -45,19 +45,19 @@ pub(crate) fn parse_startup_args() -> Result<LdkUserInfo, ()> {
 		return Err(());
 	}
 	let bitcoind_rpc_info = env::args().skip(1).next().unwrap();
-	let bitcoind_rpc_info_parts: Vec<&str> = bitcoind_rpc_info.split("@").collect();
+	let bitcoind_rpc_info_parts: Vec<&str> = bitcoind_rpc_info.rsplitn(2, "@").collect();
 	if bitcoind_rpc_info_parts.len() != 2 {
 		println!("ERROR: bad bitcoind RPC URL provided");
 		return Err(());
 	}
-	let rpc_user_and_password: Vec<&str> = bitcoind_rpc_info_parts[0].split(":").collect();
+	let rpc_user_and_password: Vec<&str> = bitcoind_rpc_info_parts[1].split(":").collect();
 	if rpc_user_and_password.len() != 2 {
 		println!("ERROR: bad bitcoind RPC username/password combo provided");
 		return Err(());
 	}
 	let bitcoind_rpc_username = rpc_user_and_password[0].to_string();
 	let bitcoind_rpc_password = rpc_user_and_password[1].to_string();
-	let bitcoind_rpc_path: Vec<&str> = bitcoind_rpc_info_parts[1].split(":").collect();
+	let bitcoind_rpc_path: Vec<&str> = bitcoind_rpc_info_parts[0].split(":").collect();
 	if bitcoind_rpc_path.len() != 2 {
 		println!("ERROR: bad bitcoind RPC path provided");
 		return Err(());
@@ -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,
 	};
 
@@ -250,7 +255,7 @@ pub(crate) async fn poll_for_user_input(
 					let payee_pubkey = invoice.recover_payee_pub_key();
 					let final_cltv = invoice.min_final_cltv_expiry() as u32;
 					let payment_hash = PaymentHash(invoice.payment_hash().clone().into_inner());
-					let payment_secret = invoice.payment_secret().cloned();
+					let payment_secret = Some(invoice.payment_secret().clone());
 					let invoice_features = invoice.features().cloned();
 
 					send_payment(
@@ -589,7 +594,7 @@ fn send_payment(
 	channel_manager: Arc<ChannelManager>, payment_storage: PaymentInfoStorage,
 	logger: Arc<FilesystemLogger>,
 ) {
-	let network_graph = router.network_graph.read().unwrap();
+	let network_graph = &router.network_graph;
 	let first_hops = channel_manager.list_usable_channels();
 	let payer_pubkey = channel_manager.get_our_node_id();
 
@@ -637,7 +642,7 @@ fn keysend(
 	channel_manager: Arc<ChannelManager>, payment_storage: PaymentInfoStorage,
 	logger: Arc<FilesystemLogger>,
 ) {
-	let network_graph = router.network_graph.read().unwrap();
+	let network_graph = &router.network_graph;
 	let first_hops = channel_manager.list_usable_channels();
 	let payer_pubkey = channel_manager.get_our_node_id();
 
@@ -704,7 +709,7 @@ fn get_invoice(
 		payment_hash,
 		PaymentInfo {
 			preimage: None,
-			secret: invoice.payment_secret().cloned(),
+			secret: Some(invoice.payment_secret().clone()),
 			status: HTLCStatus::Pending,
 			amt_msat: MillisatAmount(Some(amt_msat)),
 		},