Skip to content

Commit ef3ec8f

Browse files
committed
Add PaymentPurpose::is_keysend utility method
1 parent e74f243 commit ef3ec8f

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

lightning/src/events/mod.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,13 @@ impl PaymentPurpose {
8383
PaymentPurpose::SpontaneousPayment(preimage) => Some(*preimage),
8484
}
8585
}
86+
87+
pub(crate) fn is_keysend(&self) -> bool {
88+
match self {
89+
PaymentPurpose::Bolt11InvoicePayment { .. } => false,
90+
PaymentPurpose::SpontaneousPayment(..) => true,
91+
}
92+
}
8693
}
8794

8895
impl_writeable_tlv_based_enum!(PaymentPurpose,

lightning/src/ln/channelmanager.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5431,10 +5431,7 @@ where
54315431
macro_rules! check_total_value {
54325432
($purpose: expr) => {{
54335433
let mut payment_claimable_generated = false;
5434-
let is_keysend = match $purpose {
5435-
events::PaymentPurpose::SpontaneousPayment(_) => true,
5436-
events::PaymentPurpose::Bolt11InvoicePayment { .. } => false,
5437-
};
5434+
let is_keysend = $purpose.is_keysend();
54385435
let mut claimable_payments = self.claimable_payments.lock().unwrap();
54395436
if claimable_payments.pending_claiming_payments.contains_key(&payment_hash) {
54405437
fail_htlc!(claimable_htlc, payment_hash);

0 commit comments

Comments
 (0)