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

Author: ddustin

tests/test_restart.py

@@ -17,5 +17,5 @@ def test_agressive_restart(node_factory, bitcoind):
     for _ in range(20):
         l1.rpc.stfu_channels([chan_id])
         l1.rpc.abort_channels([chan_id])
-        l1.daemon.wait_for_log(r'peer_in WIRE_CHANNEL_REESTABLISH')
-        l2.daemon.wait_for_log(r'peer_in WIRE_CHANNEL_REESTABLISH')
+        l1.daemon.wait_for_log(r'Restarting channeld after tx_abort')
+        l2.daemon.wait_for_log(r'Restarting channeld after tx_abort')

tests/test_splicing.py

@@ -230,10 +230,6 @@ def test_invalid_splice(node_factory, bitcoind):
     assert len(list(mempool.keys())) == 1
     assert result['txid'] in list(mempool.keys())
 
-    # Wait until nodes are reconnected
-    l1.daemon.wait_for_log(r'peer_in WIRE_CHANNEL_REESTABLISH')
-    l2.daemon.wait_for_log(r'peer_in WIRE_CHANNEL_REESTABLISH')
-
     bitcoind.generate_block(6, wait_for_mempool=1)
 
     l2.daemon.wait_for_log(r'CHANNELD_AWAITING_SPLICE to CHANNELD_NORMAL')

tests/test_splicing_disconnect.py

@@ -50,8 +50,8 @@ def test_splice_disconnect_sig(node_factory, bitcoind):
     l1.start()
 
     # Wait until nodes are reconnected
-    l1.daemon.wait_for_log(r'peer_in WIRE_CHANNEL_REESTABLISH')
-    l2.daemon.wait_for_log(r'peer_in WIRE_CHANNEL_REESTABLISH')
+    l1.daemon.wait_for_log(r'Restarting channeld after tx_abort')
+    l2.daemon.wait_for_log(r'Restarting channeld after tx_abort')
 
     bitcoind.generate_block(6, wait_for_mempool=1)
 
@@ -104,8 +104,8 @@ def test_splice_disconnect_commit(node_factory, bitcoind, executor):
     # Splice should be abandoned via tx_abort
 
     # Wait until nodes are reconnected
-    l1.daemon.wait_for_log(r'peer_in WIRE_CHANNEL_REESTABLISH')
-    l2.daemon.wait_for_log(r'peer_in WIRE_CHANNEL_REESTABLISH')
+    l1.daemon.wait_for_log(r'Restarting channeld after tx_abort')
+    l2.daemon.wait_for_log(r'Restarting channeld after tx_abort')
 
     l1.daemon.wait_for_log(r'peer_in WIRE_CHANNEL_READY')
     l2.daemon.wait_for_log(r'peer_in WIRE_CHANNEL_READY')