From 7f9395bb7810b269a0aa5a882cc8b1b647747359 Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Sun, 30 May 2021 16:53:14 +0000 Subject: [PATCH] Update bindings demo clients to the new event handling API --- lightning-c-bindings/demo.c | 11 +++++-- lightning-c-bindings/demo.cpp | 61 ++++++++++++++++++++++------------- 2 files changed, 47 insertions(+), 25 deletions(-) diff --git a/lightning-c-bindings/demo.c b/lightning-c-bindings/demo.c index 2a45e46..a955630 100644 --- a/lightning-c-bindings/demo.c +++ b/lightning-c-bindings/demo.c @@ -35,6 +35,11 @@ LDKCVec_MonitorEventZ monitors_pending_monitor_events(const void *this_arg) { return empty_htlc_vec; } +void never_handle_event(const void *this_arg, struct LDKEvent event) { + // Note that we never actually generate any events to handle in the code below. + assert(false); +} + int main() { uint8_t node_seed[32]; memset(node_seed, 0, 32); @@ -82,9 +87,9 @@ int main() { CVec_ChannelDetailsZ_free(channels); LDKEventsProvider prov = ChannelManager_as_EventsProvider(&cm); - LDKCVec_EventZ events = (prov.get_and_clear_pending_events)(prov.this_arg); - assert((unsigned long)events.data < 4096); // There's an offset, but it should still be an offset against null in the 0 page - assert(events.datalen == 0); + // Check that no events were generated by asserting if any events are passed to never_handle_event. + LDKEventHandler handler = { .handle_event = never_handle_event, .free = NULL }; + (prov.process_pending_events)(prov.this_arg, handler); ChannelManager_free(cm); KeysManager_free(keys); diff --git a/lightning-c-bindings/demo.cpp b/lightning-c-bindings/demo.cpp index 674cd7d..de1e46c 100644 --- a/lightning-c-bindings/demo.cpp +++ b/lightning-c-bindings/demo.cpp @@ -185,6 +185,15 @@ LDKCVec_MonitorEventZ monitors_pending_monitor_events(const void *this_arg) { } } +struct EventQueue { + std::vector events; +}; +void handle_event(const void *this_arg, LDKEvent event) { + EventQueue* arg = (EventQueue*) this_arg; + arg->events.push_back(std::move(event)); +} + + uintptr_t sock_send_data(void *this_arg, LDKu8slice data, bool resume_read) { return write((int)((long)this_arg), data.data, data.datalen); } @@ -419,16 +428,18 @@ int main() { LDKEventsProvider ev1 = ChannelManager_as_EventsProvider(&cm1); while (true) { - LDK::CVec_EventZ events = ev1.get_and_clear_pending_events(ev1.this_arg); - if (events->datalen == 1) { - assert(events->data[0].tag == LDKEvent_FundingGenerationReady); - assert(events->data[0].funding_generation_ready.user_channel_id == 42); - assert(events->data[0].funding_generation_ready.channel_value_satoshis == 40000); - assert(events->data[0].funding_generation_ready.output_script.datalen == 34); - assert(!memcmp(events->data[0].funding_generation_ready.output_script.data, channel_open_block + 58 + 81, 34)); + EventQueue queue; + LDKEventHandler handler = { .this_arg = &queue, .handle_event = handle_event, .free = NULL }; + ev1.process_pending_events(ev1.this_arg, handler); + if (queue.events.size() == 1) { + assert(queue.events[0]->tag == LDKEvent_FundingGenerationReady); + assert(queue.events[0]->funding_generation_ready.user_channel_id == 42); + assert(queue.events[0]->funding_generation_ready.channel_value_satoshis == 40000); + assert(queue.events[0]->funding_generation_ready.output_script.datalen == 34); + assert(!memcmp(queue.events[0]->funding_generation_ready.output_script.data, channel_open_block + 58 + 81, 34)); LDKTransaction funding_transaction { .data = const_cast(channel_open_block + 81), .datalen = sizeof(channel_open_block) - 81, .data_is_owned = false }; - LDK::CResult_NoneAPIErrorZ fund_res = ChannelManager_funding_transaction_generated(&cm1, &events->data[0].funding_generation_ready.temporary_channel_id.data, funding_transaction); + LDK::CResult_NoneAPIErrorZ fund_res = ChannelManager_funding_transaction_generated(&cm1, &queue.events[0]->funding_generation_ready.temporary_channel_id.data, funding_transaction); assert(fund_res->result_ok); break; } @@ -530,9 +541,11 @@ int main() { // Check that we received the payment! LDKEventsProvider ev2 = ChannelManager_as_EventsProvider(&cm2); while (true) { - LDK::CVec_EventZ events = ev2.get_and_clear_pending_events(ev2.this_arg); - if (events->datalen == 1) { - assert(events->data[0].tag == LDKEvent_PendingHTLCsForwardable); + EventQueue queue; + LDKEventHandler handler = { .this_arg = &queue, .handle_event = handle_event, .free = NULL }; + ev2.process_pending_events(ev2.this_arg, handler); + if (queue.events.size() == 1) { + assert(queue.events[0]->tag == LDKEvent_PendingHTLCsForwardable); break; } std::this_thread::yield(); @@ -543,13 +556,15 @@ int main() { mons_updated = 0; LDKThirtyTwoBytes payment_preimage; { - LDK::CVec_EventZ events = ev2.get_and_clear_pending_events(ev2.this_arg); - assert(events->datalen == 1); - assert(events->data[0].tag == LDKEvent_PaymentReceived); - assert(!memcmp(events->data[0].payment_received.payment_hash.data, payment_hash.data, 32)); - assert(!memcmp(events->data[0].payment_received.payment_secret.data, Invoice_payment_secret(invoice->contents.result).data, 32)); - assert(events->data[0].payment_received.amt == 5000); - memcpy(payment_preimage.data, events->data[0].payment_received.payment_preimage.data, 32); + EventQueue queue; + LDKEventHandler handler = { .this_arg = &queue, .handle_event = handle_event, .free = NULL }; + ev2.process_pending_events(ev2.this_arg, handler); + assert(queue.events.size() == 1); + assert(queue.events[0]->tag == LDKEvent_PaymentReceived); + assert(!memcmp(queue.events[0]->payment_received.payment_hash.data, payment_hash.data, 32)); + assert(!memcmp(queue.events[0]->payment_received.payment_secret.data, Invoice_payment_secret(invoice->contents.result).data, 32)); + assert(queue.events[0]->payment_received.amt == 5000); + memcpy(payment_preimage.data, queue.events[0]->payment_received.payment_preimage.data, 32); assert(ChannelManager_claim_funds(&cm2, payment_preimage)); } PeerManager_process_events(&net2); @@ -558,10 +573,12 @@ int main() { std::this_thread::yield(); } { - LDK::CVec_EventZ events = ev1.get_and_clear_pending_events(ev1.this_arg); - assert(events->datalen == 1); - assert(events->data[0].tag == LDKEvent_PaymentSent); - assert(!memcmp(events->data[0].payment_sent.payment_preimage.data, payment_preimage.data, 32)); + EventQueue queue; + LDKEventHandler handler = { .this_arg = &queue, .handle_event = handle_event, .free = NULL }; + ev1.process_pending_events(ev1.this_arg, handler); + assert(queue.events.size() == 1); + assert(queue.events[0]->tag == LDKEvent_PaymentSent); + assert(!memcmp(queue.events[0]->payment_sent.payment_preimage.data, payment_preimage.data, 32)); } conn.stop(); -- 2.39.5