Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Score payment paths from events in BackgroundProcessor #1996

Conversation

valentinewallace
Copy link
Contributor

@valentinewallace valentinewallace commented Jan 30, 2023

Opening this as a draft before I finish testing+supporting in async to get ACKs on the patch.

It uses a higher-ranked trait bound, and works in the sample. The real solution is GATs, which doesn't fit our MSRV.

We want to move scoring here to migrate it out of the InvoicePayer as part of moving payment retries to ChannelManager.

Partially addresses #1932.

@TheBlueMatt
Copy link
Collaborator

No, I think an HRTB is the correct solution here, not a GAT - we aren't looking for a specific type but rather a range of types. Sadly we've had issues with that in the bindings due to rustc limitations in resolving HRTBs, but we'll see if it works this time.

@valentinewallace
Copy link
Contributor Author

No, I think an HRTB is the correct solution here, not a GAT - we aren't looking for a specific type but rather a range of types.

If we had GATs, we could remove the lifetime parameter from WriteableScore, by removing it from LockableScore:

pub trait LockableScore {
	/// The locked [`Score`] type.
	type Locked<'a>: 'a + Score where Self: 'a;

	/// Returns the locked scorer.
	fn lock(&self) -> Self::Locked<'_>;
}

@TheBlueMatt
Copy link
Collaborator

Ah, right.

@valentinewallace
Copy link
Contributor Author

Sadly we've had issues with that in the bindings due to rustc limitations in resolving HRTBs, but we'll see if it works this time.

Hmm, that seems like a big issue if it breaks bindings. Approach-wise, I wonder if that means the scoring needs to happen elsewhere?

@TheBlueMatt
Copy link
Collaborator

No, let's do it The Right Way first, and if it breaks in bindings we can figure it out later.

@valentinewallace valentinewallace force-pushed the 2023-01-migrate-payment-scoring branch 2 times, most recently from 96aa4ed to a1a0bc3 Compare January 31, 2023 20:41
@valentinewallace valentinewallace marked this pull request as ready for review January 31, 2023 20:42
@codecov-commenter
Copy link

codecov-commenter commented Jan 31, 2023

Codecov Report

Base: 90.91% // Head: 90.82% // Decreases project coverage by -0.09% ⚠️

Coverage data is based on head (2f9c3e5) compared to base (d4de913).
Patch coverage: 70.76% of modified lines in pull request are covered.

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1996      +/-   ##
==========================================
- Coverage   90.91%   90.82%   -0.09%     
==========================================
  Files          99       99              
  Lines       52505    52690     +185     
  Branches    52505    52690     +185     
==========================================
+ Hits        47735    47858     +123     
- Misses       4770     4832      +62     
Impacted Files Coverage Δ
lightning-background-processor/src/lib.rs 86.34% <70.68%> (-9.13%) ⬇️
lightning/src/ln/channelmanager.rs 87.26% <75.00%> (-0.02%) ⬇️
lightning-invoice/src/utils.rs 96.94% <0.00%> (-0.68%) ⬇️
lightning-net-tokio/src/lib.rs 77.48% <0.00%> (-0.30%) ⬇️
lightning/src/ln/functional_tests.rs 96.87% <0.00%> (-0.20%) ⬇️
lightning/src/chain/channelmonitor.rs 91.02% <0.00%> (-0.10%) ⬇️
lightning/src/routing/router.rs 91.11% <0.00%> (-0.04%) ⬇️
lightning/src/ln/peer_channel_encryptor.rs 92.18% <0.00%> (+0.23%) ⬆️
lightning/src/routing/scoring.rs 97.35% <0.00%> (+1.43%) ⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

@TheBlueMatt
Copy link
Collaborator

LGTM, feel free to squash.

lightning-background-processor/src/lib.rs Outdated Show resolved Hide resolved
lightning-background-processor/src/lib.rs Outdated Show resolved Hide resolved
lightning-background-processor/src/lib.rs Show resolved Hide resolved
@valentinewallace valentinewallace force-pushed the 2023-01-migrate-payment-scoring branch 2 times, most recently from 24e9a51 to 640d9e5 Compare February 2, 2023 22:48
TheBlueMatt
TheBlueMatt previously approved these changes Feb 2, 2023
lightning-background-processor/src/lib.rs Outdated Show resolved Hide resolved
lightning-background-processor/src/lib.rs Show resolved Hide resolved
lightning-background-processor/src/lib.rs Outdated Show resolved Hide resolved
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants