Follow ups to "Remove convert channel err macro" #4281
Conversation
This commit is a pure move.
|
👋 Thanks for assigning @TheBlueMatt as a reviewer! |
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #4281 +/- ##
==========================================
+ Coverage 89.37% 89.39% +0.01%
==========================================
Files 180 180
Lines 139847 139834 -13
Branches 139847 139834 -13
==========================================
+ Hits 124983 124998 +15
+ Misses 12269 12250 -19
+ Partials 2595 2586 -9
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
lightning/src/ln/channelmanager.rs
Outdated
| /// [`ChannelManager::finish_close_channel`]. | ||
| /// | ||
| /// Returns a mapped error. | ||
| fn get_coop_close_err( |
There was a problem hiding this comment.
Hmmmmm, its not really just a "getter", though. Even convert was maybe a bit of a misnomer, but its really doing a bunch of stuff - its doing the initial channel closure handling, at least the locked part. Maybe locked_handle_coop_close (and similarly rename the rest locked_handle_*_close)?
There was a problem hiding this comment.
That's a good naming suggestion. Applied
lightning/src/ln/channelmanager.rs
Outdated
| /// When a channel is removed, two things need to happen: | ||
| /// (a) [`ChannelManager::convert_channel_err`] must be called in the same `per_peer_state` lock as the | ||
| /// channel-closing action, | ||
| /// (a) The close error must be converted to [`MsgHandleErrInternal`] in the same `per_peer_state` lock as the |
There was a problem hiding this comment.
Depending on if we rename the other methods from convert this might also be confusing. But this also implies that you can just build the MsgHandleErrInternal rather than calling one of the 3 close-handle-convert methods, maybe just link all of them?
|
👋 The first review has been submitted! Do you think this PR is ready for a second reviewer? If so, click here to assign a second reviewer. |
joostjager
force-pushed
the
remove-convert-channel-err-macro-follow-up
branch
2 times, most recently
from
39500b8 to
21a8400
Compare
Make the names more descriptive and link shared documentation.
joostjager
force-pushed
the
remove-convert-channel-err-macro-follow-up
branch
from
21a8400 to
e50280c
Compare
3 participants
Follows up to #4275