aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-24 01:24:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

channeld/dualopend/lightningd: use channel_ready everywhere.

Browse Source 
This alters the billboard, but that's a human-readable thing so not
noted in CHANGELOG.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Changelog-Changed: JSON-RPC: `listpeers` `status` now refers to "channel ready" rather than "funding locked" (BOLT language change for zeroconf channels)
Changelog-Added: JSON-RPC: `channel_opened` notification `channel_ready` flag.
Changelog-Deprecated: JSON-RPC: `channel_opened` notification `funding_locked` flag (use `channel_ready`: BOLTs namechange).
This commit is contained in:
Rusty Russell
2022-09-10 11:41:31 +09:30
parent 1b30ea4b82
commit 5b7f14a7cb
13 changed files with 37 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/test_connection.py
View File

@@ -669,9 +669,9 @@ def test_reconnect_gossiping(node_factory):
@pytest.mark.openchannel('v1')
@pytest.mark.openchannel('v2')
def test_reconnect_no_update(node_factory, executor, bitcoind):
"""Test that funding_locked is retransmitted on reconnect if new channel
"""Test that channel_ready is retransmitted on reconnect if new channel
This tests if the `funding_locked` is sent if we receive a
This tests if the `channel_ready` is sent if we receive a
`channel_reestablish` message with `next_commitment_number` == 1
and our `next_commitment_number` == 1.
@@ -689,14 +689,14 @@ def test_reconnect_no_update(node_factory, executor, bitcoind):
l1.rpc.connect(l2.info["id"], "localhost", l2.port)
# LightningNode.fundchannel will fund the channel and generate a
# block. The block triggers the funding_locked message, which
# block. The block triggers the channel_ready message, which
# causes a disconnect. The retransmission is then caused by the
# automatic retry.
fundchannel_exec = executor.submit(l1.fundchannel, l2, 10**6, False)
if l1.config('experimental-dual-fund'):
l1.daemon.wait_for_log(r"dualopend.* Retransmitting funding_locked for channel")
l1.daemon.wait_for_log(r"dualopend.* Retransmitting channel_ready for channel")
else:
l1.daemon.wait_for_log(r"channeld.* Retransmitting funding_locked for channel")
l1.daemon.wait_for_log(r"channeld.* Retransmitting channel_ready for channel")
sync_blockheight(bitcoind, [l1, l2])
fundchannel_exec.result()
l1.stop()
@@ -706,7 +706,7 @@ def test_reconnect_no_update(node_factory, executor, bitcoind):
# Close will trigger the -WIRE_SHUTDOWN and we then wait for the
# automatic reconnection to trigger the retransmission.
l1.rpc.close(l2.info['id'], 0)
l2.daemon.wait_for_log(r"channeld.* Retransmitting funding_locked for channel")
l2.daemon.wait_for_log(r"channeld.* Retransmitting channel_ready for channel")
l1.daemon.wait_for_log(r"CLOSINGD_COMPLETE")
@@ -913,7 +913,7 @@ def test_reconnect_remote_sends_no_sigs(node_factory):
# l2 will now uses (REMOTE's) announcement_signatures it has stored
wait_for(lambda: only_one(l2.rpc.listpeers()['peers'][0]['channels'])['status'] == [
'CHANNELD_NORMAL:Reconnected, and reestablished.',
'CHANNELD_NORMAL:Funding transaction locked. Channel announced.'])
'CHANNELD_NORMAL:Channel ready for use. Channel announced.'])
# But l2 still sends its own sigs on reconnect
l2.daemon.wait_for_logs([r'peer_out WIRE_ANNOUNCEMENT_SIGNATURES',