X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fldk%2FHumanObjectPeerTest.java;h=3d9c553d15368200fdcca06786cbb827a18aa31e;hb=196f002e1d9016295c51b37b16986068ecf8db3e;hp=26f20d34b5e70b8d088c2ebe8574061d0d847fac;hpb=ac4869b989e27b4500e00e901ea5851604315345;p=ldk-java diff --git a/src/test/java/org/ldk/HumanObjectPeerTest.java b/src/test/java/org/ldk/HumanObjectPeerTest.java index 26f20d34..3d9c553d 100644 --- a/src/test/java/org/ldk/HumanObjectPeerTest.java +++ b/src/test/java/org/ldk/HumanObjectPeerTest.java @@ -107,26 +107,8 @@ class HumanObjectPeerTestInstance { }); } - 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; - 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, boolean use_km_wrapper) { - 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 = Watch.new_impl(new Watch.WatchInterface() { + Watch get_manual_watch() { + return Watch.new_impl(new Watch.WatchInterface() { public Result_NoneChannelMonitorUpdateErrZ watch_channel(OutPoint funding_txo, ChannelMonitor monitor) { synchronized (monitors) { assert monitors.put(Arrays.toString(funding_txo.get_txid()), monitor) == null; @@ -155,6 +137,36 @@ class HumanObjectPeerTestInstance { return new MonitorEvent[0]; } }); + } + + final Logger logger; + final FeeEstimator fee_estimator; + final BroadcasterInterface tx_broadcaster; + final KeysInterface keys_interface; + final ChainMonitor chain_monitor; + final ChannelManager chan_manager; + final EventsProvider chan_manager_events; + final NetGraphMsgHandler router; + final PeerManager peer_manager; + 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, boolean use_km_wrapper, boolean use_manual_watch) { + 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_watch; + if (use_manual_watch) { + chain_watch = get_manual_watch(); + chain_monitor = null; + } else { + chain_monitor = ChainMonitor.constructor_new(null, tx_broadcaster, logger, fee_estimator); + chain_watch = chain_monitor.as_Watch(); + } byte[] key_seed = new byte[32]; for (byte i = 0; i < 32; i++) { @@ -167,7 +179,7 @@ class HumanObjectPeerTestInstance { 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, FeeEstimator.new_impl(confirmation_target -> 0), chain_monitor, tx_broadcaster, logger, this.keys_interface, UserConfig.constructor_default(), 1); + this.chan_manager = ChannelManager.constructor_new(LDKNetwork.LDKNetwork_Bitcoin, FeeEstimator.new_impl(confirmation_target -> 0), chain_watch, 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, logger); @@ -180,7 +192,7 @@ class HumanObjectPeerTestInstance { System.gc(); } - TwoTuple[] connect_block(Block b, int height) { + TwoTuple[] connect_block(Block b, int height, long expected_monitor_update_len) { byte[] header = Arrays.copyOfRange(b.bitcoinSerialize(), 0, 80); TwoTuple[] txn; if (b.hasTransactions()) { @@ -190,10 +202,16 @@ class HumanObjectPeerTestInstance { } else txn = new TwoTuple[0]; chan_manager.block_connected(header, txn, height); - synchronized (monitors) { - assert monitors.size() == 1; - for (ChannelMonitor mon : monitors.values()) { - return mon.block_connected(header, txn, height, tx_broadcaster, fee_estimator, logger); + if (chain_monitor != null) { + chain_monitor.block_connected(header, txn, height); + } else { + synchronized (monitors) { + assert monitors.size() == 1; + for (ChannelMonitor mon : monitors.values()) { + TwoTuple[] ret = mon.block_connected(header, txn, height, tx_broadcaster, fee_estimator, logger); + assert ret.length == expected_monitor_update_len; + return ret; + } } } return null; @@ -214,41 +232,28 @@ class HumanObjectPeerTestInstance { } } - class LongHolder { long val; } + class DescriptorHolder { SocketDescriptor val; } - java.util.LinkedList> must_free_objs = new java.util.LinkedList(); - - void do_read_event(ConcurrentLinkedQueue list, PeerManager pm, long descriptor, byte[] data) { + void do_read_event(ConcurrentLinkedQueue list, PeerManager pm, SocketDescriptor descriptor, byte[] data) { Thread thread = new Thread(() -> { - long res = bindings.PeerManager_read_event(pm._test_only_get_ptr(), descriptor, data); - assert bindings.LDKCResult_boolPeerHandleErrorZ_result_ok(res); - //assert bindings.deref_bool(bindings.LDKCResult_boolPeerHandleErrorZ_get_inner(res)); - bindings.CResult_boolPeerHandleErrorZ_free(res); + Result_boolPeerHandleErrorZ res = pm.read_event(descriptor, data); + assert res instanceof Result_boolPeerHandleErrorZ.Result_boolPeerHandleErrorZ_OK; + //assert ((Result_boolPeerHandleErrorZ.Result_boolPeerHandleErrorZ_OK) res).res; }); thread.start(); list.add(thread); must_free_objs.add(new WeakReference<>(data)); } - boolean gc_ran = false; - - class GcCheck { - @Override - protected void finalize() throws Throwable { - gc_ran = true; - super.finalize(); - } - } - - void do_test_message_handler(boolean nice_close, boolean use_km_wrapper) throws InterruptedException { + void do_test_message_handler(boolean nice_close, boolean use_km_wrapper, boolean use_manual_watch) throws InterruptedException { GcCheck obj = new GcCheck(); - Peer peer1 = new Peer((byte) 1, use_km_wrapper); - Peer peer2 = new Peer((byte) 2, use_km_wrapper); + Peer peer1 = new Peer((byte) 1, use_km_wrapper, use_manual_watch); + Peer peer2 = new Peer((byte) 2, use_km_wrapper, use_manual_watch); ConcurrentLinkedQueue list = new ConcurrentLinkedQueue(); - LongHolder descriptor1 = new LongHolder(); - LongHolder descriptor1ref = descriptor1; - bindings.LDKSocketDescriptor sock1 = new bindings.LDKSocketDescriptor() { + DescriptorHolder descriptor1 = new DescriptorHolder(); + DescriptorHolder descriptor1ref = descriptor1; + SocketDescriptor descriptor2 = SocketDescriptor.new_impl(new SocketDescriptor.SocketDescriptorInterface() { @Override public long send_data(byte[] data, boolean resume_read) { do_read_event(list, peer1.peer_manager, descriptor1ref.val, data); @@ -256,12 +261,11 @@ class HumanObjectPeerTestInstance { } @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(SocketDescriptor other_arg) { return other_arg.hash() == 2; } @Override public long hash() { return 2; } - }; - long descriptor2 = bindings.LDKSocketDescriptor_new(sock1); + }); - bindings.LDKSocketDescriptor sock2 = new bindings.LDKSocketDescriptor() { + descriptor1.val = SocketDescriptor.new_impl(new SocketDescriptor.SocketDescriptorInterface() { @Override public long send_data(byte[] data, boolean resume_read) { do_read_event(list, peer2.peer_manager, descriptor2, data); @@ -269,19 +273,16 @@ class HumanObjectPeerTestInstance { } @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(SocketDescriptor other_arg) { return other_arg.hash() == 1; } @Override public long hash() { return 1; } - }; - descriptor1.val = bindings.LDKSocketDescriptor_new(sock2); + }); - long init_vec = bindings.PeerManager_new_outbound_connection(peer1.peer_manager._test_only_get_ptr(), peer2.node_id, descriptor1.val); - assert (bindings.LDKCResult_CVec_u8ZPeerHandleErrorZ_result_ok(init_vec)); + Result_CVec_u8ZPeerHandleErrorZ conn_res = peer1.peer_manager.new_outbound_connection(peer2.node_id, descriptor1.val); + assert conn_res instanceof Result_CVec_u8ZPeerHandleErrorZ.Result_CVec_u8ZPeerHandleErrorZ_OK; - long con_res = bindings.PeerManager_new_inbound_connection(peer2.peer_manager._test_only_get_ptr(), 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_ok(init_vec)); - bindings.CResult_CVec_u8ZPeerHandleErrorZ_free(init_vec); + Result_NonePeerHandleErrorZ inbound_conn_res = peer2.peer_manager.new_inbound_connection(descriptor2); + assert inbound_conn_res instanceof Result_NonePeerHandleErrorZ.Result_NonePeerHandleErrorZ_OK; + do_read_event(list, peer2.peer_manager, descriptor2, ((Result_CVec_u8ZPeerHandleErrorZ.Result_CVec_u8ZPeerHandleErrorZ_OK) conn_res).res); while (!list.isEmpty()) { list.poll().join(); } @@ -322,13 +323,13 @@ class HumanObjectPeerTestInstance { assert ((Event.FundingBroadcastSafe) events[0]).user_channel_id == 42; 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; + peer1.connect_block(b, 1, 0); + peer2.connect_block(b, 1, 0); for (int height = 2; height < 10; 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.connect_block(b, height, 0); + peer2.connect_block(b, height, 0); } peer1.peer_manager.process_events(); @@ -414,21 +415,29 @@ class HumanObjectPeerTestInstance { 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; + TwoTuple[] watch_outputs = peer2.connect_block(b, 1, 1); + if (watch_outputs != null) { // We only process watch_outputs manually when we use a manually-build Watch impl + assert watch_outputs.length == 1; + assert Arrays.equals(watch_outputs[0].a, tx.getTxId().getReversedBytes()); + assert watch_outputs[0].b.length == 1; + } } - - bindings.SocketDescriptor_free(descriptor2); - bindings.SocketDescriptor_free(descriptor1.val); } + java.util.LinkedList> must_free_objs = new java.util.LinkedList(); + boolean gc_ran = false; + class GcCheck { + @Override + protected void finalize() throws Throwable { + gc_ran = true; + super.finalize(); + } + } } public class HumanObjectPeerTest { - void do_test(boolean nice_close, boolean use_km_wrapper) throws InterruptedException { + void do_test(boolean nice_close, boolean use_km_wrapper, boolean use_manual_watch) throws InterruptedException { HumanObjectPeerTestInstance instance = new HumanObjectPeerTestInstance(); - instance.do_test_message_handler(nice_close, use_km_wrapper); + instance.do_test_message_handler(nice_close, use_km_wrapper, use_manual_watch); while (!instance.gc_ran) { System.gc(); System.runFinalization(); @@ -438,18 +447,18 @@ public class HumanObjectPeerTest { } @Test public void test_message_handler_force_close() throws InterruptedException { - do_test(false, false); + do_test(false, false, false); } @Test public void test_message_handler_nice_close() throws InterruptedException { - do_test(true, false); + do_test(true, false, false); } @Test public void test_message_handler_nice_close_wrapper() throws InterruptedException { - do_test(true, true); + do_test(true, true, true); } @Test public void test_message_handler_force_close_wrapper() throws InterruptedException { - do_test(false, true); + do_test(false, true, true); } }