Fix test suite to test across payments

Author: jurvis

lightning-invoice/src/payment.rs

@@ -1609,17 +1609,17 @@ mod tests {
 		let router = TestRouter {};
 		let scorer = RefCell::new(TestScorer::new()
 			// 1st invoice, 1st path
-	  		.expect_usage(ChannelUsage { amount_msat: 10, inflight_htlc_msat: 0, effective_capacity: EffectiveCapacity::Unknown } )
-			.expect_usage(ChannelUsage { amount_msat: 20, inflight_htlc_msat: 0, effective_capacity: EffectiveCapacity::Unknown } )
-			.expect_usage(ChannelUsage { amount_msat: 64, inflight_htlc_msat: 0, effective_capacity: EffectiveCapacity::Unknown } )
+	  		.expect_usage(ChannelUsage { amount_msat: 10, inflight_htlc_msat: 10, effective_capacity: EffectiveCapacity::Unknown } )
+			.expect_usage(ChannelUsage { amount_msat: 20, inflight_htlc_msat: 20, effective_capacity: EffectiveCapacity::Unknown } )
+			.expect_usage(ChannelUsage { amount_msat: 64, inflight_htlc_msat: 64, effective_capacity: EffectiveCapacity::Unknown } )
 			// 1st invoice, 2nd path
-			.expect_usage(ChannelUsage { amount_msat: 64, inflight_htlc_msat: 0, effective_capacity: EffectiveCapacity::Unknown } )
+			.expect_usage(ChannelUsage { amount_msat: 64, inflight_htlc_msat: 64, effective_capacity: EffectiveCapacity::Unknown } )
 			// 2nd invoice, 1st path
-			.expect_usage(ChannelUsage { amount_msat: 10, inflight_htlc_msat: 0, effective_capacity: EffectiveCapacity::Unknown } )
-		    .expect_usage(ChannelUsage { amount_msat: 20, inflight_htlc_msat: 0, effective_capacity: EffectiveCapacity::Unknown } )
-		    .expect_usage(ChannelUsage { amount_msat: 64, inflight_htlc_msat: 0, effective_capacity: EffectiveCapacity::Unknown } )
+			.expect_usage(ChannelUsage { amount_msat: 10, inflight_htlc_msat: 10, effective_capacity: EffectiveCapacity::Unknown } )
+		    .expect_usage(ChannelUsage { amount_msat: 20, inflight_htlc_msat: 84, effective_capacity: EffectiveCapacity::Unknown } )
+		    .expect_usage(ChannelUsage { amount_msat: 64, inflight_htlc_msat: 64, effective_capacity: EffectiveCapacity::Unknown } )
 			// 2nd invoice, 2nd path
-			.expect_usage(ChannelUsage { amount_msat: 128, inflight_htlc_msat: 0, effective_capacity: EffectiveCapacity::Unknown } )
+			.expect_usage(ChannelUsage { amount_msat: 64, inflight_htlc_msat: 128, effective_capacity: EffectiveCapacity::Unknown } )
 		);
 		let logger = TestLogger::new();
 		let invoice_payer =
@@ -1714,7 +1714,7 @@ mod tests {
 				for hop in path {
 					let usage = ChannelUsage {
 						amount_msat: hop.fee_msat,
-						inflight_htlc_msat: 0,
+						inflight_htlc_msat: hop.fee_msat,
 						effective_capacity: EffectiveCapacity::Unknown,
 					};
 					scorer.channel_penalty_msat(hop.short_channel_id, &NodeId::from_pubkey(payer), &NodeId::from_pubkey(&hop.pubkey), usage);
@@ -1782,6 +1782,7 @@ mod tests {
 			match self.scorer_expectations.borrow_mut().pop_front() {
 				Some(expectation) => {
 					assert_eq!(expectation.amount_msat, usage.amount_msat);
+					assert_eq!(expectation.inflight_htlc_msat, usage.inflight_htlc_msat);
 				},
 				None => {},
 			}