f only one push

Author: TheBlueMatt

lightning/src/ln/channelmanager.rs

@@ -3350,7 +3350,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 				} else { None };
 				log_trace!(self.logger, "Failing outbound payment HTLC with payment_hash {}", log_bytes!(payment_hash.0));
 
-				match &onion_error {
+				let path_failure = match &onion_error {
 					&HTLCFailReason::LightningError { ref err } => {
 #[cfg(test)]
 						let (network_update, short_channel_id, payment_retryable, onion_error_code, onion_error_data) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
@@ -3359,8 +3359,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 						// TODO: If we decided to blame ourselves (or one of our channels) in
 						// process_onion_failure we should close that channel as it implies our
 						// next-hop is needlessly blaming us!
-						let mut pending_events = self.pending_events.lock().unwrap();
-						pending_events.push(events::Event::PaymentPathFailed {
+						events::Event::PaymentPathFailed {
 							payment_id: Some(payment_id),
 							payment_hash: payment_hash.clone(),
 							rejected_by_dest: !payment_retryable,
@@ -3373,8 +3372,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 							error_code: onion_error_code,
 #[cfg(test)]
 							error_data: onion_error_data
-						});
-						if let Some(ev) = full_failure_ev { pending_events.push(ev); }
+						}
 					},
 					&HTLCFailReason::Reason {
 #[cfg(test)]
@@ -3389,8 +3387,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 						// ChannelDetails.
 						// TODO: For non-temporary failures, we really should be closing the
 						// channel here as we apparently can't relay through them anyway.
-						let mut pending_events = self.pending_events.lock().unwrap();
-						pending_events.push(events::Event::PaymentPathFailed {
+						events::Event::PaymentPathFailed {
 							payment_id: Some(payment_id),
 							payment_hash: payment_hash.clone(),
 							rejected_by_dest: path.len() == 1,
@@ -3403,10 +3400,12 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 							error_code: Some(*failure_code),
 #[cfg(test)]
 							error_data: Some(data.clone()),
-						});
-						if let Some(ev) = full_failure_ev { pending_events.push(ev); }
+						}
 					}
-				}
+				};
+				let mut pending_events = self.pending_events.lock().unwrap();
+				pending_events.push(path_failure);
+				if let Some(ev) = full_failure_ev { pending_events.push(ev); }
 			},
 			HTLCSource::PreviousHopData(HTLCPreviousHopData { short_channel_id, htlc_id, incoming_packet_shared_secret, .. }) => {
 				let err_packet = match onion_error {