f - get rid of unwraps in check_total_value

Author: alecchendev

lightning/src/ln/channelmanager.rs

@@ -3555,21 +3555,11 @@ where
 								}
 
 								macro_rules! check_total_value {
-									($payment_secret: expr, $payment_preimage: expr) => {{
+									($purpose: expr) => {{
 										let mut payment_claimable_generated = false;
-										let is_keysend = match claimable_htlc.onion_payload {
-											OnionPayload::Spontaneous(_) => true,
-											OnionPayload::Invoice { .. } => false,
-										};
-										let purpose = if is_keysend {
-											events::PaymentPurpose::SpontaneousPayment(
-												$payment_preimage.expect("Should never call check_total_value with keysend payment but no preimage")
-											)
-										} else {
-											events::PaymentPurpose::InvoicePayment {
-												payment_preimage: $payment_preimage,
-												payment_secret: $payment_secret.expect("Should never call check_total_value with non-keysend payment but no payment secret"),
-											}
+										let is_keysend = match $purpose {
+											events::PaymentPurpose::SpontaneousPayment(_) => true,
+											events::PaymentPurpose::InvoicePayment { .. } => false,
 										};
 										let mut claimable_payments = self.claimable_payments.lock().unwrap();
 										if claimable_payments.pending_claiming_payments.contains_key(&payment_hash) {
@@ -3581,14 +3571,14 @@ where
 											.or_insert_with(|| {
 												committed_to_claimable = true;
 												ClaimablePayment {
-													purpose: purpose.clone(), htlcs: Vec::new(), onion_fields: None,
+													purpose: $purpose.clone(), htlcs: Vec::new(), onion_fields: None,
 												}
 											});
 										if !self.default_configuration.accept_mpp_keysend && is_keysend && !claimable_payment.htlcs.is_empty() {
 											log_trace!(self.logger, "Failing new keysend HTLC with payment_hash {} as we already had an existing keysend HTLC with the same payment hash and our config states we don't accept MPP keysend", log_bytes!(payment_hash.0));
 											fail_htlc!(claimable_htlc, payment_hash);
 										}
-										if purpose != claimable_payment.purpose {
+										if $purpose != claimable_payment.purpose {
 											let log_keysend = |keysend| if keysend { "keysend" } else { "non-keysend" };
 											log_trace!(self.logger, "Failing new {} HTLC with payment_hash {} as we already had an existing {} HTLC with the same payment hash", log_keysend(is_keysend), log_bytes!(payment_hash.0), log_keysend(!is_keysend));
 											fail_htlc!(claimable_htlc, payment_hash);
@@ -3632,7 +3622,7 @@ where
 											new_events.push_back((events::Event::PaymentClaimable {
 												receiver_node_id: Some(receiver_node_id),
 												payment_hash,
-												purpose,
+												purpose: $purpose,
 												amount_msat,
 												via_channel_id: Some(prev_channel_id),
 												via_user_channel_id: Some(prev_user_channel_id),
@@ -3680,18 +3670,23 @@ where
 														fail_htlc!(claimable_htlc, payment_hash);
 													}
 												}
-												check_total_value!(Some(payment_data.payment_secret), payment_preimage);
+												let purpose = events::PaymentPurpose::InvoicePayment {
+													payment_preimage: payment_preimage.clone(),
+													payment_secret: payment_data.payment_secret,
+												};
+												check_total_value!(purpose);
 											},
 											OnionPayload::Spontaneous(preimage) => {
-												check_total_value!(payment_data.as_ref().map(|d| d.payment_secret), Some(preimage));
+												let purpose = events::PaymentPurpose::SpontaneousPayment(preimage);
+												check_total_value!(purpose);
 											}
 										}
 									},
 									hash_map::Entry::Occupied(inbound_payment) => {
-										if payment_data.is_none() {
+										if let OnionPayload::Spontaneous(_) = claimable_htlc.onion_payload {
 											log_trace!(self.logger, "Failing new keysend HTLC with payment_hash {} because we already have an inbound payment with the same payment hash", log_bytes!(payment_hash.0));
 											fail_htlc!(claimable_htlc, payment_hash);
-										};
+										}
 										let payment_data = payment_data.unwrap();
 										if inbound_payment.get().payment_secret != payment_data.payment_secret {
 											log_trace!(self.logger, "Failing new HTLC with payment_hash {} as it didn't match our expected payment secret.", log_bytes!(payment_hash.0));
@@ -3701,7 +3696,11 @@ where
 												log_bytes!(payment_hash.0), payment_data.total_msat, inbound_payment.get().min_value_msat.unwrap());
 											fail_htlc!(claimable_htlc, payment_hash);
 										} else {
-											let payment_claimable_generated = check_total_value!(Some(payment_data.payment_secret), inbound_payment.get().payment_preimage);
+											let purpose = events::PaymentPurpose::InvoicePayment {
+												payment_preimage: inbound_payment.get().payment_preimage,
+												payment_secret: payment_data.payment_secret,
+											};
+											let payment_claimable_generated = check_total_value!(purpose);
 											if payment_claimable_generated {
 												inbound_payment.remove_entry();
 											}