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

doc: Fix wrong_funding description in manpage and type in schema #5444

Merged

Conversation

kristapsk
Copy link
Contributor

@kristapsk kristapsk commented Jul 20, 2022

It's already wrong_funding_txid in DESCRIPTION, but not SYNOPSIS.

It's currently wrong_funding in SYNOPSIS, but wrong_funding_txid in DESCRIPTION.

@kristapsk kristapsk changed the title Rename wrong_funding to wrong_funding_txid doc: Rename wrong_funding to wrong_funding_txid Jul 20, 2022
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.

nit: this

doc/lightning-close.7.md Outdated Show resolved Hide resolved
@kristapsk kristapsk force-pushed the lightning-close-wrong_funding_txid branch from cbee39d to b28a116 Compare July 22, 2022 23:31
@kristapsk kristapsk changed the title doc: Rename wrong_funding to wrong_funding_txid doc: Fix wrong_funding description in manpage and type in schema Jul 22, 2022
@vincenzopalazzo
Copy link
Collaborator

I think you should run make with rust enable, and I do not see any hash change in the docs so maybe can be good to run also make doc-all

@kristapsk kristapsk force-pushed the lightning-close-wrong_funding_txid branch from b28a116 to ed15204 Compare July 23, 2022 07:24
@kristapsk
Copy link
Contributor Author

I think you should run make with rust enable, and I do not see any hash change in the docs so maybe can be good to run also make doc-all

Done

@vincenzopalazzo
Copy link
Collaborator

(cd plugins; cargo build --quiet --examples)
error[E0308]: mismatched types
    --> cln-grpc/src/convert.rs:1080:28
     |
1080 |             wrong_funding: c.wrong_funding.clone(), // Rule #1 for type outpoint?
     |                            ^^^^^^^^^^^^^^^^^^^^^^^ expected struct `cln_rpc::primitives::Outpoint`, found struct `pb::Outpoint`
     |
     = note: expected enum `Option<cln_rpc::primitives::Outpoint>`
                found enum `Option<pb::Outpoint>`

I think you have no rust on your system? I have no permission to push so I can't help you to compile it :/ sorry

@kristapsk
Copy link
Contributor Author

I have, did not have errors locally after I rebuilt it with rustfmt enabled. 1.61.0 on Gentoo Linux.

@cdecker
Copy link
Member

cdecker commented Jul 27, 2022

Added a commit 5f6b42c to map the Option<Outpoint> in cln-rpc and cln-grpc conversions. This is the first time we had that type as an argument, hence the lack of conversion so far.

@kristapsk
Copy link
Contributor Author

Have this been just forgotten about?

@cdecker cdecker added this to the v22.10 milestone Sep 19, 2022
@cdecker
Copy link
Member

cdecker commented Sep 19, 2022

Nope, adding it to my list of PRs to shepherd through CI

@cdecker cdecker force-pushed the lightning-close-wrong_funding_txid branch 2 times, most recently from 255415b to 66a5235 Compare September 19, 2022 13:13
@cdecker
Copy link
Member

cdecker commented Sep 19, 2022

Regenerated derived files, which were outdated.

ACK d971c6b

kristapsk and others added 2 commits September 21, 2022 11:37
We didn't have optional Outpoints as arguments so far, so let's
backfill that.

Changelog-Changed: cln-rpc: The `wrong_funding` argument for `close` was changed from `bytes` to `outpoint`
@cdecker cdecker force-pushed the lightning-close-wrong_funding_txid branch from 66a5235 to d971c6b Compare September 21, 2022 09:38
@cdecker cdecker merged commit b9a7f36 into ElementsProject:master Sep 22, 2022
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.

3 participants