Return InFlightHtlcs from create_inflight_map

Author: jurvis

lightning-invoice/src/payment.rs

@@ -455,7 +455,7 @@ where
 		let inflight_htlcs = self.create_inflight_map();
 		let route = self.router.find_route(
 			&payer, &params, &payment_hash, Some(&first_hops.iter().collect::<Vec<_>>()),
-			InFlightHtlcs::new(Some(inflight_htlcs))
+			inflight_htlcs
 		).map_err(|e| PaymentError::Routing(e))?;
 
 		match send_payment(&route) {
@@ -560,7 +560,7 @@ where
 
 		let route = self.router.find_route(
 			&payer, &params, &payment_hash, Some(&first_hops.iter().collect::<Vec<_>>()),
-			InFlightHtlcs::new(Some(inflight_htlcs))
+			inflight_htlcs
 		);
 
 		if route.is_err() {
@@ -619,7 +619,7 @@ where
 	///
 	/// This function should be called whenever we need information about currently used up liquidity
 	/// across payments.
-	fn create_inflight_map(&self) -> HashMap<(u64, bool), u64> {
+	fn create_inflight_map(&self) -> InFlightHtlcs {
 		let mut total_inflight_map: HashMap<(u64, bool), u64> = HashMap::new();
 		// Make an attempt at finding existing payment information from `payment_cache`. If it
 		// does not exist, it probably is a fresh payment and we can just return an empty
@@ -651,7 +651,7 @@ where
 			}
 		}
 
-		total_inflight_map
+		InFlightHtlcs(total_inflight_map)
 	}
 }
 
@@ -747,11 +747,6 @@ where
 pub struct InFlightHtlcs(HashMap<(u64, bool), u64>);
 
 impl InFlightHtlcs {
-	/// Creates a new instance with an optional map of liquidity information.
-	pub fn new(used_liquidity_msat: Option<HashMap<(u64, bool), u64>>) -> Self {
-		InFlightHtlcs(used_liquidity_msat.unwrap_or(HashMap::new()))
-	}
-
 	/// Returns liquidity in msat given the public key of the HTLC source, target, and short channel
 	/// id.
 	pub fn used_liquidity_msat(&self, source: &NodeId, target: &NodeId, channel_scid: u64) -> Option<&u64> {
@@ -1523,27 +1518,27 @@ mod tests {
 
 		let inflight_map = invoice_payer.create_inflight_map();
 		// First path check
-		assert_eq!(inflight_map.get(&(0, false)).unwrap().clone(), 94);
-		assert_eq!(inflight_map.get(&(1, true)).unwrap().clone(), 84);
-		assert_eq!(inflight_map.get(&(2, false)).unwrap().clone(), 64);
+		assert_eq!(inflight_map.0.get(&(0, false)).unwrap().clone(), 94);
+		assert_eq!(inflight_map.0.get(&(1, true)).unwrap().clone(), 84);
+		assert_eq!(inflight_map.0.get(&(2, false)).unwrap().clone(), 64);
 
 		// Second path check
-		assert_eq!(inflight_map.get(&(3, false)).unwrap().clone(), 74);
-		assert_eq!(inflight_map.get(&(4, false)).unwrap().clone(), 64);
+		assert_eq!(inflight_map.0.get(&(3, false)).unwrap().clone(), 74);
+		assert_eq!(inflight_map.0.get(&(4, false)).unwrap().clone(), 64);
 
 		invoice_payer.handle_event(&Event::PaymentPathSuccessful {
 			payment_id, payment_hash, path: route.paths[0].clone()
 		});
 
 		let inflight_map = invoice_payer.create_inflight_map();
 
-		assert_eq!(inflight_map.get(&(0, false)), None);
-		assert_eq!(inflight_map.get(&(1, true)), None);
-		assert_eq!(inflight_map.get(&(2, false)), None);
+		assert_eq!(inflight_map.0.get(&(0, false)), None);
+		assert_eq!(inflight_map.0.get(&(1, true)), None);
+		assert_eq!(inflight_map.0.get(&(2, false)), None);
 
 		// Second path should still be inflight
-		assert_eq!(inflight_map.get(&(3, false)).unwrap().clone(), 74);
-		assert_eq!(inflight_map.get(&(4, false)).unwrap().clone(), 64)
+		assert_eq!(inflight_map.0.get(&(3, false)).unwrap().clone(), 74);
+		assert_eq!(inflight_map.0.get(&(4, false)).unwrap().clone(), 64)
 	}
 
 	#[test]
@@ -1697,7 +1692,7 @@ mod tests {
 
 		// Only the second path, which failed with `MonitorUpdateFailed` should be added to our
 		// inflight map because retries are disabled.
-		assert_eq!(inflight_map.len(), 2);
+		assert_eq!(inflight_map.0.len(), 2);
 	}
 
 	#[test]
@@ -1727,7 +1722,7 @@ mod tests {
 		let inflight_map = invoice_payer.create_inflight_map();
 
 		// All paths successful, hence we check of the existence of all 5 hops.
-		assert_eq!(inflight_map.len(), 5);
+		assert_eq!(inflight_map.0.len(), 5);
 	}
 
 	struct TestRouter {