-
Notifications
You must be signed in to change notification settings - Fork 912
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
lightningd/opening_control.c: fundchannel_cancel
no longer requires a channel_id
argument.
#3787
Conversation
The sequence Since this PR completely removes I am wary of retaining the We can merge in any order, though if we merge one, the other has to be modified before merging. |
Hm, I'm not too familiar with the |
Well, |
Rebased, because github says so. |
@niftynei bump!! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Error message needs a wording change, otherwise lgtm. This is the right direction to go for this imo.
lightningd/channel_control.c
Outdated
} | ||
if (!cancel_channel) | ||
return command_fail(cmd, LIGHTNINGD, | ||
"No channels matching that peer_id"); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"No channels matching that peer_id"); | |
"No channels awaiting lock-in for peer_id %s", ...); |
There might be a channel, but in the wrong state.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since fundchannel_cancel
can cancel not just channels awaiting lockin, but also uncommitted channels (i.e. OPENGIND
state), I reword instead: "No channels being opened or awaiting lock-in for peer_id".
… a `channel_id` argument. Fixes: ElementsProject#3785 Changelog-Changed: `fundchannel_cancel` no longer requires its undocumented `channel_id` argument after `fundchannel_complete`.
I also took the liberty of giving a specific error code for |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ACK bcd9e4c
I also took the liberty of giving a specific error code for fundchannel_cancel refusing to cancel if
Nice!
Fixes: #3785
Changelog-Changed:
fundchannel_cancel
no longer requires its undocumentedchannel_id
argument afterfundchannel_complete
.Note: this implies changes in #3763.