Fix deadlock when closing an unavailable channel #2657
Merged
Conversation
This file contains 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
Codecov ReportAll modified lines are covered by tests ✅
❗ Your organization needs to install the Codecov GitHub app to enable full functionality. Additional details and impacted files@@ Coverage Diff @@
## main #2657 +/- ##
==========================================
- Coverage 88.99% 88.96% -0.04%
==========================================
Files 112 112
Lines 87168 87207 +39
Branches 87168 87207 +39
==========================================
+ Hits 77575 77580 +5
- Misses 7353 7392 +39
+ Partials 2240 2235 -5
☔ View full report in Codecov by Sentry. |
TheBlueMatt
reviewed
Oct 11, 2023
| @@ -4001,7 +4003,7 @@ where | |||
| for channel_id in channel_ids { | |||
| if !peer_state.has_channel(channel_id) { | |||
| return Err(APIError::ChannelUnavailable { | |||
| err: format!("Channel with ID {} was not found for the passed counterparty_node_id {}", channel_id, counterparty_node_id), | |||
| err: format!("Channel with id {} not found for the passed counterparty node_id {}", channel_id, counterparty_node_id), | |||
There was a problem hiding this comment.
Not sure I understand this change.
There was a problem hiding this comment.
It is needed for the test to pass, as I'm checking the APIError::ChannelUnavailable with the same expected message in check_channel_unavailable_error()
| @@ -4112,7 +4114,7 @@ where | |||
| next_hop_channel_id, next_node_id) | |||
| }), | |||
| None => return Err(APIError::ChannelUnavailable { | |||
| err: format!("Channel with id {} not found for the passed counterparty node_id {}.", | |||
| err: format!("Channel with id {} not found for the passed counterparty node_id {}", | |||
There was a problem hiding this comment.
Or this one, we dont usually add periods.
wpaulino
approved these changes
Oct 12, 2023
TheBlueMatt
approved these changes
Oct 12, 2023
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.
Fix a deadlock issue when the user tries to close a channel that is not available anymore.
Tests have been added to cover the cases where the API is used with unavailable channels.