Skip to content

Commit 9bc38c1

Browse files
committed
feat: keep event handler methods minimalist and interconnected
1 parent 232a795 commit 9bc38c1

1 file changed

Lines changed: 5 additions & 21 deletions

File tree

bindings/python/src/ldk_node/test_ldk_node.py

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -119,24 +119,11 @@ def expect_event(node, expected_event_type):
119119
assert isinstance(event, expected_event_type)
120120
print("EVENT:", event)
121121
node.event_handled()
122-
123-
# handling channel pending event
122+
return event
124123

125124
def expect_channel_pending_event(node):
126-
event = node.wait_next_event()
127-
assert isinstance(event, Event.CHANNEL_PENDING)
128-
print("EVENT:", event)
129-
node.event_handled()
130-
return event
131-
132-
# handling channel ready event
133-
134-
def expect_channel_ready_event(node):
135-
event = node.wait_next_event()
136-
assert isinstance(event, Event.CHANNEL_READY)
137-
print("EVENT:", event)
138-
node.event_handled()
139-
return event
125+
event = expect_event(node, Event.CHANNEL_PENDING)
126+
return event.funding_txo.txid
140127

141128

142129
class TestLdkNode(unittest.TestCase):
@@ -202,12 +189,10 @@ def test_channel_full_cycle(self):
202189

203190
node_1.open_channel(node_id_2, listening_addresses_2[0], 50000, None, None)
204191

205-
channel_pending_event_1 = expect_channel_pending_event(node_1)
192+
funding_txid = expect_channel_pending_event(node_1)
206193

207-
# expect channel pending event on node 2 but without return value since it doesn't contain the funding_txo
208194
expect_event(node_2, Event.CHANNEL_PENDING)
209195

210-
funding_txid = channel_pending_event_1.funding_txo.txid
211196
wait_for_tx(esplora_endpoint, funding_txid)
212197
mine_and_wait(esplora_endpoint, 6)
213198

@@ -223,8 +208,7 @@ def test_channel_full_cycle(self):
223208
description = Bolt11InvoiceDescription.DIRECT("asdf")
224209
invoice = node_2.bolt11_payment().receive(2500000, description, 9217)
225210
node_1.bolt11_payment().send(invoice, None)
226-
227-
# expect payment successful event on node 1 and payment received event on node 2
211+
228212
expect_event(node_1, Event.PAYMENT_SUCCESSFUL)
229213

230214
expect_event(node_2, Event.PAYMENT_RECEIVED)

0 commit comments

Comments
 (0)