pytest: add tests for channel_state_changed into the CLOSED state.

Signed-off-by: Rusty Russell <[email protected]>

Author: rustyrussell

tests/test_plugin.py

@@ -938,7 +938,7 @@ def wait_for_event(node):
     assert(event2['cause'] == "remote")
     assert(event2['message'] == "Closing complete")
 
-    bitcoind.generate_block(100, wait_for_mempool=1)  # so it gets settled
+    bitcoind.generate_block(99, wait_for_mempool=1)  # so it gets settled
 
     event1 = wait_for_event(l1)
     assert(event1['old_state'] == "CLOSINGD_COMPLETE")
@@ -962,6 +962,18 @@ def wait_for_event(node):
     assert(event2['cause'] == "remote")
     assert(event2['message'] == "Onchain init reply")
 
+    bitcoind.generate_block(1)
+    event1 = wait_for_event(l1)
+    assert(event1['old_state'] == "ONCHAIN")
+    assert(event1['new_state'] == "CLOSED")
+    assert(event1['cause'] == "onchain")
+    assert(event1['message'] is None)
+    event2 = wait_for_event(l2)
+    assert(event2['old_state'] == "ONCHAIN")
+    assert(event2['new_state'] == "CLOSED")
+    assert(event2['cause'] == "onchain")
+    assert(event2['message'] is None)
+
 
 @pytest.mark.openchannel('v1')
 @pytest.mark.openchannel('v2')
@@ -1056,8 +1068,8 @@ def wait_for_event(node):
     assert(event1['cause'] == "protocol")
     assert(event1['message'] == "channeld: received ERROR channel {}: Forcibly closed by `close` command timeout".format(cid))
 
-    # settle the channel closure
-    bitcoind.generate_block(100)
+    # Almost settle the channel closure
+    bitcoind.generate_block(99, wait_for_mempool=1)
 
     event2 = wait_for_event(l2)
     assert(event2['old_state'] == "AWAITING_UNILATERAL")
@@ -1085,6 +1097,19 @@ def wait_for_event(node):
     assert(event1['cause'] == "onchain")
     assert(event1['message'] == "Onchain init reply")
 
+    bitcoind.generate_block(1)
+    event1 = wait_for_event(l1)
+    assert(event1['old_state'] == "ONCHAIN")
+    assert(event1['new_state'] == "CLOSED")
+    assert(event1['cause'] == "onchain")
+    assert(event1['message'] is None)
+
+    event2 = wait_for_event(l2)
+    assert(event2['old_state'] == "ONCHAIN")
+    assert(event2['new_state'] == "CLOSED")
+    assert(event2['cause'] == "onchain")
+    assert(event2['message'] is None)
+
 
 @pytest.mark.openchannel('v1')
 @pytest.mark.openchannel('v2')