From 808e72ad15d1747a091b86c5acd84f1a9957aa63 Mon Sep 17 00:00:00 2001 From: Elias Rohrer Date: Fri, 6 Oct 2023 07:30:45 -1000 Subject: [PATCH] Have methods take `AChannelManager` as `Deref::Target` --- lightning-invoice/src/payment.rs | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/lightning-invoice/src/payment.rs b/lightning-invoice/src/payment.rs index 08be3d54b..37308af99 100644 --- a/lightning-invoice/src/payment.rs +++ b/lightning-invoice/src/payment.rs @@ -32,9 +32,10 @@ use core::time::Duration; /// with the same [`PaymentHash`] is never sent. /// /// If you wish to use a different payment idempotency token, see [`pay_invoice_with_id`]. -pub fn pay_invoice( - invoice: &Bolt11Invoice, retry_strategy: Retry, channelmanager: &C +pub fn pay_invoice( + invoice: &Bolt11Invoice, retry_strategy: Retry, channelmanager: C ) -> Result +where C::Target: AChannelManager, { let payment_id = PaymentId(invoice.payment_hash().into_inner()); pay_invoice_with_id(invoice, payment_id, retry_strategy, channelmanager.get_cm()) @@ -51,9 +52,10 @@ pub fn pay_invoice( /// [`PaymentHash`] has never been paid before. /// /// See [`pay_invoice`] for a variant which uses the [`PaymentHash`] for the idempotency token. -pub fn pay_invoice_with_id( - invoice: &Bolt11Invoice, payment_id: PaymentId, retry_strategy: Retry, channelmanager: &C +pub fn pay_invoice_with_id( + invoice: &Bolt11Invoice, payment_id: PaymentId, retry_strategy: Retry, channelmanager: C ) -> Result<(), PaymentError> +where C::Target: AChannelManager, { let amt_msat = invoice.amount_milli_satoshis().ok_or(PaymentError::Invoice("amount missing"))?; pay_invoice_using_amount(invoice, amt_msat, payment_id, retry_strategy, channelmanager.get_cm()) @@ -68,9 +70,10 @@ pub fn pay_invoice_with_id( /// /// If you wish to use a different payment idempotency token, see /// [`pay_zero_value_invoice_with_id`]. -pub fn pay_zero_value_invoice( - invoice: &Bolt11Invoice, amount_msats: u64, retry_strategy: Retry, channelmanager: &C +pub fn pay_zero_value_invoice( + invoice: &Bolt11Invoice, amount_msats: u64, retry_strategy: Retry, channelmanager: C ) -> Result +where C::Target: AChannelManager, { let payment_id = PaymentId(invoice.payment_hash().into_inner()); pay_zero_value_invoice_with_id(invoice, amount_msats, payment_id, retry_strategy, @@ -89,10 +92,11 @@ pub fn pay_zero_value_invoice( /// /// See [`pay_zero_value_invoice`] for a variant which uses the [`PaymentHash`] for the /// idempotency token. -pub fn pay_zero_value_invoice_with_id( +pub fn pay_zero_value_invoice_with_id( invoice: &Bolt11Invoice, amount_msats: u64, payment_id: PaymentId, retry_strategy: Retry, - channelmanager: &C + channelmanager: C ) -> Result<(), PaymentError> +where C::Target: AChannelManager, { if invoice.amount_milli_satoshis().is_some() { Err(PaymentError::Invoice("amount unexpected")) @@ -124,9 +128,10 @@ fn pay_invoice_using_amount( /// Sends payment probes over all paths of a route that would be used to pay the given invoice. /// /// See [`ChannelManager::send_preflight_probes`] for more information. -pub fn preflight_probe_invoice( - invoice: &Bolt11Invoice, channelmanager: &C, liquidity_limit_multiplier: Option, +pub fn preflight_probe_invoice( + invoice: &Bolt11Invoice, channelmanager: C, liquidity_limit_multiplier: Option, ) -> Result, ProbingError> +where C::Target: AChannelManager, { let amount_msat = if let Some(invoice_amount_msat) = invoice.amount_milli_satoshis() { invoice_amount_msat @@ -155,10 +160,11 @@ pub fn preflight_probe_invoice( /// invoice using the given amount. /// /// See [`ChannelManager::send_preflight_probes`] for more information. -pub fn preflight_probe_zero_value_invoice( - invoice: &Bolt11Invoice, amount_msat: u64, channelmanager: &C, +pub fn preflight_probe_zero_value_invoice( + invoice: &Bolt11Invoice, amount_msat: u64, channelmanager: C, liquidity_limit_multiplier: Option, ) -> Result, ProbingError> +where C::Target: AChannelManager, { if invoice.amount_milli_satoshis().is_some() { return Err(ProbingError::Invoice("amount unexpected")); -- 2.39.5