f no closure

Author: TheBlueMatt

lightning/src/ln/channelmanager.rs

@@ -902,16 +902,17 @@ struct ClaimablePayments {
 impl ClaimablePayments {
 	/// Moves a payment from [`Self::claimable_payments`] to [`Self::pending_claiming_payments`].
 	///
-	/// The `check_onion` callback allows the caller to reject the payment based on the
-	/// [`RecipientOnionFields`] (if any). If it returns `Err(_)`, the set of pending HTLCs will
-	/// be returned in the `Err` variant of this method. They MUST then be failed by the caller as
-	/// they will not be in either [`Self::claimable_payments`] or
+	/// If `custom_tlvs_known` is false and custom even TLVs are set by the sender, the set of
+	/// pending HTLCs will be returned in the `Err` variant of this method. They MUST then be
+	/// failed by the caller as they will not be in either [`Self::claimable_payments`] or
 	/// [`Self::pending_claiming_payments`].
 	///
+	/// If `custom_tlvs_known` is true, and a matching payment is found, it will always be moved.
+	///
 	/// If no payment is found, `Err(Vec::new())` is returned.
-	fn begin_claiming_payment<CheckOnion: Fn(&Option<RecipientOnionFields>) -> Result<(), ()>, L: Deref, S: Deref>(
+	fn begin_claiming_payment<L: Deref, S: Deref>(
 		&mut self, payment_hash: PaymentHash, node_signer: &S, logger: &L,
-		inbound_payment_id_secret: &[u8; 32], check_onion: CheckOnion,
+		inbound_payment_id_secret: &[u8; 32], custom_tlvs_known: bool,
 	) -> Result<(Vec<ClaimableHTLC>, ClaimingPayment), Vec<ClaimableHTLC>>
 		where L::Target: Logger, S::Target: NodeSigner,
 	{
@@ -928,8 +929,12 @@ impl ClaimablePayments {
 					}
 				}
 
-				if check_onion(&payment.onion_fields).is_err() {
-					return Err(payment.htlcs);
+				if let Some(RecipientOnionFields { custom_tlvs, .. }) = &payment.onion_fields {
+					if !custom_tlvs_known && custom_tlvs.iter().any(|(typ, _)| typ % 2 == 0) {
+						log_info!(logger, "Rejecting payment with payment hash {} as we cannot accept payment with unknown even TLVs: {}",
+							&payment_hash, log_iter!(custom_tlvs.iter().map(|(typ, _)| typ).filter(|typ| *typ % 2 == 0)));
+						return Err(payment.htlcs);
+					}
 				}
 
 				let payment_id = payment.inbound_payment_id(inbound_payment_id_secret);
@@ -6765,16 +6770,7 @@ where
 		let (sources, claiming_payment) = {
 			let res = self.claimable_payments.lock().unwrap().begin_claiming_payment(
 				payment_hash, &self.node_signer, &self.logger, &self.inbound_payment_id_secret,
-				|onion_fields| {
-					if let Some(RecipientOnionFields { ref custom_tlvs, .. }) = onion_fields {
-						if !custom_tlvs_known && custom_tlvs.iter().any(|(typ, _)| typ % 2 == 0) {
-							log_info!(self.logger, "Rejecting payment with payment hash {} as we cannot accept payment with unknown even TLVs: {}",
-								&payment_hash, log_iter!(custom_tlvs.iter().map(|(typ, _)| typ).filter(|typ| *typ % 2 == 0)));
-							return Err(());
-						}
-					}
-					Ok(())
-				}
+				custom_tlvs_known,
 			);
 
 			match res {