Fix silent merge conflict introduced in d3ddf15 @TheBlueMatt

[TheBlueMatt]

No description provided.

[coderabbitai]

Walkthrough

The update involves refining the handling of temporary_channel_id in test assertions and enhancing the encoding logic for TLV streams in channel messages, particularly with the introduction of AcceptChannelV2. It also updates OpenChannel structures to include new fields and adapt TLV stream encoding based on specific features like taproot.

Changes

Files	Summary
.../functional_tests.rs, .../ln/msgs.rs	Updated temporary_channel_id handling in tests and modified AcceptChannel, OpenChannel structs for TLV stream encoding. Introduced AcceptChannelV2 with tailored Writeable and Readable implementations.

🐇✨
Changes in the code, so neat and bright,
Streamlining channels, day and night.
With every push, we aim to soar,
On digital paths, forevermore.
🌟🐾

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share

• X
• Mastodon
• Reddit
• LinkedIn

---

Tips

Chat

There are 3 ways to chat with CodeRabbit:

• Review comments: Directly reply to a review comment made by CodeRabbit. Example:
  • I pushed a fix in commit <commit_id>.
  • Generate unit-tests for this file.
• Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
  • @coderabbitai generate unit tests for this file.
  • @coderabbitai modularize this function.
• PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
  • @coderabbitai generate interesting stats about this repository from git and render them as a table.
  • @coderabbitai show all the console.log statements in this repository.
  • @coderabbitai read src/utils.ts and generate unit tests.
  • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (invoked as PR comments)

• @coderabbitai pause to pause the reviews on a PR.
• @coderabbitai resume to resume the paused reviews.
• @coderabbitai review to trigger a review. This is useful when automatic reviews are disabled for the repository.
• @coderabbitai resolve resolve all the CodeRabbit review comments.
• @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (.coderabbit.yaml)

• You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
• The JSON schema for the configuration file is available here.
• If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/coderabbit-overrides.v2.json

CodeRabbit Discord Community

Join our Discord Community to get help, request features, and share feedback.

[coderabbitai]

Review Status

Actionable comments generated: 0

Configuration used: CodeRabbit UI

Commits

Files that changed from the base of the PR and between aaacaf4 and ee34bcf.

Files selected for processing (2)

• lightning/src/ln/functional_tests.rs (2 hunks)
• lightning/src/ln/msgs.rs (8 hunks)

Additional comments: 10

lightning/src/ln/msgs.rs (8)

• 1790-1817: The Writeable implementation for AcceptChannel uses the encode_tlv_stream! macro for optional fields. Ensure that the TLV fields are correctly optional and that the encoding matches the Lightning Network specifications.
• 1787-1849: > 📝 NOTE

This review was outside the diff hunks and was mapped to the diff hunk with the greatest overlap. Original lines [1824-1871]

The Readable implementation for AcceptChannel correctly reads fields and uses the decode_tlv_stream! macro for optional TLV fields. Ensure that the TLV fields are correctly optional and that the decoding matches the Lightning Network specifications.

• 1879-1902: The Writeable implementation for AcceptChannelV2 correctly writes fields and uses the encode_tlv_stream! macro for optional fields. Ensure that the TLV fields are correctly optional and that the encoding matches the Lightning Network specifications.
• 1852-1923: > 📝 NOTE

This review was outside the diff hunks and was mapped to the diff hunk with the greatest overlap. Original lines [1880-1952]

The Readable implementation for AcceptChannelV2 correctly reads fields and uses the decode_tlv_stream! macro for optional TLV fields. Ensure that the TLV fields are correctly optional and that the decoding matches the Lightning Network specifications.

• 2173-2184: > 📝 NOTE

This review was outside the diff hunks and was mapped to the diff hunk with the greatest overlap. Original lines [2157-2181]

Review the Writeable implementation for OpenChannel to ensure that fields are correctly written and that the encoding matches the Lightning Network specifications.

• 2256-2268: > 📝 NOTE

This review was outside the diff hunks and was mapped to the diff hunk with the greatest overlap. Original lines [2239-2265]

Review the Writeable implementation for OpenChannelV2 to ensure that fields are correctly written and that the encoding matches the Lightning Network specifications.

• 2210-2242: > 📝 NOTE

This review was outside the diff hunks and was mapped to the diff hunk with the greatest overlap. Original lines [2157-2265]

Verify the correctness of the impl_writeable_msg! macros used for various message structs to ensure that all necessary fields are covered and that the encoding matches the Lightning Network specifications.

• 2210-2242: > 📝 NOTE

This review was outside the diff hunks and was mapped to the diff hunk with the greatest overlap. Original lines [2157-2265]

Review the tests for encoding and decoding of various message structs to ensure they cover a wide range of scenarios and correctly test the serialization/deserialization logic.

lightning/src/ln/functional_tests.rs (2)

• 10535-10535: The assertion correctly accesses temporary_channel_id through common_fields, aligning with the PR's objective to update how channel IDs are handled in tests. This change ensures that the test reflects the updated structure of the open_channel_msg struct.
• 10578-10578: Similar to the previous hunk, this assertion also correctly accesses temporary_channel_id through common_fields. The consistency in handling temporary_channel_id across different tests is crucial for maintaining the integrity of the test suite.