fix: removed the non-connected refactoring and added the variants expected_event

Author: heyolaniran

bindings/python/src/ldk_node/test_ldk_node.py

@@ -12,9 +12,6 @@
 DEFAULT_TEST_NETWORK = Network.REGTEST
 DEFAULT_BITCOIN_CLI_BIN = "bitcoin-cli"
 
-DEFAULT_MAX_ATTEMPS=25
-SLEEP_TIME=0.5
-
 def bitcoin_cli(cmd):
     args = []
 
@@ -54,9 +51,9 @@ def mine_and_wait(esplora_endpoint, blocks):
 def wait_for_block(esplora_endpoint, block_hash):
     url = esplora_endpoint + "/block/" + block_hash + "/status"
     attempts = 0
+    max_attempts = 30
 
-
-    while attempts < DEFAULT_MAX_ATTEMPS:
+    while attempts < max_attempts:
         try:
             res = requests.get(url, timeout=10)
             json = res.json()
@@ -67,16 +64,16 @@ def wait_for_block(esplora_endpoint, block_hash):
             print(f"Error: {e}")
 
         attempts += 1
-        time.sleep(SLEEP_TIME)
+        time.sleep(0.5)
 
-    raise Exception(f"Failed to confirm block {block_hash} after {DEFAULT_MAX_ATTEMPS} attempts")
+    raise Exception(f"Failed to confirm block {block_hash} after {max_attempts} attempts")
 
 def wait_for_tx(esplora_endpoint, txid):
     url = esplora_endpoint + "/tx/" + txid
     attempts = 0
-    
+    max_attempts = 30
 
-    while attempts < DEFAULT_MAX_ATTEMPS:
+    while attempts < max_attempts:
         try:
             res = requests.get(url, timeout=10)
             json = res.json()
@@ -87,9 +84,9 @@ def wait_for_tx(esplora_endpoint, txid):
             print(f"Error: {e}")
 
         attempts += 1
-        time.sleep(SLEEP_TIME)
+        time.sleep(0.5)
 
-    raise Exception(f"Failed to confirm transaction {txid} after {DEFAULT_MAX_ATTEMPS} attempts")
+    raise Exception(f"Failed to confirm transaction {txid} after {max_attempts} attempts")
 
 def send_to_address(address, amount_sats):
     amount_btc = amount_sats/100000000.0
@@ -115,24 +112,32 @@ def get_esplora_endpoint():
         return str(os.environ['ESPLORA_ENDPOINT'])
     return DEFAULT_ESPLORA_SERVER_URL
 
-# handling expect events
+# handling expected event
 
 def expect_event(node, expected_event_type):
     event = node.wait_next_event()
     assert isinstance(event, expected_event_type)
     print("EVENT:", event)
     node.event_handled()
-    #According to the event type, we may want to return some data from the event for further processing
-    match expected_event_type:
-        case Event.CHANNEL_PENDING:
-            return event.funding_txo.txid
-        case Event.PAYMENT_RECEIVED:
-            return event.payment_hash
-        case Event.CHANNEL_READY:
-            if node.name == "node_2":
-                return event.user.channel_id
-        case _:
-            return None
+
+# handling channel ready event
+
+def expect_channel_pending_event(node):
+    event = node.wait_next_event()
+    assert isinstance(event, Event.CHANNEL_PENDING)
+    print("EVENT:", event)
+    node.event_handled()
+    return event
+
+# handling channel ready event
+
+def expect_channel_ready_event(node):
+    event = node.wait_next_event()
+    assert isinstance(event, Event.CHANNEL_READY)
+    print("EVENT:", event)
+    node.event_handled()
+    return event
+
 
 class TestLdkNode(unittest.TestCase):
     def setUp(self):
@@ -197,41 +202,39 @@ def test_channel_full_cycle(self):
 
         node_1.open_channel(node_id_2, listening_addresses_2[0], 50000, None, None)
 
-        # expect the channel pending event on the node 1 then get the funding txid from the event
+        channel_pending_event_1 = expect_channel_pending_event(node_1)
 
-        funding_txid = expect_event(node_1, Event.CHANNEL_PENDING)
-
-        # expect channel pending on node 2
+        # expect channel pending event on node 2 but without return value since it doesn't contain the funding_txo
         expect_event(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)
 
         node_1.sync_wallets()
         node_2.sync_wallets()
 
-        expect_event(node_1, Event.CHANNEL_READY)
-        print(f"Node 1 channel ready with node 2, funding txid: {funding_txid}")
+        # expect generic channel ready event on node 1
+        channel_ready_event_1 = expect_event(node_1, Event.CHANNEL_READY)
+        print("funding_txo:", funding_txid)
 
-        node_2_channel_id = expect_event(node_2, Event.CHANNEL_READY)
+        channel_ready_event_2 = expect_channel_ready_event(node_2)
 
         description = Bolt11InvoiceDescription.DIRECT("asdf")
         invoice = node_2.bolt11_payment().receive(2500000, description, 9217)
         node_1.bolt11_payment().send(invoice, None)
 
-        # expect payment successful on node 1
+        # expect payment successful event on node 1 and payment received event on node 2    
         expect_event(node_1, Event.PAYMENT_SUCCESSFUL)
 
-        # expect payment received on node_2
         expect_event(node_2, Event.PAYMENT_RECEIVED)
-        
+    
 
-        node_2.close_channel(node_2_channel_id, node_id_1)
+        node_2.close_channel(channel_ready_event_2.user_channel_id, node_id_1)
 
-        #Expecting node 1 channel closed
+        # expect channel closed event on both nodes
         expect_event(node_1, Event.CHANNEL_CLOSED)
 
-        #expecting channel close
         expect_event(node_2, Event.CHANNEL_CLOSED)
 
         mine_and_wait(esplora_endpoint, 1)
@@ -254,8 +257,5 @@ def test_channel_full_cycle(self):
         tmp_dir_1.cleanup()
         tmp_dir_2.cleanup()
 
-
-        
 if __name__ == '__main__':
     unittest.main()
-