X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fldk%2FHumanObjectPeerTest.java;h=c66b4dd84d3e82d61b2c7c8091637f5ca902d09e;hb=18faab2952bff2302d55528dea556246be63950a;hp=18e36c891a4145d46db7e03861eb31d3b0a58a66;hpb=371e82300e5de678404f0addc47a20636077df5d;p=ldk-java diff --git a/src/test/java/org/ldk/HumanObjectPeerTest.java b/src/test/java/org/ldk/HumanObjectPeerTest.java index 18e36c89..c66b4dd8 100644 --- a/src/test/java/org/ldk/HumanObjectPeerTest.java +++ b/src/test/java/org/ldk/HumanObjectPeerTest.java @@ -7,67 +7,62 @@ import org.junit.jupiter.api.Test; import org.ldk.enums.LDKNetwork; import org.ldk.impl.bindings; import org.ldk.structs.*; +import org.ldk.util.TwoTuple; import java.lang.ref.WeakReference; import java.util.Arrays; import java.util.HashMap; +import java.util.LinkedList; import java.util.concurrent.ConcurrentLinkedQueue; -public class HumanObjectPeerTest { +class HumanObjectPeerTestInstance { class Peer { - final long logger; - final long fee_estimator; - final long tx_broadcaster; - final KeysManager keys; + final Logger logger; + final FeeEstimator fee_estimator; + final BroadcasterInterface tx_broadcaster; final KeysInterface keys_interface; final ChannelManager chan_manager; final EventsProvider chan_manager_events; final NetGraphMsgHandler router; final PeerManager peer_manager; - HashMap monitors; // Wow I forgot just how terrible Java is - we can't put a byte array here. + final HashMap monitors; // Wow I forgot just how terrible Java is - we can't put a byte array here. byte[] node_id; + final LinkedList broadcast_set = new LinkedList<>(); Peer(byte seed) { - bindings.LDKLogger log_trait = (String arg) -> System.out.println(seed + ": " + arg); - logger = bindings.LDKLogger_new(log_trait); - this.fee_estimator = bindings.LDKFeeEstimator_new(confirmation_target -> 0); - this.tx_broadcaster = bindings.LDKBroadcasterInterface_new(tx -> { - // We should broadcast + logger = Logger.new_impl((String arg) -> System.out.println(seed + ": " + arg)); + fee_estimator = FeeEstimator.new_impl((confirmation_target -> 253)); + tx_broadcaster = BroadcasterInterface.new_impl(tx -> { + broadcast_set.add(tx); }); this.monitors = new HashMap<>(); - Watch chain_monitor = new Watch(new bindings.LDKWatch() { - @Override - public long watch_channel(long funding_txo, long monitor) { + Watch chain_monitor = Watch.new_impl(new Watch.WatchInterface() { + public Result_NoneChannelMonitorUpdateErrZ watch_channel(OutPoint funding_txo, ChannelMonitor monitor) { synchronized (monitors) { - assert monitors.put(Arrays.toString(bindings.OutPoint_get_txid(funding_txo)), monitor) == null; + assert monitors.put(Arrays.toString(funding_txo.get_txid()), monitor) == null; } - bindings.OutPoint_free(funding_txo); - return bindings.CResult_NoneChannelMonitorUpdateErrZ_ok(); + return new Result_NoneChannelMonitorUpdateErrZ.Result_NoneChannelMonitorUpdateErrZ_OK(); } - @Override - public long update_channel(long funding_txo, long update) { + public Result_NoneChannelMonitorUpdateErrZ update_channel(OutPoint funding_txo, ChannelMonitorUpdate update) { synchronized (monitors) { - String txid = Arrays.toString(bindings.OutPoint_get_txid(funding_txo)); + String txid = Arrays.toString(funding_txo.get_txid()); assert monitors.containsKey(txid); - long update_res = bindings.ChannelMonitor_update_monitor(monitors.get(txid), update, tx_broadcaster, logger); - assert bindings.LDKCResult_NoneMonitorUpdateErrorZ_result_ok(update_res); - bindings.CResult_NoneMonitorUpdateErrorZ_free(update_res); + Result_NoneMonitorUpdateErrorZ update_res = monitors.get(txid).update_monitor(update, tx_broadcaster, logger); + assert update_res instanceof Result_NoneMonitorUpdateErrorZ.Result_NoneMonitorUpdateErrorZ_OK; } - bindings.OutPoint_free(funding_txo); - bindings.ChannelMonitorUpdate_free(update); - return bindings.CResult_NoneChannelMonitorUpdateErrZ_ok(); + return new Result_NoneChannelMonitorUpdateErrZ.Result_NoneChannelMonitorUpdateErrZ_OK(); } @Override - public long[] release_pending_monitor_events() { + public MonitorEvent[] 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); + for (ChannelMonitor mon : monitors.values()) { + return mon.get_and_clear_pending_monitor_events(); } } - return new long[0]; + return new MonitorEvent[0]; } }); @@ -75,60 +70,51 @@ public class HumanObjectPeerTest { for (byte i = 0; i < 32; i++) { key_seed[i] = (byte) (i ^ seed); } - this.keys = KeysManager.constructor_new(key_seed, LDKNetwork.LDKNetwork_Bitcoin, System.currentTimeMillis() / 1000, (int) (System.currentTimeMillis() * 1000) & 0xffffffff); + KeysManager keys = KeysManager.constructor_new(key_seed, LDKNetwork.LDKNetwork_Bitcoin, System.currentTimeMillis() / 1000, (int) (System.currentTimeMillis() * 1000) & 0xffffffff); this.keys_interface = keys.as_KeysInterface(); - this.chan_manager = ChannelManager.constructor_new(LDKNetwork.LDKNetwork_Bitcoin, new FeeEstimator(confirmation_target -> 0), chain_monitor, - new BroadcasterInterface(tx -> { - }), new Logger(log_trait), keys.as_KeysInterface(), UserConfig.constructor_default(), 1); + this.chan_manager = ChannelManager.constructor_new(LDKNetwork.LDKNetwork_Bitcoin, FeeEstimator.new_impl(confirmation_target -> 0), chain_monitor, tx_broadcaster, logger, this.keys_interface, UserConfig.constructor_default(), 1); this.node_id = chan_manager.get_our_node_id(); this.chan_manager_events = chan_manager.as_EventsProvider(); - this.router = NetGraphMsgHandler.constructor_new(null, new Logger(log_trait)); + this.router = NetGraphMsgHandler.constructor_new(null, logger); byte[] random_data = new byte[32]; for (byte i = 0; i < 32; i++) { random_data[i] = (byte) ((i ^ seed) ^ 0xf0); } - this.peer_manager = PeerManager.constructor_new(chan_manager.as_ChannelMessageHandler(), router.as_RoutingMessageHandler(), keys_interface.get_node_secret(), random_data, new Logger(log_trait)); + this.peer_manager = PeerManager.constructor_new(chan_manager.as_ChannelMessageHandler(), router.as_RoutingMessageHandler(), keys_interface.get_node_secret(), random_data, logger); System.gc(); } - void connect_block(Block b, Transaction t, int height) { + TwoTuple[] connect_block(Block b, int height) { byte[] header = Arrays.copyOfRange(b.bitcoinSerialize(), 0, 80); - long[] txn; - if (t != null) - txn = new long[]{bindings.C2Tuple_usizeTransactionZ_new(1, bindings.new_txpointer_copy_data(t.bitcoinSerialize()))}; - else - txn = new long[0]; - bindings.ChannelManager_block_connected(chan_manager._test_only_get_ptr(), header, txn, height); + TwoTuple[] txn; + if (b.hasTransactions()) { + assert b.getTransactions().size() == 1; + TwoTuple txp = new TwoTuple<>((long) 1, b.getTransactions().get(0).bitcoinSerialize()); + txn = new TwoTuple[]{txp}; + } else + txn = new TwoTuple[0]; + chan_manager.block_connected(header, txn, height); synchronized (monitors) { - for (Long mon : monitors.values()) { - if (t != null) - txn = new long[]{bindings.C2Tuple_usizeTransactionZ_new(1, bindings.new_txpointer_copy_data(t.bitcoinSerialize()))}; - else - txn = new long[0]; - long[] ret = bindings.ChannelMonitor_block_connected(mon, header, txn, height, tx_broadcaster, fee_estimator, logger); - for (long r : ret) bindings.C2Tuple_TxidCVec_TxOutZZ_free(r); + assert monitors.size() == 1; + for (ChannelMonitor mon : monitors.values()) { + return mon.block_connected(header, txn, height, tx_broadcaster, fee_estimator, logger); } } + return null; } - void free() { - // Note that we can't rely on finalizer order, so don't bother trying to rely on it here - bindings.Logger_free(logger); - bindings.FeeEstimator_free(fee_estimator); - bindings.BroadcasterInterface_free(tx_broadcaster); - synchronized (monitors) { - for (Long mon : monitors.values()) { - bindings.ChannelMonitor_free(mon); - } - } - } - - long get_route(byte[] dest_node, ChannelDetails[] our_chans) { + Route get_route(byte[] dest_node, ChannelDetails[] our_chans) { try (LockedNetworkGraph netgraph = this.router.read_locked_graph()) { NetworkGraph graph = netgraph.graph(); - return bindings.get_route(this.node_id, graph._test_only_get_ptr(), dest_node, new long[] {our_chans[0]._test_only_get_ptr()}, - new long[0], 1000, 42, this.logger); + long res = bindings.get_route(this.node_id, graph._test_only_get_ptr(), dest_node, new long[]{our_chans[0]._test_only_get_ptr()}, + new long[0], 1000, 42, this.logger._test_only_get_ptr()); + assert bindings.LDKCResult_RouteLightningErrorZ_result_ok(res); + byte[] serialized_route = bindings.Route_write(bindings.LDKCResult_RouteLightningErrorZ_get_ok(res)); + must_free_objs.add(new WeakReference<>(serialized_route)); + Route copy = Route.constructor_read(serialized_route); + bindings.CResult_RouteLightningErrorZ_free(res); + return copy; } } } @@ -136,6 +122,7 @@ public class HumanObjectPeerTest { class LongHolder { long val; } java.util.LinkedList> must_free_objs = new java.util.LinkedList(); + void do_read_event(ConcurrentLinkedQueue list, PeerManager pm, long descriptor, byte[] data) { Thread thread = new Thread(() -> { long res = bindings.PeerManager_read_event(pm._test_only_get_ptr(), descriptor, data); @@ -149,6 +136,7 @@ public class HumanObjectPeerTest { } boolean gc_ran = false; + class GcCheck { @Override protected void finalize() throws Throwable { @@ -156,7 +144,8 @@ public class HumanObjectPeerTest { super.finalize(); } } - void do_test_message_handler() throws InterruptedException { + + void do_test_message_handler(boolean nice_close) throws InterruptedException { GcCheck obj = new GcCheck(); Peer peer1 = new Peer((byte) 1); Peer peer2 = new Peer((byte) 2); @@ -201,9 +190,8 @@ public class HumanObjectPeerTest { while (!list.isEmpty()) { list.poll().join(); } - long cc_res = bindings.ChannelManager_create_channel(peer1.chan_manager._test_only_get_ptr(), peer2.node_id, 10000, 1000, 42, 0); - assert bindings.LDKCResult_NoneAPIErrorZ_result_ok(cc_res); - bindings.CResult_NoneAPIErrorZ_free(cc_res); + Result_NoneAPIErrorZ cc_res = peer1.chan_manager.create_channel(peer2.node_id, 10000, 1000, 42, null); + assert cc_res instanceof Result_NoneAPIErrorZ.Result_NoneAPIErrorZ_OK; peer1.peer_manager.process_events(); while (!list.isEmpty()) { list.poll().join(); } @@ -213,14 +201,16 @@ public class HumanObjectPeerTest { Event[] events = peer1.chan_manager_events.get_and_clear_pending_events(); assert events.length == 1; assert events[0] instanceof Event.FundingGenerationReady; - assert ((Event.FundingGenerationReady)events[0]).channel_value_satoshis == 10000; - assert ((Event.FundingGenerationReady)events[0]).user_channel_id == 42; - byte[] funding_spk = ((Event.FundingGenerationReady)events[0]).output_script; + assert ((Event.FundingGenerationReady) events[0]).channel_value_satoshis == 10000; + assert ((Event.FundingGenerationReady) events[0]).user_channel_id == 42; + byte[] funding_spk = ((Event.FundingGenerationReady) events[0]).output_script; assert funding_spk.length == 34 && funding_spk[0] == 0 && funding_spk[1] == 32; // P2WSH - byte[] chan_id = ((Event.FundingGenerationReady)events[0]).temporary_channel_id; + byte[] chan_id = ((Event.FundingGenerationReady) events[0]).temporary_channel_id; + + NetworkParameters bitcoinj_net = NetworkParameters.fromID(NetworkParameters.ID_MAINNET); - Transaction funding = new Transaction(NetworkParameters.fromID(NetworkParameters.ID_MAINNET)); - funding.addInput(new TransactionInput(NetworkParameters.fromID(NetworkParameters.ID_MAINNET), funding, new byte[0])); + Transaction funding = new Transaction(bitcoinj_net); + funding.addInput(new TransactionInput(bitcoinj_net, 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)); @@ -234,16 +224,16 @@ public class HumanObjectPeerTest { events = peer1.chan_manager_events.get_and_clear_pending_events(); assert events.length == 1; assert events[0] instanceof Event.FundingBroadcastSafe; - assert ((Event.FundingBroadcastSafe)events[0]).user_channel_id == 42; + assert ((Event.FundingBroadcastSafe) events[0]).user_channel_id == 42; - 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); + Block b = new Block(bitcoinj_net, 2, Sha256Hash.ZERO_HASH, Sha256Hash.ZERO_HASH, 42, 0, 0, Arrays.asList(new Transaction[]{funding})); + assert peer1.connect_block(b, 1).length == 0; + assert peer2.connect_block(b, 1).length == 0; 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})); - peer1.connect_block(b, null, height); - peer2.connect_block(b, null, height); + b = new Block(bitcoinj_net, 2, b.getHash(), Sha256Hash.ZERO_HASH, 42, 0, 0, Arrays.asList(new Transaction[0])); + assert peer1.connect_block(b, height).length == 0; + assert peer2.connect_block(b, height).length == 0; } peer1.peer_manager.process_events(); @@ -263,12 +253,9 @@ public class HumanObjectPeerTest { 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 route = peer1.get_route(peer2.node_id, peer1_chans); - assert bindings.LDKCResult_RouteLightningErrorZ_result_ok(route); - long payment_res = bindings.ChannelManager_send_payment(peer1.chan_manager._test_only_get_ptr(), bindings.LDKCResult_RouteLightningErrorZ_get_ok(route), payment_hash, new byte[32]); - bindings.CResult_RouteLightningErrorZ_free(route); - assert bindings.LDKCResult_NonePaymentSendFailureZ_result_ok(payment_res); - bindings.CResult_NonePaymentSendFailureZ_free(payment_res); + Route route = peer1.get_route(peer2.node_id, peer1_chans); + Result_NonePaymentSendFailureZ payment_res = peer1.chan_manager.send_payment(route, payment_hash, new byte[32]); + assert payment_res instanceof Result_NonePaymentSendFailureZ.Result_NonePaymentSendFailureZ_OK; peer1.peer_manager.process_events(); while (!list.isEmpty()) { list.poll().join(); } @@ -277,46 +264,93 @@ public class HumanObjectPeerTest { peer1.peer_manager.process_events(); while (!list.isEmpty()) { list.poll().join(); } - long[] peer2_events = bindings.EventsProvider_get_and_clear_pending_events(peer2.chan_manager_events._test_only_get_ptr()); - assert peer2_events.length == 1; - bindings.LDKEvent forwardable = bindings.LDKEvent_ref_from_ptr(peer2_events[0]); - assert forwardable instanceof bindings.LDKEvent.PendingHTLCsForwardable; - bindings.CVec_EventZ_free(peer2_events); - bindings.ChannelManager_process_pending_htlc_forwards(peer2.chan_manager._test_only_get_ptr()); + events = peer2.chan_manager_events.get_and_clear_pending_events(); + assert events.length == 1; + assert events[0] instanceof Event.PendingHTLCsForwardable; + peer2.chan_manager.process_pending_htlc_forwards(); - peer2_events = bindings.EventsProvider_get_and_clear_pending_events(peer2.chan_manager_events._test_only_get_ptr()); - assert peer2_events.length == 1; - bindings.LDKEvent payment_recvd = bindings.LDKEvent_ref_from_ptr(peer2_events[0]); - assert payment_recvd instanceof bindings.LDKEvent.PaymentReceived; - peer2.chan_manager.claim_funds(payment_preimage, new byte[32], ((bindings.LDKEvent.PaymentReceived) payment_recvd).amt); - bindings.CVec_EventZ_free(peer2_events); + events = peer2.chan_manager_events.get_and_clear_pending_events(); + assert events.length == 1; + assert events[0] instanceof Event.PaymentReceived; + peer2.chan_manager.claim_funds(payment_preimage, new byte[32], ((Event.PaymentReceived) events[0]).amt); peer2.peer_manager.process_events(); while (!list.isEmpty()) { list.poll().join(); } peer1.peer_manager.process_events(); while (!list.isEmpty()) { list.poll().join(); } + peer2.peer_manager.process_events(); + while (!list.isEmpty()) { list.poll().join(); } - long[] peer1_events = bindings.EventsProvider_get_and_clear_pending_events(peer1.chan_manager_events._test_only_get_ptr()); - assert peer1_events.length == 1; - bindings.LDKEvent sent = bindings.LDKEvent_ref_from_ptr(peer1_events[0]); - assert sent instanceof bindings.LDKEvent.PaymentSent; - assert Arrays.equals(((bindings.LDKEvent.PaymentSent) sent).payment_preimage, payment_preimage); - bindings.CVec_EventZ_free(peer1_events); + events = peer1.chan_manager_events.get_and_clear_pending_events(); + assert events.length == 1; + assert events[0] instanceof Event.PaymentSent; + assert Arrays.equals(((Event.PaymentSent) events[0]).payment_preimage, payment_preimage); + + if (nice_close) { + Result_NoneAPIErrorZ close_res = peer1.chan_manager.close_channel(peer1_chans[0].get_channel_id()); + assert close_res instanceof Result_NoneAPIErrorZ.Result_NoneAPIErrorZ_OK; + + peer1.peer_manager.process_events(); + while (!list.isEmpty()) { list.poll().join(); } + peer2.peer_manager.process_events(); + while (!list.isEmpty()) { list.poll().join(); } + peer1.peer_manager.process_events(); + while (!list.isEmpty()) { list.poll().join(); } + peer2.peer_manager.process_events(); + while (!list.isEmpty()) { list.poll().join(); } + + assert peer1.broadcast_set.size() == 1; + assert peer2.broadcast_set.size() == 1; + } else { + peer1.chan_manager.force_close_all_channels(); + + peer1.peer_manager.process_events(); + while (!list.isEmpty()) { list.poll().join(); } + peer2.peer_manager.process_events(); + while (!list.isEmpty()) { list.poll().join(); } + peer1.peer_manager.process_events(); + while (!list.isEmpty()) { list.poll().join(); } + peer2.peer_manager.process_events(); + while (!list.isEmpty()) { list.poll().join(); } + + assert peer1.broadcast_set.size() == 1; + assert peer2.broadcast_set.size() == 0; + + Transaction tx = new Transaction(bitcoinj_net, peer1.broadcast_set.getFirst()); + b = new Block(bitcoinj_net, 2, b.getHash(), Sha256Hash.ZERO_HASH, 42, 0, 0, + Arrays.asList(new Transaction[]{tx})); + TwoTuple[] watch_outputs = peer2.connect_block(b, 1); + assert watch_outputs.length == 1; + assert Arrays.equals(watch_outputs[0].a, tx.getTxId().getReversedBytes()); + assert watch_outputs[0].b.length == 1; + } - peer1.free(); - peer2.free(); bindings.SocketDescriptor_free(descriptor2); bindings.SocketDescriptor_free(descriptor1.val); } +} +public class HumanObjectPeerTest { + @Test + public void test_message_handler_force_close() throws InterruptedException { + HumanObjectPeerTestInstance instance = new HumanObjectPeerTestInstance(); + instance.do_test_message_handler(false); + while (!instance.gc_ran) { + System.gc(); + System.runFinalization(); + } + for (WeakReference o : instance.must_free_objs) + assert o.get() == null; + } @Test - public void test_message_handler() throws InterruptedException { - do_test_message_handler(); - while (!gc_ran) { + public void test_message_handler_nice_close() throws InterruptedException { + HumanObjectPeerTestInstance instance = new HumanObjectPeerTestInstance(); + instance.do_test_message_handler(true); + while (!instance.gc_ran) { System.gc(); System.runFinalization(); } - for (WeakReference o : must_free_objs) + for (WeakReference o : instance.must_free_objs) assert o.get() == null; } -} \ No newline at end of file +}