Remove create_inflight_map from InvoicePayer

Author: jurvis

lightning-invoice/src/payment.rs

@@ -520,7 +520,7 @@ where
 
 		let payer = self.payer.node_id();
 		let first_hops = self.payer.first_hops();
-		let inflight_htlcs = self.create_inflight_map();
+		let inflight_htlcs = self.payer.inflight_htlcs();
 		let route = self.router.find_route(
 			&payer, &params, Some(&first_hops.iter().collect::<Vec<_>>()), inflight_htlcs
 		).map_err(|e| PaymentError::Routing(e))?;
@@ -586,7 +586,7 @@ where
 
 		let payer = self.payer.node_id();
 		let first_hops = self.payer.first_hops();
-		let inflight_htlcs = self.create_inflight_map();
+		let inflight_htlcs = self.payer.inflight_htlcs();
 
 		let route = self.router.find_route(
 			&payer, &params, Some(&first_hops.iter().collect::<Vec<_>>()), inflight_htlcs
@@ -624,12 +624,6 @@ where
 	pub fn remove_cached_payment(&self, payment_hash: &PaymentHash) {
 		self.payment_cache.lock().unwrap().remove(payment_hash);
 	}
-
-	/// Construct an [`InFlightHtlcs`] containing information about currently used up liquidity
-	/// across payments.
-	fn create_inflight_map(&self) -> InFlightHtlcs {
-		self.payer.inflight_htlcs()
-	}
 }
 
 fn expiry_time_from_unix_epoch(invoice: &Invoice) -> Duration {
@@ -1470,7 +1464,7 @@ mod tests {
 
 		let payment_id = invoice_payer.pay_invoice(&invoice).unwrap();
 
-		let inflight_map = invoice_payer.create_inflight_map();
+		let inflight_map = invoice_payer.payer.inflight_htlcs();
 		// First path check
 		assert_eq!(inflight_map.0.get(&(0, false)).unwrap().clone(), 94);
 		assert_eq!(inflight_map.0.get(&(1, true)).unwrap().clone(), 84);
@@ -1484,7 +1478,7 @@ mod tests {
 			payment_id, payment_hash, path: route.paths[0].clone()
 		});
 
-		let inflight_map = invoice_payer.create_inflight_map();
+		let inflight_map = invoice_payer.payer.inflight_htlcs();
 
 		assert_eq!(inflight_map.0.get(&(0, false)), None);
 		assert_eq!(inflight_map.0.get(&(1, true)), None);
@@ -1642,7 +1636,7 @@ mod tests {
 			InvoicePayer::new(&payer, router, &logger, event_handler, Retry::Attempts(0));
 
 		invoice_payer.pay_invoice(&invoice_to_pay).unwrap();
-		let inflight_map = invoice_payer.create_inflight_map();
+		let inflight_map = invoice_payer.payer.inflight_htlcs();
 
 		// Only the second path, which failed with `MonitorUpdateInProgress` should be added to our
 		// inflight map because retries are disabled.
@@ -1673,7 +1667,7 @@ mod tests {
 			InvoicePayer::new(&payer, router, &logger, event_handler, Retry::Attempts(0));
 
 		invoice_payer.pay_invoice(&invoice_to_pay).unwrap();
-		let inflight_map = invoice_payer.create_inflight_map();
+		let inflight_map = invoice_payer.payer.inflight_htlcs();
 
 		// All paths successful, hence we check of the existence of all 5 hops.
 		assert_eq!(inflight_map.0.len(), 5);