X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fldk%2FPeerTest.java;h=9b3d2f1702b97fa757ac4849550d7c487eb88348;hb=1f873e8aeb7a8395a7a99d244fba7474a0543278;hp=28b5c75e3dab42f0539ccd3fc21eaf1fe0dd7402;hpb=e30b350e325e7d517ea744578876d473839ad495;p=ldk-java diff --git a/src/test/java/org/ldk/PeerTest.java b/src/test/java/org/ldk/PeerTest.java index 28b5c75e..9b3d2f17 100644 --- a/src/test/java/org/ldk/PeerTest.java +++ b/src/test/java/org/ldk/PeerTest.java @@ -4,8 +4,10 @@ import org.bitcoinj.core.*; import org.bitcoinj.script.Script; import org.junit.jupiter.api.Test; import org.ldk.enums.Network; +import org.ldk.enums.Recipient; import org.ldk.impl.bindings; +import java.lang.ref.Reference; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -65,8 +67,8 @@ public class PeerTest { String txid = Arrays.toString(bindings.OutPoint_get_txid(funding_txo)); assert monitors.containsKey(txid); long update_res = bindings.ChannelMonitor_update_monitor(monitors.get(txid), update, tx_broadcaster, fee_estimator, logger); - assert bindings.CResult_NoneMonitorUpdateErrorZ_is_ok(update_res); - bindings.CResult_NoneMonitorUpdateErrorZ_free(update_res); + assert bindings.CResult_NoneNoneZ_is_ok(update_res); + bindings.CResult_NoneNoneZ_free(update_res); } bindings.OutPoint_free(funding_txo); bindings.ChannelMonitorUpdate_free(update); @@ -105,8 +107,12 @@ public class PeerTest { byte[] random_data = new byte[32]; for (byte i = 0; i < 32; i++) { random_data[i] = (byte) ((i ^ seed) ^ 0xf0); } - this.peer_manager = bindings.PeerManager_new(message_handler, bindings.KeysInterface_get_node_secret(keys_interface), random_data, - logger, bindings.IgnoringMessageHandler_as_CustomMessageHandler(this.custom_message_handler)); + + long node_id_result = bindings.KeysInterface_get_node_secret(keys_interface, Recipient.LDKRecipient_Node); + assert bindings.CResult_SecretKeyNoneZ_is_ok(node_id_result); + this.peer_manager = bindings.PeerManager_new(message_handler, bindings.CResult_SecretKeyNoneZ_get_ok(node_id_result), + random_data, logger, bindings.IgnoringMessageHandler_as_CustomMessageHandler(this.custom_message_handler)); + bindings.CResult_SecretKeyNoneZ_free(node_id_result); } void connect_block(Block b, Transaction t, int height) { @@ -217,7 +223,7 @@ public class PeerTest { long con_res = bindings.PeerManager_new_inbound_connection(peer2.peer_manager, descriptor2); assert(bindings.CResult_NonePeerHandleErrorZ_is_ok(con_res)); bindings.CResult_NonePeerHandleErrorZ_free(con_res); - do_read_event(list, peer2.peer_manager, descriptor2, bindings.LDKCResult_CVec_u8ZPeerHandleErrorZ_get_ok(init_vec)); + do_read_event(list, peer2.peer_manager, descriptor2, bindings.CResult_CVec_u8ZPeerHandleErrorZ_get_ok(init_vec)); bindings.CResult_CVec_u8ZPeerHandleErrorZ_free(init_vec); deliver_peer_messages(list, peer1.peer_manager, peer2.peer_manager); @@ -229,7 +235,8 @@ public class PeerTest { deliver_peer_messages(list, peer1.peer_manager, peer2.peer_manager); ArrayList events = new ArrayList(); - long handler = bindings.LDKEventHandler_new(events::add); + bindings.LDKEventHandler events_adder = events::add; + long handler = bindings.LDKEventHandler_new(events_adder); bindings.EventsProvider_process_pending_events(peer1.chan_manager_events, handler); assert events.size() == 1; @@ -274,30 +281,32 @@ public class PeerTest { for (long chan : peer2_chans) bindings.ChannelDetails_free(chan); long no_min_val = bindings.COption_u64Z_none(); - long inbound_payment = bindings.ChannelManager_create_inbound_payment(peer2.chan_manager, no_min_val, 7200, 42); + long inbound_payment = bindings.ChannelManager_create_inbound_payment(peer2.chan_manager, no_min_val, 7200); + assert bindings.CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_is_ok(inbound_payment); + long payment_tuple = bindings.CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_get_ok(inbound_payment); bindings.COption_u64Z_free(no_min_val); long scorer = bindings.Scorer_default(); long scorer_interface = bindings.Scorer_as_Score(scorer); long no_u64 = bindings.COption_u64Z_none(); long invoice_features = bindings.InvoiceFeatures_known(); - long payee = bindings.Payee_new(peer2.node_id, invoice_features, new long[0], no_u64); + long payee = bindings.PaymentParameters_new(peer2.node_id, invoice_features, new long[0], no_u64, 6*24*14); bindings.InvoiceFeatures_free(invoice_features); bindings.COption_u64Z_free(no_u64); long route_params = bindings.RouteParameters_new(payee, 1000, 42); long route = bindings.find_route(peer1.node_id, route_params, peer1.router, peer1_chans, peer1.logger, scorer_interface); bindings.RouteParameters_free(route_params); - bindings.Payee_free(payee); + bindings.PaymentParameters_free(payee); bindings.Score_free(scorer_interface); bindings.Scorer_free(scorer); for (long chan : peer1_chans) bindings.ChannelDetails_free(chan); assert bindings.CResult_RouteLightningErrorZ_is_ok(route); - long payment_res = bindings.ChannelManager_send_payment(peer1.chan_manager, bindings.LDKCResult_RouteLightningErrorZ_get_ok(route), - bindings.C2Tuple_PaymentHashPaymentSecretZ_get_a(inbound_payment), bindings.C2Tuple_PaymentHashPaymentSecretZ_get_b(inbound_payment)); + long payment_res = bindings.ChannelManager_send_payment(peer1.chan_manager, bindings.CResult_RouteLightningErrorZ_get_ok(route), + bindings.C2Tuple_PaymentHashPaymentSecretZ_get_a(payment_tuple), bindings.C2Tuple_PaymentHashPaymentSecretZ_get_b(payment_tuple)); bindings.CResult_RouteLightningErrorZ_free(route); - bindings.C2Tuple_PaymentHashPaymentSecretZ_free(inbound_payment); + bindings.CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_is_ok(inbound_payment); assert bindings.CResult_NonePaymentSendFailureZ_is_ok(payment_res); bindings.CResult_NonePaymentSendFailureZ_free(payment_res); @@ -322,10 +331,14 @@ public class PeerTest { deliver_peer_messages(list, peer1.peer_manager, peer2.peer_manager); bindings.EventsProvider_process_pending_events(peer1.chan_manager_events, handler); - assert events.size() == 1; + assert events.size() == 2; bindings.LDKEvent sent = bindings.LDKEvent_ref_from_ptr(events.get(0)); assert sent instanceof bindings.LDKEvent.PaymentSent; bindings.Event_free(events.remove(0)); + bindings.LDKEvent sent_path = bindings.LDKEvent_ref_from_ptr(events.get(0)); + assert sent_path instanceof bindings.LDKEvent.PaymentPathSuccessful; + bindings.Event_free(events.remove(0)); + Reference.reachabilityFence(events_adder); bindings.EventHandler_free(handler);