f style

Author: TheBlueMatt

lightning/src/ln/channelmanager.rs

@@ -557,9 +557,6 @@ pub struct ChannelManager<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref,
 	/// See `PendingOutboundPayment` documentation for more info.
 	///
 	/// Locked *after* channel_state.
-	#[cfg(test)] // Exposed so that we can check there aren't dangling entries
-	pub(crate) pending_outbound_payments: Mutex<HashMap<PaymentId, PendingOutboundPayment>>,
-	#[cfg(not(test))]
 	pending_outbound_payments: Mutex<HashMap<PaymentId, PendingOutboundPayment>>,
 
 	our_network_key: SecretKey,
@@ -1971,15 +1968,14 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 					if !chan.get().is_live() {
 						return Err(APIError::ChannelUnavailable{err: "Peer for first hop currently disconnected/pending monitor update!".to_owned()});
 					}
-					let send_res =
-						break_chan_entry!(self, chan.get_mut().send_htlc_and_commit(
-							htlc_msat, payment_hash.clone(), htlc_cltv, HTLCSource::OutboundRoute {
-								path: path.clone(),
-								session_priv: session_priv.clone(),
-								first_hop_htlc_msat: htlc_msat,
-								payment_id,
-							}, onion_packet, &self.logger),
-						channel_state, chan);
+					let send_res = break_chan_entry!(self, chan.get_mut().send_htlc_and_commit(
+						htlc_msat, payment_hash.clone(), htlc_cltv, HTLCSource::OutboundRoute {
+							path: path.clone(),
+							session_priv: session_priv.clone(),
+							first_hop_htlc_msat: htlc_msat,
+							payment_id,
+						}, onion_packet, &self.logger),
+					channel_state, chan);
 
 					let mut pending_outbounds = self.pending_outbound_payments.lock().unwrap();
 					let payment = pending_outbounds.entry(payment_id).or_insert_with(|| PendingOutboundPayment::Retryable {
@@ -4392,6 +4388,11 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 		self.process_pending_events(&event_handler);
 		events.into_inner()
 	}
+
+	#[cfg(test)]
+	pub fn has_pending_payments(&self) -> bool {
+		!self.pending_outbound_payments.lock().unwrap().is_empty()
+	}
 }
 
 impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> MessageSendEventsProvider for ChannelManager<Signer, M, T, K, F, L>

lightning/src/ln/payment_tests.rs

@@ -227,9 +227,9 @@ fn retry_expired_payment() {
 }
 
 #[test]
-fn retry_on_init_fail() {
+fn no_pending_leak_on_initial_send_failure() {
 	// In an earlier version of our payment tracking, we'd have a retry entry even when the initial
-	// HTLC for payment failed to send due to local channel errors (eg peer disconnected). In this
+	// HTLC for payment failed to send due to local channel errors (e.g. peer disconnected). In this
 	// case, the user wouldn't have a PaymentId to retry the payment with, but we'd think we have a
 	// pending payment forever and never time it out.
 	// Here we test exactly that - retrying a payment when a peer was disconnected on the first
@@ -250,5 +250,5 @@ fn retry_on_init_fail() {
 		true, APIError::ChannelUnavailable { ref err },
 		assert_eq!(err, "Peer for first hop currently disconnected/pending monitor update!"));
 
-	assert!(nodes[0].node.pending_outbound_payments.lock().unwrap().is_empty());
+	assert!(!nodes[0].node.has_pending_payments());
 }