fix: node_2 close event and clean up the temp dir even test fails

Author: heyolaniran

bindings/python/src/ldk_node/test_ldk_node.py

@@ -137,117 +137,125 @@ def test_channel_full_cycle(self):
         ## Setup NodeS 1 & 2 in paralel
         tmp_dir_1 = tempfile.TemporaryDirectory("_ldk_node_1")
         tmp_dir_2 =  tempfile.TemporaryDirectory("_ldk_node_2")
-        print("TMP DIR 1:", tmp_dir_1.name)
-        print("TMP DIR 2:", tmp_dir_2.name)
+        try:
+            print("TMP DIR 1:", tmp_dir_1.name)
+            print("TMP DIR 2:", tmp_dir_2.name)
 
-        # listening addresses
-        listening_addresses_1 = ["127.0.0.1:2323"]
-        listening_addresses_2 = ["127.0.0.1:2324"]
+            # listening addresses
+            listening_addresses_1 = ["127.0.0.1:2323"]
+            listening_addresses_2 = ["127.0.0.1:2324"]
 
-        # Start both node 
+            # Start both node 
 
-        node_1 = setup_node(tmp_dir=tmp_dir_1.name , esplora_endpoint=esplora_endpoint, listening_addresses=listening_addresses_1)
-        node_2 = setup_node(tmp_dir=tmp_dir_2.name, esplora_endpoint=esplora_endpoint, listening_addresses=listening_addresses_2)
+            node_1 = setup_node(tmp_dir=tmp_dir_1.name , esplora_endpoint=esplora_endpoint, listening_addresses=listening_addresses_1)
+            node_2 = setup_node(tmp_dir=tmp_dir_2.name, esplora_endpoint=esplora_endpoint, listening_addresses=listening_addresses_2)
 
-        node_1.start()
-        node_2.start()
+            node_1.start()
+            node_2.start()
 
-        # get Nodes IDs
-        node_id_1 = node_1.node_id()
-        node_id_2 = node_2.node_id()
-        print("Node ID 1:", node_id_1)
-        print("Node ID 2:", node_id_2)
+            # get Nodes IDs
+            node_id_1 = node_1.node_id()
+            node_id_2 = node_2.node_id()
+            print("Node ID 1:", node_id_1)
+            print("Node ID 2:", node_id_2)
 
 
-        # Send funds to both addresses in parallel
+            # Send funds to both addresses in parallel
 
-        address_1 = node_1.onchain_payment().new_address()
-        txid_1 = send_to_address(address_1, 100000)
-        address_2 = node_2.onchain_payment().new_address()
-        txid_2 = send_to_address(address_2, 100000)
+            address_1 = node_1.onchain_payment().new_address()
+            txid_1 = send_to_address(address_1, 100000)
+            address_2 = node_2.onchain_payment().new_address()
+            txid_2 = send_to_address(address_2, 100000)
 
-        wait_for_tx(esplora_endpoint, txid_1)
-        wait_for_tx(esplora_endpoint, txid_2)
+            wait_for_tx(esplora_endpoint, txid_1)
+            wait_for_tx(esplora_endpoint, txid_2)
 
-        mine_and_wait(esplora_endpoint, 6)
+            mine_and_wait(esplora_endpoint, 6)
 
-        # Sync both nodes
-        node_1.sync_wallets()
-        node_2.sync_wallets()
+            # Sync both nodes
+            node_1.sync_wallets()
+            node_2.sync_wallets()
 
-        # verify balances
+            # verify balances
 
-        for node, name in [(node_1, '1'), (node_2,"2")] :
-            spendable_balance = node.list_balances().spendable_onchain_balance_sats
-            total_balance = node.list_balances().total_onchain_balance_sats
-            self.assertEqual(spendable_balance, 100000, f"Node {name} spendable balance should be 100000 sats, the test spotted {spendable_balance} sats")
-            self.assertEqual(total_balance, 100000, f"Node {name} total balance should be 100000 sats, the test spotted {total_balance} sats")
-        
+            for node, name in [(node_1, '1'), (node_2,"2")] :
+                spendable_balance = node.list_balances().spendable_onchain_balance_sats
+                total_balance = node.list_balances().total_onchain_balance_sats
+                self.assertEqual(spendable_balance, 100000, f"Node {name} spendable balance should be 100000 sats, the test spotted {spendable_balance} sats")
+                self.assertEqual(total_balance, 100000, f"Node {name} total balance should be 100000 sats, the test spotted {total_balance} sats")
+            
 
-        node_1.open_channel(node_id_2, listening_addresses_2[0], 50000, None, None)
+            node_1.open_channel(node_id_2, listening_addresses_2[0], 50000, None, None)
 
-        # check if both nodes received the channel pending event
-        channel_pending_event_1 = node_1.wait_next_event()
-        assert isinstance(channel_pending_event_1, Event.CHANNEL_PENDING)
-        print("EVENT:", channel_pending_event_1)
-        node_1.event_handled()
+            # check if both nodes received the channel pending event
+            channel_pending_event_1 = node_1.wait_next_event()
+            assert isinstance(channel_pending_event_1, Event.CHANNEL_PENDING)
+            print("EVENT:", channel_pending_event_1)
+            node_1.event_handled()
 
-        event_handling(node_2, Event.CHANNEL_PENDING)
+            event_handling(node_2, Event.CHANNEL_PENDING)
 
-        funding_txid = channel_pending_event_1.funding_txo.txid
-        wait_for_tx(esplora_endpoint, funding_txid)
-        mine_and_wait(esplora_endpoint, 6)
+            funding_txid = channel_pending_event_1.funding_txo.txid
+            wait_for_tx(esplora_endpoint, funding_txid)
+            mine_and_wait(esplora_endpoint, 6)
 
-        node_1.sync_wallets()
-        node_2.sync_wallets()
+            node_1.sync_wallets()
+            node_2.sync_wallets()
 
-        channel_ready_event_1 = node_1.wait_next_event()
-        assert isinstance(channel_ready_event_1, Event.CHANNEL_READY)
-        print("EVENT:", channel_ready_event_1)
-        print("funding_txo:", funding_txid)
-        node_1.event_handled()
+            channel_ready_event_1 = node_1.wait_next_event()
+            assert isinstance(channel_ready_event_1, Event.CHANNEL_READY)
+            print("EVENT:", channel_ready_event_1)
+            print("funding_txo:", funding_txid)
+            node_1.event_handled()
 
-        # check if the channel is active
-        event_handling(node_2, Event.CHANNEL_READY)
+            # check if the channel is active
+            event_handling(node_2, Event.CHANNEL_READY)
 
-        description = Bolt11InvoiceDescription.DIRECT("asdf")
-        invoice = node_2.bolt11_payment().receive(2500000, description, 9217)
-        node_1.bolt11_payment().send(invoice, None)
+            description = Bolt11InvoiceDescription.DIRECT("asdf")
+            invoice = node_2.bolt11_payment().receive(2500000, description, 9217)
+            node_1.bolt11_payment().send(invoice, None)
 
 
-        # check if the payment is done
-        event_handling(node_1, Event.PAYMENT_SUCCESSFUL)
-        # check if the node 2 received the payment
-        event_handling(node_2, Event.PAYMENT_RECEIVED)
+            # check if the payment is done
+            event_handling(node_1, Event.PAYMENT_SUCCESSFUL)
+            # check if the node 2 received the payment
+            channel_ready_event_2 = node_2.wait_next_event()
+            assert isinstance(channel_ready_event_2, Event.PAYMENT_RECEIVED)
+            print("EVENT:", channel_ready_event_2)
+            node_2.event_handled()
 
 
-     
+        
 
-        node_2.close_channel(channel_ready_event_2.user_channel_id, node_id_1)
+            node_2.close_channel(channel_ready_event_2.user_channel_id, node_id_1)
 
-        for node in [node_1, node_2]:
-            event_handling(node, Event.CHANNEL_CLOSED)
+            for node in [node_1, node_2]:
+                event_handling(node, Event.CHANNEL_CLOSED)
 
-        # mine and wait for the close transaction to confirm
-        mine_and_wait(esplora_endpoint, 1)
+            # mine and wait for the close transaction to confirm
+            mine_and_wait(esplora_endpoint, 1)
 
-        node_1.sync_wallets()
-        node_2.sync_wallets()
+            node_1.sync_wallets()
+            node_2.sync_wallets()
 
-        spendable_balance_after_close_1 = node_1.list_balances().spendable_onchain_balance_sats
-        assert spendable_balance_after_close_1 > 95000
-        assert spendable_balance_after_close_1 < 100000
-        spendable_balance_after_close_2 = node_2.list_balances().spendable_onchain_balance_sats
-        self.assertEqual(spendable_balance_after_close_2, 102500)
+            spendable_balance_after_close_1 = node_1.list_balances().spendable_onchain_balance_sats
+            assert spendable_balance_after_close_1 > 95000
+            assert spendable_balance_after_close_1 < 100000
+            spendable_balance_after_close_2 = node_2.list_balances().spendable_onchain_balance_sats
+            self.assertEqual(spendable_balance_after_close_2, 102500)
 
-        # Stop nodes
-        node_1.stop()
-        node_2.stop()
+            # Stop nodes
+            node_1.stop()
+            node_2.stop()
 
-        # Cleanup
-        time.sleep(1) # Wait a sec so our logs can finish writing
-        tmp_dir_1.cleanup()
-        tmp_dir_2.cleanup()
+            # Cleanup
+            time.sleep(1) # Wait a sec so our logs can finish writing
+            tmp_dir_1.cleanup()
+            tmp_dir_2.cleanup()
+        finally:
+            # Cleanup even if the test fails
+            tmp_dir_1.cleanup()
+            tmp_dir_2.cleanup()
 
 if __name__ == '__main__':
     unittest.main()