Skip to content

smite-scenarios: negotiate second channel - #294

Merged
morehouse merged 1 commit into
masterfrom
negotiate_second_channel
Oct 21, 2026
Merged

morehouse merged 1 commit into
masterfrom
negotiate_second_channel

Conversation

@morehouse

Copy link
Copy Markdown
Collaborator

Two-channel tests were still using injected negotiations via the harness, and we now convert those to full negotiation as well.

The second channel used to fund 20M sats to make its funding transaction different from the first. That exceeds the non-wumbo cap enforced by AcceptChannelOracle, so instead we now use the same funding amount as the first channel. The second channel is still funded from the second UTXO, so the funding transaction is still distinct.

Since no test uses it anymore, we can now remove with_negotiation().

Depends on #293.

@morehouse
morehouse added this pull request to stack #289 October 16, 2026 04:28
@morehouse
morehouse force-pushed the negotiate_second_channel branch from 3687203 to 3cfa985 Compare October 16, 2026 21:06
@morehouse
morehouse force-pushed the negotiate_second_channel branch from 3cfa985 to a61bcb8 Compare October 16, 2026 22:18
Base automatically changed from panic_initial_commitment_error to master October 21, 2026 00:11
@morehouse
morehouse force-pushed the negotiate_second_channel branch from a61bcb8 to b599d38 Compare October 21, 2026 00:13

@NishantBansal2003 NishantBansal2003 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM!

/// A fixture with the target's `accept_channel` for both
/// [`funded_open_channel`] and [`second_funded_open_channel`] queued, and a
/// UTXO to fund each.
pub fn two_funding_negotiations_fixture() -> Fixture {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

nit:

Suggested change
pub fn two_funding_negotiations_fixture() -> Fixture {
pub fn recv_two_accept_channel_fixture() -> Fixture {

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Done.

Two-channel tests were still using injected negotiations via the
harness, and we now convert those to full negotiation as well.

The second channel used to fund 20M sats to make its funding transaction
different from the first.  That exceeds the non-wumbo cap enforced by
AcceptChannelOracle, so instead we now use the same funding amount as
the first channel.  The second channel is still funded from the second
UTXO, so the funding transaction is still distinct.

Since no test uses it anymore, we can now remove with_negotiation().
@morehouse
morehouse force-pushed the negotiate_second_channel branch from b599d38 to ac83b73 Compare October 21, 2026 06:10
@morehouse
morehouse merged commit ea8bdaa into master Oct 21, 2026
5 checks passed
@morehouse
morehouse deleted the negotiate_second_channel branch October 21, 2026 06:14
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.

2 participants