Skip to content
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

Output channel_id in listfunds #6029

Merged

Conversation

kristapsk
Copy link
Contributor

@kristapsk kristapsk commented Feb 22, 2023

See #6020 for context. This is useful, makes more easy use of dev-forget-channel to remove channels with no transaction in a blockchain (CHANNELD_AWAITING_LOCKIN in my case), can give channel_id argument.

Changelog-None

@kristapsk
Copy link
Contributor Author

There is CI error, but not sure how it's related to my changes.

@kristapsk
Copy link
Contributor Author

There is CI error, but not sure how it's related to my changes.

Ok, got it, needed to also update doc/schemas/listfunds.schema.json.

@kristapsk
Copy link
Contributor Author

Ok, I cannot figure out how to solve this error:

error[E0063]: missing field `channel_id` in initializer of `cln_rpc::model::ListfundsChannels`
    --> cln-grpc/src/convert.rs:2601:9
     |
2601 |         Self {
     |         ^^^^ missing `channel_id`

Apart from that, this is working, tested on my mainnet node.

@cdecker
Copy link
Member

cdecker commented Feb 23, 2023

This just requires a run of make check-gen-updated which will re-generate all derived files and fail if there ahve been any changes. If there were changes you can then just add them to git and commit them alongside the commit that added the field to the schema and it should be good to go.

I can do that for you if you'd like, just let me know ^^

@cdecker
Copy link
Member

cdecker commented Feb 24, 2023

That looks much better, thanks @kristapsk, the CI seems a bit flaky, and the failure seems unrelated, so I started another round :-)

@cdecker
Copy link
Member

cdecker commented Feb 24, 2023

ACK 5b26a95

Copy link
Contributor

@rustyrussell rustyrussell left a comment

Choose a reason for hiding this comment

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

Unfortunately needs a single, one-line change! Oh, and a Changelog entry!

I've done it, since it's trivial, though!

Changelog-Added: JSON-RPC: `listfunds` now has a `channel_id` field.
@rustyrussell
Copy link
Contributor

Ack 20405b0

Copy link
Collaborator

@vincenzopalazzo vincenzopalazzo left a comment

Choose a reason for hiding this comment

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

ACK 20405b0

@vincenzopalazzo vincenzopalazzo merged commit 906279a into ElementsProject:master Mar 21, 2023
@kristapsk kristapsk deleted the listfunds-channel_id branch March 21, 2023 10:39
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