f - use claimable_htlc.total_msat instead of passing in total_msat

Author: alecchendev

lightning/src/ln/channelmanager.rs

@@ -3548,7 +3548,7 @@ where
 								}
 
 								macro_rules! check_total_value {
-									($payment_secret: expr, $payment_preimage: expr, $total_msat: expr, $is_keysend: expr) => {{
+									($payment_secret: expr, $payment_preimage: expr, $is_keysend: expr) => {{
 										let mut payment_claimable_generated = false;
 										let purpose = if $is_keysend {
 											events::PaymentPurpose::SpontaneousPayment(
@@ -3596,9 +3596,9 @@ where
 										for htlc in htlcs.iter() {
 											total_value += htlc.sender_intended_value;
 											earliest_expiry = cmp::min(earliest_expiry, htlc.cltv_expiry);
-											if htlc.total_msat != $total_msat {
+											if htlc.total_msat != claimable_htlc.total_msat {
 												log_trace!(self.logger, "Failing HTLCs with payment_hash {} as the HTLCs had inconsistent total values (eg {} and {})",
-													log_bytes!(payment_hash.0), $total_msat, htlc.total_msat);
+													log_bytes!(payment_hash.0), claimable_htlc.total_msat, htlc.total_msat);
 												total_value = msgs::MAX_VALUE_MSAT;
 											}
 											if total_value >= msgs::MAX_VALUE_MSAT { break; }
@@ -3607,11 +3607,11 @@ where
 										// match exactly the condition used in `timer_tick_occurred`
 										if total_value >= msgs::MAX_VALUE_MSAT {
 											fail_htlc!(claimable_htlc, payment_hash);
-										} else if total_value - claimable_htlc.sender_intended_value >= $total_msat {
+										} else if total_value - claimable_htlc.sender_intended_value >= claimable_htlc.total_msat {
 											log_trace!(self.logger, "Failing HTLC with payment_hash {} as payment is already claimable",
 												log_bytes!(payment_hash.0));
 											fail_htlc!(claimable_htlc, payment_hash);
-										} else if total_value >= $total_msat {
+										} else if total_value >= claimable_htlc.total_msat {
 											#[allow(unused_assignments)] {
 												committed_to_claimable = true;
 											}
@@ -3670,10 +3670,10 @@ where
 														fail_htlc!(claimable_htlc, payment_hash);
 													}
 												}
-												check_total_value!(Some(payment_data.payment_secret), payment_preimage, payment_data.total_msat, false);
+												check_total_value!(Some(payment_data.payment_secret), payment_preimage, false);
 											},
 											OnionPayload::Spontaneous(preimage) => {
-												check_total_value!(payment_data.as_ref().map(|d| d.payment_secret), Some(preimage), payment_data.as_ref().map_or(claimable_htlc.value, |d| d.total_msat), true);
+												check_total_value!(payment_data.as_ref().map(|d| d.payment_secret), Some(preimage), true);
 											}
 										}
 									},
@@ -3691,7 +3691,7 @@ 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, payment_data.total_msat, false);
+											let payment_claimable_generated = check_total_value!(Some(payment_data.payment_secret), inbound_payment.get().payment_preimage, false);
 											if payment_claimable_generated {
 												inbound_payment.remove_entry();
 											}