f rebase

Author: TheBlueMatt

lightning/src/routing/scoring.rs

@@ -2180,7 +2180,7 @@ mod tests {
 		let usage = ChannelUsage {
 			amount_msat: 250,
 			inflight_htlc_msat: 0,
-			effective_capacity: EffectiveCapacity::Total { capacity_msat: 1_000, htlc_maximum_msat: Some(1_000) },
+			effective_capacity: EffectiveCapacity::Total { capacity_msat: 1_000, htlc_maximum_msat: 1_000 },
 		};
 		assert_eq!(scorer.channel_penalty_msat(42, &node_a, &node_b, usage), 128);
 		// Note that a default liquidity bound is used for B -> C as no channel exists