Fix fuzz deadlock #3490
Merged
Fix fuzz deadlock #3490
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This marginally expands the test coverage in our persister `do_test_data_migration` test.
bcaba29 introduced a deadlock in the `chanmon_consistency` fuzzer by holding a lock on the route expectations before sending a payment, which ultimately tries to lock the route expectations. Here we fix this deadlock.
bcaba29 started returning pre-built `Route`s from the router in the `chanmon_consistency` fuzzer. In doing so, it didn't properly fill in the `route_parms` field which is expected to match the requested parameters. This causes a debug assertion when sending. Here we fix this by setting the correct `route_params`.
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #3490 +/- ##
==========================================
- Coverage 88.07% 88.07% -0.01%
==========================================
Files 148 148
Lines 111773 111782 +9
Branches 111773 111782 +9
==========================================
Hits 98447 98447
- Misses 10833 10839 +6
- Partials 2493 2496 +3 ☔ View full report in Codecov by Sentry. |
Prior to bcaba29, the `chanmon_consistency` fuzzer checked that payments sent either succeeded or failed as expected by looking at the `APIError` which we received as a result of calling the send method. bcaba29 removed the legacy send method during fuzzing so attempted to replicate the old logic by checking for events which contained the legacy `APIError` value. While this was plenty thorough, it was somewhat brittle in that it made expectations about the event state of a `ChannelManager` which turned out to not be true. Instead, here, we validate the send correctness by examining the `RecentPaymentDetails` list from a `ChannelManager` immediately after sending.
TheBlueMatt
force-pushed
the
2024-12-nits
branch
from
609428f to
a91bf02
Compare
valentinewallace
approved these changes
Dec 17, 2024
There was a problem hiding this comment.
Too bad about the bugs in bcaba29, I thought CI ran the fuzzers and would've uncovered the deadlock but I guess not? I was having macOS problems getting the fuzzers working locally so relied on CI too much..
| @@ -1226,7 +1226,8 @@ impl OutboundPayments { | |||
|
|
|||
| if route.route_params.as_ref() != Some(route_params) { | |||
| debug_assert!(false, | |||
| "Routers are expected to return a Route which includes the requested RouteParameters"); | |||
| "Routers are expected to return a Route which includes the requested RouteParameters. Got {:?}, expected {:?}", | |||
There was a problem hiding this comment.
Hmm... Should we have made the route params field required in Route for 0.1?
There was a problem hiding this comment.
Maybe? No huge rush, really...
valentinewallace
merged commit 0e6f47e
into
lightningdevkit:main
17 of 19 checks passed
|
First commit [54725ce] looks good ! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
and a tiny test improvement from #3481