f use local var for unwrap

Author: TheBlueMatt

lightning/src/ln/channelmanager.rs

@@ -3107,14 +3107,15 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 					session_priv_bytes.copy_from_slice(&session_priv[..]);
 					let mut outbounds = self.pending_outbound_payments.lock().unwrap();
 					if let hash_map::Entry::Occupied(mut payment) = outbounds.entry(payment_id) {
-						if payment.get_mut().remove(&session_priv_bytes, Some(path.last().unwrap().fee_msat)) &&
+						let path_last_hop = path.last().expect("Outbound payments must have had a valid path");
+						if payment.get_mut().remove(&session_priv_bytes, Some(path_last_hop.fee_msat)) &&
 							!payment.get().is_fulfilled()
 						{
 							let retry = if let Some(payee_data) = payee {
 								Some(PaymentPathRetry {
 									payee: payee_data,
-									final_value_msat: path.last().expect("Outbound payments must have had a valid path").fee_msat,
-									final_cltv_expiry_delta: path.last().expect("Outbound payments must have had a valid path").cltv_expiry_delta,
+									final_value_msat: path_last_hop.fee_msat,
+									final_cltv_expiry_delta: path_last_hop.cltv_expiry_delta,
 								})
 							} else { None };
 							self.pending_events.lock().unwrap().push(
@@ -3162,8 +3163,9 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 				session_priv_bytes.copy_from_slice(&session_priv[..]);
 				let mut outbounds = self.pending_outbound_payments.lock().unwrap();
 				let mut all_paths_failed = false;
+				let path_last_hop = path.last().expect("Outbound payments must have had a valid path");
 				if let hash_map::Entry::Occupied(mut payment) = outbounds.entry(payment_id) {
-					if !payment.get_mut().remove(&session_priv_bytes, Some(path.last().unwrap().fee_msat)) {
+					if !payment.get_mut().remove(&session_priv_bytes, Some(path_last_hop.fee_msat)) {
 						log_trace!(self.logger, "Received duplicative fail for HTLC with payment_hash {}", log_bytes!(payment_hash.0));
 						return;
 					}
@@ -3182,8 +3184,8 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 				let retry = if let Some(payee_data) = payee {
 					Some(PaymentPathRetry {
 						payee: payee_data.clone(),
-						final_value_msat: path.last().expect("Outbound payments must have had a valid path").fee_msat,
-						final_cltv_expiry_delta: path.last().expect("Outbound payments must have had a valid path").cltv_expiry_delta,
+						final_value_msat: path_last_hop.fee_msat,
+						final_cltv_expiry_delta: path_last_hop.cltv_expiry_delta,
 					})
 				} else { None };
 				log_trace!(self.logger, "Failing outbound payment HTLC with payment_hash {}", log_bytes!(payment_hash.0));