X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fldk%2FPeerTest.java;h=e992e53398a6145cb3de3e64b549c5f2463f3e9e;hb=68abf1268bcc64d44bcccad734bd3d266def0f5a;hp=81903222f62fc1db5b93e29aeb88cc1dd5457e44;hpb=467650b45fcf2ac084054dfa3055cded3d4e42db;p=ldk-java diff --git a/src/test/java/org/ldk/PeerTest.java b/src/test/java/org/ldk/PeerTest.java index 81903222..e992e533 100644 --- a/src/test/java/org/ldk/PeerTest.java +++ b/src/test/java/org/ldk/PeerTest.java @@ -3,14 +3,12 @@ package org.ldk; import org.bitcoinj.core.*; import org.bitcoinj.script.Script; import org.junit.jupiter.api.Test; +import org.ldk.enums.LDKNetwork; import org.ldk.impl.bindings; -import org.ldk.enums.*; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; -import java.util.List; -import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedQueue; public class PeerTest { @@ -35,6 +33,7 @@ public class PeerTest { bindings.LDKBroadcasterInterface broad_trait; bindings.LDKLogger log_trait; bindings.LDKWatch watcher; + ArrayList results_to_free; Peer(byte seed) { this.log_trait = (String arg)-> System.out.println(seed + ": " + arg); @@ -44,6 +43,7 @@ public class PeerTest { this.broad_trait = tx -> { // We should broadcast }; + this.results_to_free = new ArrayList<>(); this.tx_broadcaster = bindings.LDKBroadcasterInterface_new(this.broad_trait); this.monitors = new HashMap<>(); this.watcher = new bindings.LDKWatch() { @@ -53,7 +53,9 @@ public class PeerTest { assert monitors.put(Arrays.toString(bindings.OutPoint_get_txid(funding_txo)), monitor) == null; } bindings.OutPoint_free(funding_txo); - return bindings.CResult_NoneChannelMonitorUpdateErrZ_ok(); + long res = bindings.CResult_NoneChannelMonitorUpdateErrZ_ok(); + results_to_free.add(res); + return res; } @Override @@ -61,65 +63,66 @@ public class PeerTest { synchronized (monitors) { 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, logger); + long update_res = bindings.ChannelMonitor_update_monitor(monitors.get(txid), update, tx_broadcaster, fee_estimator, logger); assert bindings.LDKCResult_NoneMonitorUpdateErrorZ_result_ok(update_res); bindings.CResult_NoneMonitorUpdateErrorZ_free(update_res); } bindings.OutPoint_free(funding_txo); - //bindings.ChannelMonitorUpdate_free(update); We'll need this after 681 - return bindings.CResult_NoneChannelMonitorUpdateErrZ_ok(); + bindings.ChannelMonitorUpdate_free(update); + long res = bindings.CResult_NoneChannelMonitorUpdateErrZ_ok(); + results_to_free.add(res); + return res; } @Override - public long release_pending_monitor_events() { + public long[] release_pending_monitor_events() { synchronized (monitors) { assert monitors.size() <= 1; for (Long mon : monitors.values()) { return bindings.ChannelMonitor_get_and_clear_pending_monitor_events(mon); } } - return bindings.new_empty_slice_vec(); + return new long[0]; } }; this.chain_monitor = bindings.LDKWatch_new(this.watcher); byte[] key_seed = new byte[32]; for (byte i = 0; i < 32; i++) { key_seed[i] = (byte) (i ^ seed); } - this.keys = bindings.KeysManager_new(key_seed, LDKNetwork.LDKNetwork_Bitcoin, System.currentTimeMillis() / 1000, (int)(System.currentTimeMillis() * 1000) & 0xffffffff); + this.keys = bindings.KeysManager_new(key_seed, System.currentTimeMillis() / 1000, (int)(System.currentTimeMillis() * 1000) & 0xffffffff); this.keys_interface = bindings.KeysManager_as_KeysInterface(keys); this.config = bindings.UserConfig_default(); - this.chan_manager = bindings.ChannelManager_new(LDKNetwork.LDKNetwork_Bitcoin, fee_estimator, chain_monitor, tx_broadcaster, logger, keys_interface, config, 1); + long params = bindings.ChainParameters_new(LDKNetwork.LDKNetwork_Bitcoin, bindings.BestBlock_new(new byte[32], 0)); + this.chan_manager = bindings.ChannelManager_new(fee_estimator, chain_monitor, tx_broadcaster, logger, keys_interface, config, params); this.node_id = bindings.ChannelManager_get_our_node_id(chan_manager); this.chan_manager_events = bindings.ChannelManager_as_EventsProvider(chan_manager); this.chan_handler = bindings.ChannelManager_as_ChannelMessageHandler(chan_manager); - this.router = bindings.NetGraphMsgHandler_new(0, logger); + this.router = bindings.NetGraphMsgHandler_new(new byte[32], 0, logger); this.route_handler = bindings.NetGraphMsgHandler_as_RoutingMessageHandler(router); this.message_handler = bindings.MessageHandler_new(chan_handler, route_handler); 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.LDKKeysInterface_call_get_node_secret(keys_interface), random_data, logger); + this.peer_manager = bindings.PeerManager_new(message_handler, bindings.KeysInterface_get_node_secret(keys_interface), random_data, logger); } void connect_block(Block b, Transaction t, int height) { - byte[] header = b.bitcoinSerialize(); - long txn; - if (t != null) - txn = bindings.LDKCVecTempl_C2TupleTempl_usize__Transaction_new( - new long[] {bindings.C2Tuple_usizeTransactionZ_new(1, bindings.new_txpointer_copy_data(t.bitcoinSerialize()))}); - else - txn = bindings.LDKCVecTempl_C2TupleTempl_usize__Transaction_new(new long[0]); - bindings.ChannelManager_block_connected(chan_manager, header, txn, height); + long listen = bindings.ChannelManager_as_Listen(chan_manager); + bindings.Listen_block_connected(listen, b.bitcoinSerialize(), height); + bindings.Listen_free(listen); synchronized (monitors) { for (Long mon : monitors.values()) { + long[] txn; if (t != null) - txn = bindings.LDKCVecTempl_C2TupleTempl_usize__Transaction_new( - new long[] {bindings.C2Tuple_usizeTransactionZ_new(1, bindings.new_txpointer_copy_data(t.bitcoinSerialize()))}); + txn = new long[]{bindings.C2Tuple_usizeTransactionZ_new(1, t.bitcoinSerialize())}; else - txn = bindings.LDKCVecTempl_C2TupleTempl_usize__Transaction_new(new long[0]); - long ret = bindings.ChannelMonitor_block_connected(mon, header, txn, height, tx_broadcaster, fee_estimator, logger); - bindings.CVec_C2Tuple_TxidCVec_TxOutZZZ_free(ret); + txn = new long[0]; + byte[] header = Arrays.copyOfRange(b.bitcoinSerialize(), 0, 80); + long[] ret = bindings.ChannelMonitor_block_connected(mon, header, txn, height, tx_broadcaster, fee_estimator, logger); + for (long r : ret) { + bindings.C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_free(r); + } } } } @@ -132,6 +135,7 @@ public class PeerTest { bindings.Watch_free(chain_monitor); bindings.KeysManager_free(keys); bindings.KeysInterface_free(keys_interface); + bindings.UserConfig_free(config); bindings.ChannelManager_free(chan_manager); bindings.EventsProvider_free(chan_manager_events); bindings.ChannelMessageHandler_free(chan_handler); @@ -144,24 +148,23 @@ public class PeerTest { bindings.ChannelMonitor_free(mon); } } + for (Long res : results_to_free) { + bindings.CResult_NoneChannelMonitorUpdateErrZ_free(res); + } } } class LongHolder { long val; } - byte[] do_read_event(ConcurrentLinkedQueue list, long pm, long descriptor, long data) { - byte[] arr = bindings.get_u8_slice_bytes(data); + void do_read_event(ConcurrentLinkedQueue list, long pm, long descriptor, byte[] arr) { Thread thread = new Thread(() -> { - long arr_vec = bindings.bytes_to_u8_vec(arr); - long res = bindings.PeerManager_read_event(pm, descriptor, arr_vec); + long res = bindings.PeerManager_read_event(pm, descriptor, arr); assert bindings.LDKCResult_boolPeerHandleErrorZ_result_ok(res); //assert bindings.deref_bool(bindings.LDKCResult_boolPeerHandleErrorZ_get_inner(res)); bindings.CResult_boolPeerHandleErrorZ_free(res); - bindings.CVec_u8Z_free(arr_vec); }); thread.start(); list.add(thread); - return arr; } @Test @@ -174,24 +177,26 @@ public class PeerTest { LongHolder descriptor1ref = descriptor1; bindings.LDKSocketDescriptor sock1 = new bindings.LDKSocketDescriptor() { @Override - public long send_data(long data, boolean resume_read) { - return do_read_event(list, peer1.peer_manager, descriptor1ref.val, data).length; + public long send_data(byte[] data, boolean resume_read) { + do_read_event(list, peer1.peer_manager, descriptor1ref.val, data); + return data.length; } @Override public void disconnect_socket() { assert false; } - @Override public boolean eq(long other_arg) { return bindings.LDKSocketDescriptor_get_obj_from_jcalls(other_arg).hash() == 2; } + @Override public boolean eq(long other_arg) { boolean ret = bindings.SocketDescriptor_hash(other_arg) == 2; bindings.SocketDescriptor_free(other_arg); return ret; } @Override public long hash() { return 2; } }; long descriptor2 = bindings.LDKSocketDescriptor_new(sock1); bindings.LDKSocketDescriptor sock2 = new bindings.LDKSocketDescriptor() { @Override - public long send_data(long data, boolean resume_read) { - return do_read_event(list, peer2.peer_manager, descriptor2, data).length; + public long send_data(byte[] data, boolean resume_read) { + do_read_event(list, peer2.peer_manager, descriptor2, data); + return data.length; } @Override public void disconnect_socket() { assert false; } - @Override public boolean eq(long other_arg) { return bindings.LDKSocketDescriptor_get_obj_from_jcalls(other_arg).hash() == 1; } + @Override public boolean eq(long other_arg) { boolean ret = bindings.SocketDescriptor_hash(other_arg) == 1; bindings.SocketDescriptor_free(other_arg); return ret; } @Override public long hash() { return 1; } }; descriptor1.val = bindings.LDKSocketDescriptor_new(sock2); @@ -202,7 +207,7 @@ public class PeerTest { long con_res = bindings.PeerManager_new_inbound_connection(peer2.peer_manager, descriptor2); assert(bindings.LDKCResult_NonePeerHandleErrorZ_result_ok(con_res)); bindings.CResult_NonePeerHandleErrorZ_free(con_res); - do_read_event(list, peer2.peer_manager, descriptor2, bindings.LDKCResult_CVec_u8ZPeerHandleErrorZ_get_inner(init_vec)); + do_read_event(list, peer2.peer_manager, descriptor2, bindings.LDKCResult_CVec_u8ZPeerHandleErrorZ_get_ok(init_vec)); bindings.CResult_CVec_u8ZPeerHandleErrorZ_free(init_vec); while (!list.isEmpty()) { list.poll().join(); } @@ -216,43 +221,38 @@ public class PeerTest { bindings.PeerManager_process_events(peer2.peer_manager); while (!list.isEmpty()) { list.poll().join(); } - long events = bindings.LDKEventsProvider_call_get_and_clear_pending_events(peer1.chan_manager_events); - bindings.VecOrSliceDef events_arr_info = bindings.LDKCVecTempl_Event_arr_info(events); - assert events_arr_info.datalen == 1; - bindings.LDKEvent event = bindings.LDKEvent_ref_from_ptr(events_arr_info.dataptr); + ArrayList events = new ArrayList(); + long handler = bindings.LDKEventHandler_new(events::add); + + bindings.EventsProvider_process_pending_events(peer1.chan_manager_events, handler); + assert events.size() == 1; + bindings.LDKEvent event = bindings.LDKEvent_ref_from_ptr(events.get(0)); assert event instanceof bindings.LDKEvent.FundingGenerationReady; assert ((bindings.LDKEvent.FundingGenerationReady)event).channel_value_satoshis == 10000; assert ((bindings.LDKEvent.FundingGenerationReady)event).user_channel_id == 42; - byte[] funding_spk = bindings.get_u8_slice_bytes(((bindings.LDKEvent.FundingGenerationReady)event).output_script); + byte[] funding_spk = ((bindings.LDKEvent.FundingGenerationReady)event).output_script; assert funding_spk.length == 34 && funding_spk[0] == 0 && funding_spk[1] == 32; // P2WSH byte[] chan_id = ((bindings.LDKEvent.FundingGenerationReady)event).temporary_channel_id; - bindings.CVec_EventZ_free(events); + bindings.Event_free(events.remove(0)); Transaction funding = new Transaction(NetworkParameters.fromID(NetworkParameters.ID_MAINNET)); funding.addInput(new TransactionInput(NetworkParameters.fromID(NetworkParameters.ID_MAINNET), funding, new byte[0])); funding.getInputs().get(0).setWitness(new TransactionWitness(2)); // Make sure we don't complain about lack of witness funding.getInput(0).getWitness().setPush(0, new byte[] {0x1}); funding.addOutput(Coin.SATOSHI.multiply(10000), new Script(funding_spk)); - bindings.ChannelManager_funding_transaction_generated(peer1.chan_manager, chan_id, bindings.OutPoint_new(funding.getTxId().getReversedBytes(), (short) 0)); + bindings.ChannelManager_funding_transaction_generated(peer1.chan_manager, chan_id, funding.bitcoinSerialize()); bindings.PeerManager_process_events(peer1.peer_manager); while (!list.isEmpty()) { list.poll().join(); } bindings.PeerManager_process_events(peer2.peer_manager); while (!list.isEmpty()) { list.poll().join(); } - events = bindings.LDKEventsProvider_call_get_and_clear_pending_events(peer1.chan_manager_events); - events_arr_info = bindings.LDKCVecTempl_Event_arr_info(events); - assert events_arr_info.datalen == 1; - event = bindings.LDKEvent_ref_from_ptr(events_arr_info.dataptr); - assert event instanceof bindings.LDKEvent.FundingBroadcastSafe; - bindings.CVec_EventZ_free(events); - Block b = new Block(NetworkParameters.fromID(NetworkParameters.ID_MAINNET), 2, Sha256Hash.ZERO_HASH, Sha256Hash.ZERO_HASH, 42, 0, 0, Arrays.asList(new Transaction[]{funding})); peer1.connect_block(b, funding, 1); peer2.connect_block(b, funding, 1); for (int height = 2; height < 10; height++) { - b = new Block(NetworkParameters.fromID(NetworkParameters.ID_MAINNET), 2, b.getHash(), Sha256Hash.ZERO_HASH, 42, 0, 0, Arrays.asList(new Transaction[]{funding})); + b = new Block(NetworkParameters.fromID(NetworkParameters.ID_MAINNET), 2, b.getHash(), Sha256Hash.ZERO_HASH, 42, 0, 0, Arrays.asList(new Transaction[0])); peer1.connect_block(b, null, height); peer2.connect_block(b, null, height); } @@ -261,29 +261,29 @@ public class PeerTest { bindings.PeerManager_process_events(peer2.peer_manager); while (!list.isEmpty()) { list.poll().join(); } - long peer1_chans = bindings.ChannelManager_list_channels(peer1.chan_manager); - long peer2_chans = bindings.ChannelManager_list_channels(peer2.chan_manager); - assert bindings.vec_slice_len(peer1_chans) == 1; - assert bindings.vec_slice_len(peer2_chans) == 1; - long[] peer_1_chan_info = bindings.LDKCVecTempl_ChannelDetails_arr_info(peer1_chans); - assert peer_1_chan_info.length == 1; - assert bindings.ChannelDetails_get_channel_value_satoshis(peer_1_chan_info[0]) == 10000; - assert bindings.ChannelDetails_get_is_live(peer_1_chan_info[0]); - assert Arrays.equals(bindings.ChannelDetails_get_channel_id(peer_1_chan_info[0]), funding.getTxId().getReversedBytes()); - assert Arrays.equals(bindings.ChannelDetails_get_channel_id(bindings.LDKCVecTempl_ChannelDetails_arr_info(peer2_chans)[0]), funding.getTxId().getReversedBytes()); - bindings.CVec_ChannelDetailsZ_free(peer2_chans); - - byte[] payment_preimage = new byte[32]; - for (int i = 0; i < 32; i++) payment_preimage[i] = (byte) (i ^ 0x0f); - byte[] payment_hash = Sha256Hash.hash(payment_preimage); + long[] peer1_chans = bindings.ChannelManager_list_channels(peer1.chan_manager); + long[] peer2_chans = bindings.ChannelManager_list_channels(peer2.chan_manager); + assert peer1_chans.length == 1; + assert peer2_chans.length == 1; + assert bindings.ChannelDetails_get_channel_value_satoshis(peer1_chans[0]) == 10000; + assert bindings.ChannelDetails_get_is_usable(peer1_chans[0]); + assert Arrays.equals(bindings.ChannelDetails_get_channel_id(peer1_chans[0]), funding.getTxId().getReversedBytes()); + assert Arrays.equals(bindings.ChannelDetails_get_channel_id(peer2_chans[0]), funding.getTxId().getReversedBytes()); + 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); + bindings.COption_u64Z_free(no_min_val); long netgraph = bindings.NetGraphMsgHandler_read_locked_graph(peer1.router); - long route = bindings.get_route(peer1.node_id, bindings.LockedNetworkGraph_graph(netgraph), peer2.node_id, peer1_chans, - bindings.LDKCVecTempl_RouteHint_new(new long[0]), 1000, 42, peer1.logger); - bindings.CVec_ChannelDetailsZ_free(peer1_chans); + long route = bindings.get_route(peer1.node_id, bindings.LockedNetworkGraph_graph(netgraph), peer2.node_id, 0L, peer1_chans, + new long[0], 1000, 42, peer1.logger); + for (long chan : peer1_chans) bindings.ChannelDetails_free(chan); assert bindings.LDKCResult_RouteLightningErrorZ_result_ok(route); bindings.LockedNetworkGraph_free(netgraph); - long payment_res = bindings.ChannelManager_send_payment(peer1.chan_manager, bindings.LDKCResult_RouteLightningErrorZ_get_inner(route), payment_hash, new byte[32]); + long payment_res = bindings.ChannelManager_send_payment(peer1.chan_manager, bindings.LDKCResult_RouteLightningErrorZ_get_ok(route), + bindings.LDKC2Tuple_PaymentHashPaymentSecretZ_get_a(inbound_payment), bindings.LDKC2Tuple_PaymentHashPaymentSecretZ_get_b(inbound_payment)); bindings.CResult_RouteLightningErrorZ_free(route); + bindings.C2Tuple_PaymentHashPaymentSecretZ_free(inbound_payment); assert bindings.LDKCResult_NonePaymentSendFailureZ_result_ok(payment_res); bindings.CResult_NonePaymentSendFailureZ_free(payment_res); @@ -294,34 +294,32 @@ public class PeerTest { bindings.PeerManager_process_events(peer1.peer_manager); while (!list.isEmpty()) { list.poll().join(); } - long peer2_events = bindings.LDKEventsProvider_call_get_and_clear_pending_events(peer2.chan_manager_events); - bindings.VecOrSliceDef event_arr_info = bindings.LDKCVecTempl_Event_arr_info(peer2_events); - assert event_arr_info.datalen == 1; - bindings.LDKEvent forwardable = bindings.LDKEvent_ref_from_ptr(event_arr_info.dataptr); + bindings.EventsProvider_process_pending_events(peer2.chan_manager_events, handler); + assert events.size() == 1; + bindings.LDKEvent forwardable = bindings.LDKEvent_ref_from_ptr(events.get(0)); assert forwardable instanceof bindings.LDKEvent.PendingHTLCsForwardable; - bindings.CVec_EventZ_free(peer2_events); + bindings.Event_free(events.remove(0)); bindings.ChannelManager_process_pending_htlc_forwards(peer2.chan_manager); - peer2_events = bindings.LDKEventsProvider_call_get_and_clear_pending_events(peer2.chan_manager_events); - event_arr_info = bindings.LDKCVecTempl_Event_arr_info(peer2_events); - assert event_arr_info.datalen == 1; - bindings.LDKEvent payment_recvd = bindings.LDKEvent_ref_from_ptr(event_arr_info.dataptr); + bindings.EventsProvider_process_pending_events(peer2.chan_manager_events, handler); + assert events.size() == 1; + bindings.LDKEvent payment_recvd = bindings.LDKEvent_ref_from_ptr(events.get(0)); assert payment_recvd instanceof bindings.LDKEvent.PaymentReceived; - assert bindings.ChannelManager_claim_funds(peer2.chan_manager, payment_preimage, new byte[32], ((bindings.LDKEvent.PaymentReceived)payment_recvd).amt); - bindings.CVec_EventZ_free(peer2_events); + assert bindings.ChannelManager_claim_funds(peer2.chan_manager, ((bindings.LDKEvent.PaymentReceived) payment_recvd).payment_preimage); + bindings.Event_free(events.remove(0)); bindings.PeerManager_process_events(peer2.peer_manager); while (!list.isEmpty()) { list.poll().join(); } bindings.PeerManager_process_events(peer1.peer_manager); while (!list.isEmpty()) { list.poll().join(); } - long peer1_events = bindings.LDKEventsProvider_call_get_and_clear_pending_events(peer1.chan_manager_events); - event_arr_info = bindings.LDKCVecTempl_Event_arr_info(peer1_events); - assert event_arr_info.datalen == 1; - bindings.LDKEvent sent = bindings.LDKEvent_ref_from_ptr(event_arr_info.dataptr); + bindings.EventsProvider_process_pending_events(peer1.chan_manager_events, handler); + assert events.size() == 1; + bindings.LDKEvent sent = bindings.LDKEvent_ref_from_ptr(events.get(0)); assert sent instanceof bindings.LDKEvent.PaymentSent; - assert Arrays.equals(((bindings.LDKEvent.PaymentSent)sent).payment_preimage, payment_preimage); - bindings.CVec_EventZ_free(peer1_events); + bindings.Event_free(events.remove(0)); + + bindings.EventHandler_free(handler); peer1.free(); peer2.free();