Create inflight map independent of payment hash

We want to track _across_ payment hashes, doesn’t make sense to only
generate a map for the payment we are trying to send.

Author: jurvis

lightning-invoice/src/payment.rs

@@ -495,7 +495,7 @@ where
 
 		let payer = self.payer.node_id();
 		let first_hops = self.payer.first_hops();
-		let inflight_htlcs = self.create_inflight_map(&payment_hash);
+		let inflight_htlcs = self.create_inflight_map();
 		let route = self.router.find_route(
 			&payer, &params, &payment_hash, Some(&first_hops.iter().collect::<Vec<_>>()),
 			&AccountForInFlightHtlcs { scorer: &mut self.scorer.lock(), inflight_htlcs })
@@ -621,7 +621,7 @@ where
 
 		let payer = self.payer.node_id();
 		let first_hops = self.payer.first_hops();
-		let inflight_htlcs = self.create_inflight_map(&payment_hash);
+		let inflight_htlcs = self.create_inflight_map();
 
 		let route = self.router.find_route(
 			&payer, &params, &payment_hash, Some(&first_hops.iter().collect::<Vec<_>>()),
@@ -667,13 +667,12 @@ where
 	///
 	/// This function should be called whenever we need information about currently used up liquidity
 	/// across payments.
-	pub fn create_inflight_map(&self, payment_hash: &PaymentHash) -> HashMap<(u64, bool), u64> {
+	pub fn create_inflight_map(&self) -> HashMap<(u64, bool), u64> {
+		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
 		// HashMap.
-		if let Some(payment_info) = self.payment_cache.lock().unwrap().get(&payment_hash) {
-			let mut total_inflight_map: HashMap<(u64, bool), u64> = HashMap::new();
-
+		for (key, payment_info) in self.payment_cache.lock().unwrap().iter() {
 			for path in &payment_info.paths {
 				if path.is_empty() { break };
 				// total_inflight_map needs to be direction-sensitive when keeping track of the HTLC value
@@ -697,11 +696,9 @@ where
 						.or_insert(cumulative_msat);
 				}
 			}
-
-			return total_inflight_map
-		} else {
-			return HashMap::new()
 		}
+
+		total_inflight_map
 	}
 }
 
@@ -1570,7 +1567,7 @@ mod tests {
 
 		let payment_id = invoice_payer.pay_invoice(&invoice).unwrap();
 
-		let inflight_map = invoice_payer.create_inflight_map(&payment_hash.unwrap());
+		let inflight_map = invoice_payer.create_inflight_map();
 		// First path check
 		assert_eq!(inflight_map.get(&(0, true)).unwrap().clone(), 94);
 		assert_eq!(inflight_map.get(&(1, false)).unwrap().clone(), 84);
@@ -1583,7 +1580,7 @@ mod tests {
 			payment_id, payment_hash, path: route.paths[0].clone()
 		});
 
-		let inflight_map = invoice_payer.create_inflight_map(&payment_hash.unwrap());
+		let inflight_map = invoice_payer.create_inflight_map();
 
 		assert_eq!(inflight_map.get(&(0, true)), None);
 		assert_eq!(inflight_map.get(&(1, false)), None);