Skip to content

Commit c164016

Browse files
TheBlueMattTheBlueMatt
committed
Update C/C++ demo tests with latest 0.0.121 API changes
1 parent 7e5c510 commit c164016

File tree

2 files changed

+42
-25
lines changed

2 files changed

+42
-25
lines changed

‎lightning-c-bindings/demo.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@
44
#include <stdio.h>
55
#include <string.h>
66

7-
void print_log(const void *this_arg, const LDKRecord *record) {
8-
LDKStr mod = Record_get_module_path(record);
9-
LDKStr str = Record_get_args(record);
10-
printf("%.*s:%d - %.*s\n", (int)mod.len, mod.chars, Record_get_line(record), (int)str.len, str.chars);
7+
void print_log(const void *this_arg, const LDKRecord record) {
8+
LDKStr mod = Record_get_module_path(&record);
9+
LDKStr str = Record_get_args(&record);
10+
printf("%.*s:%d - %.*s\n", (int)mod.len, mod.chars, Record_get_line(&record), (int)str.len, str.chars);
1111
Str_free(str);
1212
Str_free(mod);
13+
Record_free(record);
1314
}
1415

1516
uint32_t get_fee(const void *this_arg, LDKConfirmationTarget target) {

‎lightning-c-bindings/demo.cpp

Lines changed: 37 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,11 @@ const uint8_t block_2[81] = {
9797
0x00, // transaction count
9898
};
9999

100-
void print_log(const void *this_arg, const LDKRecord *record) {
101-
LDK::Str mod = Record_get_module_path(record);
102-
LDK::Str str = Record_get_args(record);
103-
printf("%p - %.*s:%d - %.*s\n", this_arg, (int)mod->len, mod->chars, Record_get_line(record), (int)str->len, str->chars);
100+
void print_log(const void *this_arg, LDKRecord record_arg) {
101+
LDK::Record record(std::move(record_arg));
102+
LDK::Str mod = Record_get_module_path(&record);
103+
LDK::Str str = Record_get_args(&record);
104+
printf("%p - %.*s:%d - %.*s\n", this_arg, (int)mod->len, mod->chars, Record_get_line(&record), (int)str->len, str->chars);
104105
}
105106

106107
uint32_t get_fee(const void *this_arg, LDKConfirmationTarget target) {
@@ -132,7 +133,7 @@ struct NodeMonitors {
132133
void ConnectBlock(const uint8_t (*header)[80], uint32_t height, LDKCVec_C2Tuple_usizeTransactionZZ tx_data, LDKBroadcasterInterface broadcast, LDKFeeEstimator fee_est) {
133134
std::unique_lock<std::mutex> l(mut);
134135
for (auto& mon : mons) {
135-
LDK::CVec_TransactionOutputsZ res = ChannelMonitor_block_connected(&mon.second, header, tx_data, height, broadcast, fee_est, *logger);
136+
LDK::CVec_TransactionOutputsZ res = ChannelMonitor_block_connected(&mon.second, header, tx_data, height, broadcast, fee_est, logger);
136137
}
137138
}
138139
};
@@ -400,6 +401,12 @@ LDKCVec_u8Z custom_onion_msg_bytes(const void *this_arg) {
400401
.data = bytes, .datalen = 1024
401402
};
402403
}
404+
LDKStr custom_onion_msg_str(const void *this_arg) {
405+
return LDKStr {
406+
.chars = (const uint8_t*)"Custom Onion Message",
407+
.len = 20, .chars_is_owned = false
408+
};
409+
}
403410

404411
LDKCOption_OnionMessageContentsZ handle_custom_onion_message(const void* this_arg, struct LDKOnionMessageContents msg) {
405412
CustomOnionMsgQueue* arg = (CustomOnionMsgQueue*) this_arg;
@@ -413,6 +420,8 @@ LDKOnionMessageContents build_custom_onion_message() {
413420
.this_arg = NULL,
414421
.tlv_type = custom_onion_msg_type_id,
415422
.write = custom_onion_msg_bytes,
423+
.debug_str = custom_onion_msg_str,
424+
.cloned = NULL,
416425
.free = NULL,
417426
};
418427
}
@@ -502,7 +511,7 @@ LDKInitFeatures custom_init_features(const void *this_arg, struct LDKPublicKey t
502511
return InitFeatures_empty();
503512
}
504513

505-
uint64_t get_chan_score(const void *this_arg, uint64_t scid, const LDKNodeId *src, const LDKNodeId *dst, LDKChannelUsage usage_in, const LDKProbabilisticScoringFeeParameters *params) {
514+
uint64_t get_chan_score(const void *this_arg, const LDKCandidateRouteHop *hop, LDKChannelUsage usage_in, const LDKProbabilisticScoringFeeParameters *params) {
506515
LDK::ChannelUsage usage(std::move(usage_in));
507516
return 42;
508517
}
@@ -602,7 +611,7 @@ int main() {
602611
LDK::IgnoringMessageHandler ignoring_handler1 = IgnoringMessageHandler_new();
603612
LDK::CustomMessageHandler custom_msg_handler1 = IgnoringMessageHandler_as_CustomMessageHandler(&ignoring_handler1);
604613
LDK::CustomOnionMessageHandler custom_onion_msg_handler1 = IgnoringMessageHandler_as_CustomOnionMessageHandler(&ignoring_handler1);
605-
LDK::DefaultMessageRouter mr1 = DefaultMessageRouter_new();
614+
LDK::DefaultMessageRouter mr1 = DefaultMessageRouter_new(&net_graph1, KeysManager_as_EntropySource(&keys1));
606615
LDK::OnionMessenger om1 = OnionMessenger_new(KeysManager_as_EntropySource(&keys1), KeysManager_as_NodeSigner(&keys1), logger1, DefaultMessageRouter_as_MessageRouter(&mr1), IgnoringMessageHandler_as_OffersMessageHandler(&ignoring_handler1), std::move(custom_onion_msg_handler1));
607616

608617
LDK::CVec_ChannelDetailsZ channels = ChannelManager_list_channels(&cm1);
@@ -638,7 +647,7 @@ int main() {
638647
LDK::IgnoringMessageHandler ignoring_handler2 = IgnoringMessageHandler_new();
639648
LDK::CustomMessageHandler custom_msg_handler2 = IgnoringMessageHandler_as_CustomMessageHandler(&ignoring_handler2);
640649
LDK::CustomOnionMessageHandler custom_onion_msg_handler2 = IgnoringMessageHandler_as_CustomOnionMessageHandler(&ignoring_handler2);
641-
LDK::DefaultMessageRouter mr2 = DefaultMessageRouter_new();
650+
LDK::DefaultMessageRouter mr2 = DefaultMessageRouter_new(&net_graph2, KeysManager_as_EntropySource(&keys2));
642651
LDK::OnionMessenger om2 = OnionMessenger_new(KeysManager_as_EntropySource(&keys2), KeysManager_as_NodeSigner(&keys2), logger2, DefaultMessageRouter_as_MessageRouter(&mr2), IgnoringMessageHandler_as_OffersMessageHandler(&ignoring_handler2), std::move(custom_onion_msg_handler2));
643652

644653
LDK::CVec_ChannelDetailsZ channels2 = ChannelManager_list_channels(&cm2);
@@ -659,7 +668,7 @@ int main() {
659668
PeersConnection conn(cm1, cm2, net1, net2);
660669

661670
// Note that we have to bind the result to a C++ class to make sure it gets free'd
662-
LDK::CResult_ThirtyTwoBytesAPIErrorZ res = ChannelManager_create_channel(&cm1, ChannelManager_get_our_node_id(&cm2), 40000, 1000, U128_new(user_id_1), UserConfig_default());
671+
LDK::CResult_ThirtyTwoBytesAPIErrorZ res = ChannelManager_create_channel(&cm1, ChannelManager_get_our_node_id(&cm2), 40000, 1000, U128_new(user_id_1), COption_ThirtyTwoBytesZ_none(), UserConfig_default());
663672
assert(res->result_ok);
664673
PeerManager_process_events(&net1);
665674

@@ -862,7 +871,7 @@ int main() {
862871
}, Bolt11Invoice_min_final_cltv_expiry_delta(invoice->contents.result));
863872
LDK::RouteParameters route_params = RouteParameters_from_payment_params_and_value(
864873
PaymentParameters_new(std::move(payee), COption_u64Z_none(), 0xffffffff, 1, 2,
865-
LDKCVec_u64Z { .data = NULL, .datalen = 0 }),
874+
LDKCVec_u64Z { .data = NULL, .datalen = 0 }, LDKCVec_u64Z { .data = NULL, .datalen = 0 }),
866875
5000);
867876
random_bytes = entropy_source1.get_secure_random_bytes();
868877
LDK::ProbabilisticScoringFeeParameters params = ProbabilisticScoringFeeParameters_default();
@@ -978,7 +987,7 @@ int main() {
978987
LDK::MultiThreadedLockableScore scorer_mtx1 = MultiThreadedLockableScore_new(std::move(scorer_trait1));
979988
LDK::LockableScore scorer_mtx_trait1 = MultiThreadedLockableScore_as_LockableScore(&scorer_mtx1);
980989
LDK::ProbabilisticScoringFeeParameters params = ProbabilisticScoringFeeParameters_default();
981-
const LDK::DefaultRouter default_router_1 = DefaultRouter_new(&net_graph1, logger1, entropy_source1.get_secure_random_bytes(), std::move(scorer_mtx_trait1), std::move(params));
990+
const LDK::DefaultRouter default_router_1 = DefaultRouter_new(&net_graph1, logger1, KeysManager_as_EntropySource(&keys1), std::move(scorer_mtx_trait1), std::move(params));
982991
LDKRouter router1 = {
983992
.this_arg = (void*)&default_router_1,
984993
.find_route = NULL, // LDK currently doesn't use this, its just a default-impl
@@ -999,7 +1008,7 @@ int main() {
9991008
.release_pending_custom_messages = release_no_messages,
10001009
.free = NULL,
10011010
};
1002-
LDK::DefaultMessageRouter mr1 = DefaultMessageRouter_new();
1011+
LDK::DefaultMessageRouter mr1 = DefaultMessageRouter_new(&net_graph1, KeysManager_as_EntropySource(&keys1));
10031012
LDK::IgnoringMessageHandler ignorer_1 = IgnoringMessageHandler_new();
10041013
LDK::OnionMessenger om1 = OnionMessenger_new(KeysManager_as_EntropySource(&keys1), KeysManager_as_NodeSigner(&keys1), logger1, DefaultMessageRouter_as_MessageRouter(&mr1), IgnoringMessageHandler_as_OffersMessageHandler(&ignorer_1), std::move(custom_onion_msg_handler1));
10051014

@@ -1027,7 +1036,7 @@ int main() {
10271036
.release_pending_custom_messages = release_no_messages,
10281037
.free = NULL,
10291038
};
1030-
LDK::DefaultMessageRouter mr2 = DefaultMessageRouter_new();
1039+
LDK::DefaultMessageRouter mr2 = DefaultMessageRouter_new(&net_graph2, KeysManager_as_EntropySource(&keys2));
10311040
LDK::IgnoringMessageHandler ignorer_2 = IgnoringMessageHandler_new();
10321041
LDK::OnionMessenger om2 = OnionMessenger_new(KeysManager_as_EntropySource(&keys2), KeysManager_as_NodeSigner(&keys2), logger2, DefaultMessageRouter_as_MessageRouter(&mr2), IgnoringMessageHandler_as_OffersMessageHandler(&ignorer_2), custom_onion_msg_handler2);
10331042

@@ -1098,7 +1107,16 @@ int main() {
10981107
}, 3600, COption_u16Z_none());
10991108
assert(invoice_res2->result_ok);
11001109
const LDKBolt11Invoice *invoice2 = invoice_res2->contents.result;
1101-
LDK::CResult_ThirtyTwoBytesPaymentErrorZ invoice_pay_res = pay_invoice(invoice2, Retry_attempts(0), &cm1);
1110+
LDK::CResult_C3Tuple_ThirtyTwoBytesRecipientOnionFieldsRouteParametersZNoneZ pay_params =
1111+
payment_parameters_from_invoice(invoice2);
1112+
LDK::RecipientOnionFields invoice2_recipient(std::move(pay_params->contents.result->b));
1113+
LDK::RouteParameters invoice2_params(std::move(pay_params->contents.result->c));
1114+
assert(pay_params->result_ok);
1115+
LDKThirtyTwoBytes payment_id { .data = 0 };
1116+
LDK::CResult_NoneRetryableSendFailureZ invoice_pay_res = ChannelManager_send_payment(
1117+
&cm1, std::move(pay_params->contents.result->a), std::move(invoice2_recipient),
1118+
std::move(payment_id), std::move(invoice2_params), Retry_attempts(0)
1119+
);
11021120
assert(invoice_pay_res->result_ok);
11031121
PeerManager_process_events(&net1);
11041122

@@ -1180,14 +1198,12 @@ int main() {
11801198
LDK::CVec_ChannelDetailsZ chans_after_close2 = ChannelManager_list_channels(&cm2);
11811199
assert(chans_after_close2->datalen == 0);
11821200

1183-
assert(OnionMessenger_send_onion_message(&om1,
1184-
OnionMessagePath_new(
1185-
LDKCVec_PublicKeyZ { .data = NULL, .datalen = 0, },
1186-
Destination_node(ChannelManager_get_our_node_id(&cm2))
1187-
),
1201+
LDK::CResult_SendSuccessSendErrorZ om_send_res =
1202+
OnionMessenger_send_onion_message(&om1,
11881203
build_custom_onion_message(),
1189-
LDKBlindedPath { .inner = NULL, .is_owned = true })
1190-
.result_ok);
1204+
Destination_node(ChannelManager_get_our_node_id(&cm2)),
1205+
LDKBlindedPath { .inner = NULL, .is_owned = true });
1206+
assert(om_send_res->result_ok);
11911207
PeerManager_process_events(&net1);
11921208
std::cout << __FILE__ << ":" << __LINE__ << " - " << "Awaiting onion message..." << std::endl;
11931209
while (true) {

0 commit comments

Comments
 (0)