f - avoid unwrap

Author: jkczyz

lightning/src/routing/router.rs

@@ -109,15 +109,21 @@ impl<G: Deref<Target = NetworkGraph<L>> + Clone, L: Deref, S: Deref, SP: Sized,
 					.map(|node_info| node_info.channels.len() >= MIN_PEER_CHANNELS)
 					.unwrap_or(false)
 			)
-			.map(|details| {
-				let short_channel_id = details.get_inbound_payment_scid().unwrap();
-				let payment_relay: PaymentRelay = details.counterparty.forwarding_info.unwrap().into();
+			.filter_map(|details| {
+				let short_channel_id = match details.get_inbound_payment_scid() {
+					Some(short_channel_id) => short_channel_id,
+					None => return None,
+				};
+				let payment_relay: PaymentRelay = match details.counterparty.forwarding_info {
+					Some(forwarding_info) => forwarding_info.into(),
+					None => return None,
+				};
 				let payment_constraints = PaymentConstraints {
 					max_cltv_expiry: tlvs.payment_constraints.max_cltv_expiry
 						+ payment_relay.cltv_expiry_delta as u32,
 					htlc_minimum_msat: details.inbound_htlc_minimum_msat.unwrap_or(0),
 				};
-				let forward_node = ForwardNode {
+				Some(ForwardNode {
 					tlvs: ForwardTlvs {
 						short_channel_id,
 						payment_relay,
@@ -126,7 +132,9 @@ impl<G: Deref<Target = NetworkGraph<L>> + Clone, L: Deref, S: Deref, SP: Sized,
 					},
 					node_id: details.counterparty.node_id,
 					htlc_maximum_msat: details.inbound_htlc_maximum_msat.unwrap_or(0),
-				};
+				})
+			})
+			.map(|forward_node| {
 				BlindedPath::new_for_payment(
 					&[forward_node], recipient, tlvs.clone(), u64::MAX, entropy_source, secp_ctx
 				)