Skip to content

Commit 0b56f55

Browse files
committed
splice: tx_abort no longer reestablishes
As per eclair implementation we skip `channel_reestablish` and go straight into the channel for `tx_abort` events. Changelog-None
1 parent 2464ad9 commit 0b56f55

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

tests/test_restart.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ def test_agressive_restart(node_factory, bitcoind):
1717
for _ in range(20):
1818
l1.rpc.stfu_channels([chan_id])
1919
l1.rpc.abort_channels([chan_id])
20-
l1.daemon.wait_for_log(r'peer_in WIRE_CHANNEL_REESTABLISH')
21-
l2.daemon.wait_for_log(r'peer_in WIRE_CHANNEL_REESTABLISH')
20+
l1.daemon.wait_for_log(r'Restarting channeld after tx_abort')
21+
l2.daemon.wait_for_log(r'Restarting channeld after tx_abort')

tests/test_splicing.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -230,10 +230,6 @@ def test_invalid_splice(node_factory, bitcoind):
230230
assert len(list(mempool.keys())) == 1
231231
assert result['txid'] in list(mempool.keys())
232232

233-
# Wait until nodes are reconnected
234-
l1.daemon.wait_for_log(r'peer_in WIRE_CHANNEL_REESTABLISH')
235-
l2.daemon.wait_for_log(r'peer_in WIRE_CHANNEL_REESTABLISH')
236-
237233
bitcoind.generate_block(6, wait_for_mempool=1)
238234

239235
l2.daemon.wait_for_log(r'CHANNELD_AWAITING_SPLICE to CHANNELD_NORMAL')

0 commit comments

Comments
 (0)