Skip to content

Avoid holding a per_peer_state lock while claiming from a monitor #2163

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

Merged
merged 1 commit into from
Apr 6, 2023

Conversation

TheBlueMatt
Copy link
Collaborator

There's no reason to hold a lock on per_peer_state while we're claiming from a since-closed channel via a ChannelMonitorUpdate, which we stop doing here.

Required for some future work but a trivial change that stands on its own.

There's no reason to hold a lock on `per_peer_state` while we're
claiming from a since-closed channel via a `ChannelMonitorUpdate`,
which we stop doing here.
Some((cp_id, _dup_chan_id)) => Some(cp_id.clone()),
None => None
};
{
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: I'd slightly prefer mem::drop since there was already 7 levels of indentation in some places, but whatevs

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried....the borrow checker here is....really really angry. I may have overlooked some other option, but it was a real fight :(

@codecov-commenter
Copy link

Codecov Report

Patch coverage: 90.32% and project coverage change: -0.02 ⚠️

Comparison is base (ba13499) 91.31% compared to head (b189df5) 91.30%.

📣 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    #2163      +/-   ##
==========================================
- Coverage   91.31%   91.30%   -0.02%     
==========================================
  Files         102      102              
  Lines       49981    49981              
  Branches    49981    49981              
==========================================
- Hits        45641    45633       -8     
- Misses       4340     4348       +8     
Impacted Files Coverage Δ
lightning/src/ln/channelmanager.rs 89.14% <90.32%> (ø)

... and 2 files with indirect coverage changes

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 in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@TheBlueMatt TheBlueMatt merged commit 5c6a39b into lightningdevkit:main Apr 6, 2023
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.

4 participants