Skip to content

Commit 731fa9d

Browse files
committed
(Bindings Only) Concretize LockableScore as MultiThreadedLockableScore
We don't really care about more than this in bindings - calling into a custom `Score` is likely too slow to be practical anyway, so this is also a performance improvement. Works around rust-lang/rust#90448
1 parent 7d1e187 commit 731fa9d

File tree

1 file changed

+9
-12
lines changed

1 file changed

+9
-12
lines changed

lightning-invoice/src/payment.rs

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ use bitcoin_hashes::sha256::Hash as Sha256;
133133
use lightning::ln::{PaymentHash, PaymentPreimage, PaymentSecret};
134134
use lightning::ln::channelmanager::{ChannelDetails, PaymentId, PaymentSendFailure};
135135
use lightning::ln::msgs::LightningError;
136-
use lightning::routing::scoring::{LockableScore, Score};
136+
use lightning::routing::scoring::{LockableScore, MultiThreadedLockableScore, Score};
137137
use lightning::routing::router::{Payee, Route, RouteParameters};
138138
use lightning::util::events::{Event, EventHandler};
139139
use lightning::util::logger::Logger;
@@ -150,16 +150,15 @@ use std::time::{Duration, SystemTime};
150150
/// See [module-level documentation] for details.
151151
///
152152
/// [module-level documentation]: crate::payment
153-
pub struct InvoicePayer<P: Deref, R, S: Deref, L: Deref, E: EventHandler>
153+
pub struct InvoicePayer<P: Deref, S: Score, R: Deref, SR: Deref<Target = MultiThreadedLockableScore<S>>, L: Deref, E: EventHandler>
154154
where
155155
P::Target: Payer,
156-
R: for <'a> Router<<<S as Deref>::Target as LockableScore<'a>>::Locked>,
157-
S::Target: for <'a> LockableScore<'a>,
156+
R::Target: Router<S>,
158157
L::Target: Logger,
159158
{
160159
payer: P,
161160
router: R,
162-
scorer: S,
161+
scorer: SR,
163162
logger: L,
164163
event_handler: E,
165164
/// Caches the overall attempts at making a payment, which is updated prior to retrying.
@@ -220,19 +219,18 @@ pub enum PaymentError {
220219
Sending(PaymentSendFailure),
221220
}
222221

223-
impl<P: Deref, R, S: Deref, L: Deref, E: EventHandler> InvoicePayer<P, R, S, L, E>
222+
impl<P: Deref, S: Score, R: Deref, SR: Deref<Target = MultiThreadedLockableScore<S>>, L: Deref, E: EventHandler> InvoicePayer<P, S, R, SR, L, E>
224223
where
225224
P::Target: Payer,
226-
R: for <'a> Router<<<S as Deref>::Target as LockableScore<'a>>::Locked>,
227-
S::Target: for <'a> LockableScore<'a>,
225+
R::Target: Router<S>,
228226
L::Target: Logger,
229227
{
230228
/// Creates an invoice payer that retries failed payment paths.
231229
///
232230
/// Will forward any [`Event::PaymentPathFailed`] events to the decorated `event_handler` once
233231
/// `retry_attempts` has been exceeded for a given [`Invoice`].
234232
pub fn new(
235-
payer: P, router: R, scorer: S, logger: L, event_handler: E, retry_attempts: RetryAttempts
233+
payer: P, router: R, scorer: SR, logger: L, event_handler: E, retry_attempts: RetryAttempts
236234
) -> Self {
237235
Self {
238236
payer,
@@ -453,11 +451,10 @@ fn has_expired(params: &RouteParameters) -> bool {
453451
} else { false }
454452
}
455453

456-
impl<P: Deref, R, S: Deref, L: Deref, E: EventHandler> EventHandler for InvoicePayer<P, R, S, L, E>
454+
impl<P: Deref, S: Score, R: Deref, SR: Deref<Target = MultiThreadedLockableScore<S>>, L: Deref, E: EventHandler> EventHandler for InvoicePayer<P, S, R, SR, L, E>
457455
where
458456
P::Target: Payer,
459-
R: for <'a> Router<<<S as Deref>::Target as LockableScore<'a>>::Locked>,
460-
S::Target: for <'a> LockableScore<'a>,
457+
R::Target: Router<S>,
461458
L::Target: Logger,
462459
{
463460
fn handle_event(&self, event: &Event) {

0 commit comments

Comments
 (0)