f - Calculate htlc_maximum_msat and effective_capacity using match

Author: jkczyz

lightning/src/routing/network_graph.rs

@@ -749,21 +749,19 @@ impl<'a> DirectedChannelInfo<'a> {
 		let htlc_maximum_msat = direction.and_then(|direction| direction.htlc_maximum_msat);
 		let capacity_msat = channel.capacity_sats.map(|capacity_sats| capacity_sats * 1000);
 
-		let effective_capacity = capacity_msat
-			.map(|capacity_msat| EffectiveCapacity::Total { capacity_msat })
-			.or_else(|| direction.and_then(|direction| direction.htlc_maximum_msat)
-				.map(|amount_msat| EffectiveCapacity::MaximumHTLC { amount_msat }))
-			.unwrap_or(EffectiveCapacity::Unknown);
-
-		// TODO: Replace with Option::zip when MSRV is 1.46
-		let htlc_maximum_msat = match (htlc_maximum_msat, capacity_msat) {
-			(Some(a), Some(b)) => Some((a, b)),
-			_ => None,
-		}
-			.map(|(htlc_maximum_msat, capacity_msat)| cmp::min(htlc_maximum_msat, capacity_msat))
-			.or_else(|| htlc_maximum_msat)
-			.or_else(|| capacity_msat)
-			.unwrap_or(EffectiveCapacity::Unknown.as_msat());
+		let (htlc_maximum_msat, effective_capacity) = match (htlc_maximum_msat, capacity_msat) {
+			(Some(amount_msat), Some(capacity_msat)) => {
+				let htlc_maximum_msat = cmp::min(amount_msat, capacity_msat);
+				(htlc_maximum_msat, EffectiveCapacity::Total { capacity_msat })
+			},
+			(Some(amount_msat), None) => {
+				(amount_msat, EffectiveCapacity::MaximumHTLC { amount_msat })
+			},
+			(None, Some(capacity_msat)) => {
+				(capacity_msat, EffectiveCapacity::Total { capacity_msat })
+			},
+			(None, None) => (EffectiveCapacity::Unknown.as_msat(), EffectiveCapacity::Unknown),
+		};
 
 		Self {
 			channel, direction, htlc_maximum_msat, effective_capacity