X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fldk%2FHumanObjectPeerTest.java;h=c6a6f475fbf969fbcb174e0e7f479f7de8d08f76;hb=88b220f3e76e02ec5f05ed6d791c96edcb9eb2f6;hp=79f1fd1e93552893dec65c553b77eeea853ce620;hpb=ce83697be30b4a1cb5bc2e725ae506367b97f97e;p=ldk-java diff --git a/src/test/java/org/ldk/HumanObjectPeerTest.java b/src/test/java/org/ldk/HumanObjectPeerTest.java index 79f1fd1e..c6a6f475 100644 --- a/src/test/java/org/ldk/HumanObjectPeerTest.java +++ b/src/test/java/org/ldk/HumanObjectPeerTest.java @@ -5,9 +5,8 @@ import org.bitcoinj.script.Script; import org.junit.jupiter.api.Test; import org.ldk.batteries.ChannelManagerConstructor; import org.ldk.batteries.NioPeerHandler; -import org.ldk.enums.LDKCurrency; -import org.ldk.enums.LDKNetwork; -import org.ldk.impl.bindings; +import org.ldk.enums.Currency; +import org.ldk.enums.Network; import org.ldk.structs.*; import org.ldk.util.TwoTuple; @@ -135,7 +134,7 @@ class HumanObjectPeerTestInstance { synchronized (monitors) { assert monitors.put(Arrays.toString(funding_txo.get_txid()), monitor) == null; } - return Result_NoneChannelMonitorUpdateErrZ.constructor_ok(); + return Result_NoneChannelMonitorUpdateErrZ.ok(); } public Result_NoneChannelMonitorUpdateErrZ update_channel(OutPoint funding_txo, ChannelMonitorUpdate update) { @@ -145,7 +144,7 @@ class HumanObjectPeerTestInstance { Result_NoneMonitorUpdateErrorZ update_res = monitors.get(txid).update_monitor(update, tx_broadcaster, fee_estimator, logger); assert update_res instanceof Result_NoneMonitorUpdateErrorZ.Result_NoneMonitorUpdateErrorZ_OK; } - return Result_NoneChannelMonitorUpdateErrZ.constructor_ok(); + return Result_NoneChannelMonitorUpdateErrZ.ok(); } @Override @@ -191,7 +190,7 @@ class HumanObjectPeerTestInstance { // Because get_funding_txo() returns an OutPoint in a tuple that is a reference to an OutPoint inside the // ChannelMonitor, its a good test to ensure that the OutPoint isn't freed (or is cloned) before the // ChannelMonitor is. This used to be broken. - Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ roundtrip_monitor = UtilMethods.constructor_BlockHashChannelMonitorZ_read(mon.write(), keys_interface); + Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ roundtrip_monitor = UtilMethods.BlockHashChannelMonitorZ_read(mon.write(), keys_interface); assert roundtrip_monitor instanceof Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ.Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_OK; TwoTuple funding_txo = ((Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ.Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_OK) roundtrip_monitor).res.b.get_funding_txo(); System.gc(); System.runFinalization(); // Give the GC a chance to run. @@ -202,7 +201,10 @@ class HumanObjectPeerTestInstance { 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); + synchronized (broadcast_set) { + broadcast_set.add(tx); + broadcast_set.notifyAll(); + } }); monitors = new HashMap<>(); this.seed = seed; @@ -216,7 +218,7 @@ class HumanObjectPeerTestInstance { assert Arrays.equals(res.a.get_txid(), id.get_txid()); assert res.a.get_index() == id.get_index(); } - return Result_NoneChannelMonitorUpdateErrZ.constructor_ok(); + return Result_NoneChannelMonitorUpdateErrZ.ok(); } @Override @@ -228,7 +230,7 @@ class HumanObjectPeerTestInstance { assert Arrays.equals(res.a.get_txid(), id.get_txid()); assert res.a.get_index() == id.get_index(); } - return Result_NoneChannelMonitorUpdateErrZ.constructor_ok(); + return Result_NoneChannelMonitorUpdateErrZ.ok(); } }); @@ -240,7 +242,7 @@ class HumanObjectPeerTestInstance { } @Override public Option_C2Tuple_usizeTransactionZZ register_output(WatchedOutput output) { filter_additions.add(Arrays.toString(output.get_outpoint().get_txid()) + ":" + output.get_outpoint().get_index()); - return Option_C2Tuple_usizeTransactionZZ.constructor_none(); + return Option_C2Tuple_usizeTransactionZZ.none(); } }); } else { @@ -251,7 +253,7 @@ class HumanObjectPeerTestInstance { chain_watch = get_manual_watch(); chain_monitor = null; } else { - chain_monitor = ChainMonitor.constructor_new(filter, tx_broadcaster, logger, fee_estimator, persister); + chain_monitor = ChainMonitor.of(filter, tx_broadcaster, logger, fee_estimator, persister); chain_watch = chain_monitor.as_Watch(); } @@ -259,7 +261,7 @@ class HumanObjectPeerTestInstance { for (byte i = 0; i < 32; i++) { key_seed[i] = (byte) (i ^ seed); } - KeysManager keys = KeysManager.constructor_new(key_seed, System.currentTimeMillis() / 1000, (int) (System.currentTimeMillis() * 1000)); + KeysManager keys = KeysManager.of(key_seed, System.currentTimeMillis() / 1000, (int) (System.currentTimeMillis() * 1000)); if (use_km_wrapper) { this.keys_interface = manual_keysif(keys.as_KeysInterface()); this.explicit_keys_manager = null; @@ -267,11 +269,15 @@ class HumanObjectPeerTestInstance { this.keys_interface = keys.as_KeysInterface(); this.explicit_keys_manager = keys; } - this.router = NetGraphMsgHandler.constructor_new(new byte[32], null, logger); + this.router = NetGraphMsgHandler.of(new byte[32], null, logger); } private void bind_nio() { if (!use_nio_peer_handler) return; - try { this.nio_peer_handler = new NioPeerHandler(peer_manager); } catch (IOException e) { assert false; } + if (use_chan_manager_constructor) { + this.nio_peer_handler = this.constructor.nio_peer_handler; + } else { + try { this.nio_peer_handler = new NioPeerHandler(peer_manager); } catch (IOException e) { assert false; } + } for (short i = 10_000; true; i++) { try { nio_peer_handler.bind_listener(new InetSocketAddress("127.0.0.1", i)); @@ -283,49 +289,32 @@ class HumanObjectPeerTestInstance { Peer(byte seed) { this(null, seed); if (use_chan_manager_constructor) { - try { - this.constructor = new ChannelManagerConstructor(LDKNetwork.LDKNetwork_Bitcoin, UserConfig.constructor_default(), new byte[32], 0, - this.keys_interface, this.fee_estimator, this.chain_monitor, this.tx_broadcaster, this.logger); - constructor.chain_sync_completed(new ChannelManagerConstructor.ChannelManagerPersister() { - @Override public void handle_events(Event[] events) { - synchronized (pending_manager_events) { - pending_manager_events.addAll(Arrays.asList(events)); - pending_manager_events.notifyAll(); - } + this.constructor = new ChannelManagerConstructor(Network.LDKNetwork_Bitcoin, UserConfig.with_default(), new byte[32], 0, + this.keys_interface, this.fee_estimator, this.chain_monitor, this.router, this.tx_broadcaster, this.logger); + constructor.chain_sync_completed(new ChannelManagerConstructor.ChannelManagerPersister() { + @Override public void handle_event(Event event) { + synchronized (pending_manager_events) { + pending_manager_events.add(event); + pending_manager_events.notifyAll(); } - @Override public void persist_manager(byte[] channel_manager_bytes) { } - }); - this.chan_manager = constructor.channel_manager; - must_free_objs.add(new WeakReference<>(this.chan_manager)); - } catch (ChannelManagerConstructor.InvalidSerializedDataException e) { - assert false; - } + } + @Override public void persist_manager(byte[] channel_manager_bytes) { } + }); + this.chan_manager = constructor.channel_manager; + this.peer_manager = constructor.peer_manager; + must_free_objs.add(new WeakReference<>(this.chan_manager)); } else { - this.chan_manager = ChannelManager.constructor_new(this.fee_estimator, chain_watch, tx_broadcaster, logger, this.keys_interface, UserConfig.constructor_default(), LDKNetwork.LDKNetwork_Bitcoin, BestBlock.constructor_new(new byte[32], 0)); + ChainParameters params = ChainParameters.of(Network.LDKNetwork_Bitcoin, BestBlock.of(new byte[32], 0)); + this.chan_manager = ChannelManager.of(this.fee_estimator, chain_watch, tx_broadcaster, logger, this.keys_interface, UserConfig.with_default(), params); + byte[] random_data = keys_interface.get_secure_random_bytes(); + this.peer_manager = PeerManager.of(chan_manager.as_ChannelMessageHandler(), router.as_RoutingMessageHandler(), keys_interface.get_node_secret(), random_data, logger); } this.node_id = chan_manager.get_our_node_id(); - - 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, logger); bind_nio(); System.gc(); } - byte[] hexStringToByteArray(String s) { - int len = s.length(); - byte[] data = new byte[len / 2]; - for (int i = 0; i < len; i += 2) { - data[i / 2] = (byte) ((Character.digit(s.charAt(i), 16) << 4) - + Character.digit(s.charAt(i+1), 16)); - } - return data; - } - - Object ptr_to; Peer(Peer orig) { this(null, orig.seed); @@ -334,17 +323,18 @@ class HumanObjectPeerTestInstance { byte[] serialized = orig.chan_manager.write(); try { this.constructor = new ChannelManagerConstructor(serialized, monitors, this.keys_interface, - this.fee_estimator, this.chain_monitor, this.filter, this.tx_broadcaster, this.logger); + this.fee_estimator, this.chain_monitor, this.filter, this.router, this.tx_broadcaster, this.logger); constructor.chain_sync_completed(new ChannelManagerConstructor.ChannelManagerPersister() { - @Override public void handle_events(Event[] events) { + @Override public void handle_event(Event event) { synchronized (pending_manager_events) { - pending_manager_events.addAll(Arrays.asList(events)); + pending_manager_events.add(event); pending_manager_events.notifyAll(); } } @Override public void persist_manager(byte[] channel_manager_bytes) { } }); this.chan_manager = constructor.channel_manager; + this.peer_manager = constructor.peer_manager; must_free_objs.add(new WeakReference<>(this.chan_manager)); // If we are using a ChannelManagerConstructor, we may have pending events waiting on the old peer // which have been removed from the ChannelManager but which we still need to handle. @@ -364,16 +354,18 @@ class HumanObjectPeerTestInstance { } else { byte[] serialized = orig.monitors.values().stream().iterator().next().write(); Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ res = - UtilMethods.constructor_BlockHashChannelMonitorZ_read(serialized, this.keys_interface); + UtilMethods.BlockHashChannelMonitorZ_read(serialized, this.keys_interface); assert res instanceof Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ.Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_OK; monitors[0] = ((Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ.Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_OK) res).res.b; } byte[] serialized = orig.chan_manager.write(); Result_C2Tuple_BlockHashChannelManagerZDecodeErrorZ read_res = - UtilMethods.constructor_BlockHashChannelManagerZ_read(serialized, this.keys_interface, this.fee_estimator, this.chain_watch, this.tx_broadcaster, this.logger, UserConfig.constructor_default(), monitors); + UtilMethods.BlockHashChannelManagerZ_read(serialized, this.keys_interface, this.fee_estimator, this.chain_watch, this.tx_broadcaster, this.logger, UserConfig.with_default(), monitors); assert read_res instanceof Result_C2Tuple_BlockHashChannelManagerZDecodeErrorZ.Result_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_OK; this.chan_manager = ((Result_C2Tuple_BlockHashChannelManagerZDecodeErrorZ.Result_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_OK) read_res).res.b; this.chain_watch.watch_channel(monitors[0].get_funding_txo().a, monitors[0]); + byte[] random_data = keys_interface.get_secure_random_bytes(); + this.peer_manager = PeerManager.of(chan_manager.as_ChannelMessageHandler(), router.as_RoutingMessageHandler(), keys_interface.get_node_secret(), random_data, logger); if (!break_cross_peer_refs && (use_manual_watch || use_km_wrapper)) { // When we pass monitors[0] into chain_watch.watch_channel we create a reference from the new Peer to a // field in the old peer, preventing freeing of the original Peer until the new Peer is freed. Thus, we @@ -382,6 +374,7 @@ class HumanObjectPeerTestInstance { } } this.node_id = chan_manager.get_our_node_id(); + bind_nio(); if (cross_reload_ref_pollution) { // This really, really needs to be handled at the bindings layer, but its rather complicated - @@ -393,13 +386,6 @@ class HumanObjectPeerTestInstance { // the ChannelSigner. this.ptr_to = orig.chan_manager; } - - 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, logger); - bind_nio(); } TwoTuple[]>[] connect_block(Block b, int height, long expected_monitor_update_len) { @@ -434,12 +420,16 @@ class HumanObjectPeerTestInstance { if (use_chan_manager_constructor) { while (true) { synchronized (this.pending_manager_events) { - if (expected_len != 0 && this.pending_manager_events.size() != expected_len) { + if (expected_len != 0 && this.pending_manager_events.size() == expected_len) { break; } } - try { Thread.sleep(500); } catch (InterruptedException e) { assert false; } - break; + if (expected_len == 0) { + try { Thread.sleep(500); } catch (InterruptedException e) { assert false; } + break; + } else { + Thread.yield(); + } } synchronized (this.pending_manager_events) { Event[] res = this.pending_manager_events.toArray(new Event[0]); @@ -448,7 +438,10 @@ class HumanObjectPeerTestInstance { return res; } } else if (chain_monitor != null) { - return chain_monitor.as_EventsProvider().get_and_clear_pending_events(); + ArrayList l = new ArrayList(); + chain_monitor.as_EventsProvider().process_pending_events(EventHandler.new_impl(l::add)); + assert l.size() == expected_len; + return l.toArray(new Event[0]); } else { synchronized (monitors) { assert monitors.size() == 1; @@ -462,7 +455,11 @@ class HumanObjectPeerTestInstance { } } - Event[] get_manager_events(int expected_len) { + Event[] get_manager_events(int expected_len, Peer peer1, Peer peer2) { + assert expected_len != 0; + if (!use_nio_peer_handler) { + maybe_exchange_peer_messages(peer1, peer2); + } Event[] res = new Event[0]; if (use_chan_manager_constructor) { while (res.length < expected_len) { @@ -476,26 +473,21 @@ class HumanObjectPeerTestInstance { } } } else { - res = this.chan_manager.as_EventsProvider().get_and_clear_pending_events(); + ArrayList l = new ArrayList(); + while (l.size() < expected_len) { + Thread.yield(); + if (use_nio_peer_handler) { + peer1.nio_peer_handler.check_events(); + peer2.nio_peer_handler.check_events(); + } + chan_manager.as_EventsProvider().process_pending_events(EventHandler.new_impl(l::add)); + assert l.size() == expected_len || l.size() == 0; // We don't handle partial results + } + return l.toArray(new Event[0]); } assert res.length == expected_len; return res; } - - Route get_route(byte[] dest_node, ChannelDetails[] our_chans) { - try (LockedNetworkGraph netgraph = this.router.read_locked_graph()) { - NetworkGraph graph = netgraph.graph(); - long res = bindings.get_route(this.node_id, graph._test_only_get_ptr(), dest_node, 0L, new long[]{our_chans[0]._test_only_get_ptr()}, - new long[0], 1000000, 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)); - Result_RouteDecodeErrorZ copy = Route.constructor_read(serialized_route); - assert copy instanceof Result_RouteDecodeErrorZ.Result_RouteDecodeErrorZ_OK; - bindings.CResult_RouteLightningErrorZ_free(res); - return ((Result_RouteDecodeErrorZ.Result_RouteDecodeErrorZ_OK) copy).res; - } - } } static class DescriptorHolder { SocketDescriptor val; } @@ -524,12 +516,9 @@ class HumanObjectPeerTestInstance { } } }); - void wait_events_processed(Peer peer1, Peer peer2) { - if (use_nio_peer_handler) { - peer1.nio_peer_handler.check_events(); - peer2.nio_peer_handler.check_events(); - try { Thread.sleep(400); } catch (InterruptedException e) { assert false; } - } else { + + void maybe_exchange_peer_messages(Peer peer1, Peer peer2) { + if (!use_nio_peer_handler) { synchronized (runqueue) { ran = false; } @@ -546,6 +535,9 @@ class HumanObjectPeerTestInstance { try { runqueue.wait(); } catch (InterruptedException e) { assert false; } } } + } else if (!use_chan_manager_constructor) { + peer1.nio_peer_handler.check_events(); + peer2.nio_peer_handler.check_events(); } } void do_read_event(PeerManager pm, SocketDescriptor descriptor, byte[] data) { @@ -566,6 +558,9 @@ class HumanObjectPeerTestInstance { try { peer1.nio_peer_handler.connect(peer2.chan_manager.get_our_node_id(), new InetSocketAddress("127.0.0.1", peer2.nio_port), 100); } catch (IOException e) { assert false; } + while (peer1.peer_manager.get_peer_node_ids().length == 0 || peer2.peer_manager.get_peer_node_ids().length == 0) { + Thread.yield(); + } } else { DescriptorHolder descriptor1 = new DescriptorHolder(); DescriptorHolder descriptor1ref = descriptor1; @@ -599,6 +594,8 @@ class HumanObjectPeerTestInstance { 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(peer2.peer_manager, descriptor2, ((Result_CVec_u8ZPeerHandleErrorZ.Result_CVec_u8ZPeerHandleErrorZ_OK) conn_res).res); + + maybe_exchange_peer_messages(peer1, peer2); } } @@ -607,13 +604,11 @@ class HumanObjectPeerTestInstance { Peer peer2 = new Peer((byte) 2); connect_peers(peer1, peer2); - wait_events_processed(peer1, peer2); 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; - wait_events_processed(peer1, peer2); - Event[] events = peer1.get_manager_events(1); + Event[] events = peer1.get_manager_events(1, peer1, peer2); assert events[0] instanceof Event.FundingGenerationReady; assert ((Event.FundingGenerationReady) events[0]).channel_value_satoshis == 10000; assert ((Event.FundingGenerationReady) events[0]).user_channel_id == 42; @@ -630,7 +625,13 @@ class HumanObjectPeerTestInstance { funding.addOutput(Coin.SATOSHI.multiply(10000), new Script(funding_spk)); Result_NoneAPIErrorZ funding_res = peer1.chan_manager.funding_transaction_generated(chan_id, funding.bitcoinSerialize()); assert funding_res instanceof Result_NoneAPIErrorZ.Result_NoneAPIErrorZ_OK; - wait_events_processed(peer1, peer2); + + maybe_exchange_peer_messages(peer1, peer2); + synchronized (peer1.broadcast_set) { + while (peer1.broadcast_set.size() != 1) { + peer1.broadcast_set.wait(); + } + } assert peer1.broadcast_set.size() == 1; assert Arrays.equals(peer1.broadcast_set.get(0), funding.bitcoinSerialize()); @@ -645,7 +646,9 @@ class HumanObjectPeerTestInstance { peer1.connect_block(b, height, 0); peer2.connect_block(b, height, 0); } - wait_events_processed(peer1, peer2); + + maybe_exchange_peer_messages(peer1, peer2); + while (peer1.chan_manager.list_usable_channels().length != 1 || peer2.chan_manager.list_usable_channels().length != 1) peer1.chan_manager.list_channels(); ChannelDetails[] peer1_chans = peer1.chan_manager.list_usable_channels(); @@ -653,17 +656,18 @@ class HumanObjectPeerTestInstance { assert peer1_chans.length == 1; assert peer2_chans.length == 1; assert peer1_chans[0].get_channel_value_satoshis() == 10000; - assert peer1_chans[0].get_is_live(); + assert peer1_chans[0].get_is_usable(); Option_u64Z short_chan_id = peer1_chans[0].get_short_channel_id(); assert short_chan_id instanceof Option_u64Z.Some; assert ((Option_u64Z.Some)short_chan_id).some == (1L << 40); // 0th output in the 0th transaction in the 1st block assert Arrays.equals(peer1_chans[0].get_channel_id(), funding.getTxId().getReversedBytes()); assert Arrays.equals(peer2_chans[0].get_channel_id(), funding.getTxId().getReversedBytes()); - Result_InvoiceSignOrCreationErrorZ invoice = UtilMethods.constructor_invoice_from_channelmanager(peer2.chan_manager, peer2.keys_interface, LDKCurrency.LDKCurrency_Bitcoin, Option_u64Z.constructor_none(), "Invoice Description"); + Result_InvoiceSignOrCreationErrorZ invoice = UtilMethods.create_invoice_from_channelmanager(peer2.chan_manager, peer2.keys_interface, Currency.LDKCurrency_Bitcoin, Option_u64Z.none(), "Invoice Description"); assert invoice instanceof Result_InvoiceSignOrCreationErrorZ.Result_InvoiceSignOrCreationErrorZ_OK; System.out.println("Got invoice: " + ((Result_InvoiceSignOrCreationErrorZ.Result_InvoiceSignOrCreationErrorZ_OK) invoice).res.to_str()); - Result_InvoiceNoneZ parsed_invoice = Invoice.constructor_from_str(((Result_InvoiceSignOrCreationErrorZ.Result_InvoiceSignOrCreationErrorZ_OK) invoice).res.to_str()); + + Result_InvoiceNoneZ parsed_invoice = Invoice.from_str(((Result_InvoiceSignOrCreationErrorZ.Result_InvoiceSignOrCreationErrorZ_OK) invoice).res.to_str()); assert parsed_invoice instanceof Result_InvoiceNoneZ.Result_InvoiceNoneZ_OK; assert Arrays.equals(((Result_InvoiceNoneZ.Result_InvoiceNoneZ_OK) parsed_invoice).res.payment_hash(), ((Result_InvoiceSignOrCreationErrorZ.Result_InvoiceSignOrCreationErrorZ_OK) invoice).res.payment_hash()); SignedRawInvoice signed_raw = ((Result_InvoiceNoneZ.Result_InvoiceNoneZ_OK) parsed_invoice).res.into_signed_raw(); @@ -674,36 +678,38 @@ class HumanObjectPeerTestInstance { assert description_string.equals("Invoice Description"); byte[] payment_hash = ((Result_InvoiceSignOrCreationErrorZ.Result_InvoiceSignOrCreationErrorZ_OK) invoice).res.payment_hash(); byte[] payment_secret = ((Result_InvoiceSignOrCreationErrorZ.Result_InvoiceSignOrCreationErrorZ_OK) invoice).res.payment_secret(); + byte[] dest_node_id = ((Result_InvoiceSignOrCreationErrorZ.Result_InvoiceSignOrCreationErrorZ_OK) invoice).res.recover_payee_pub_key(); + assert Arrays.equals(dest_node_id, peer2.node_id); + InvoiceFeatures invoice_features = ((Result_InvoiceSignOrCreationErrorZ.Result_InvoiceSignOrCreationErrorZ_OK) invoice).res.features(); + RouteHint[] route_hints = ((Result_InvoiceSignOrCreationErrorZ.Result_InvoiceSignOrCreationErrorZ_OK) invoice).res.route_hints(); + + Route route; + try (LockedNetworkGraph netgraph = peer1.router.read_locked_graph()) { + NetworkGraph graph = netgraph.graph(); + Result_RouteLightningErrorZ route_res = UtilMethods.get_route(peer1.chan_manager.get_our_node_id(), graph, peer2.node_id, invoice_features, peer1_chans, route_hints, 1000000, 42, peer1.logger); + assert route_res instanceof Result_RouteLightningErrorZ.Result_RouteLightningErrorZ_OK; + route = ((Result_RouteLightningErrorZ.Result_RouteLightningErrorZ_OK) route_res).res; + } - Route route = peer1.get_route(peer2.node_id, peer1_chans); Result_NonePaymentSendFailureZ payment_res = peer1.chan_manager.send_payment(route, payment_hash, payment_secret); assert payment_res instanceof Result_NonePaymentSendFailureZ.Result_NonePaymentSendFailureZ_OK; - wait_events_processed(peer1, peer2); RouteHop[][] hops = new RouteHop[1][1]; byte[] hop_pubkey = new byte[33]; hop_pubkey[0] = 3; hop_pubkey[1] = 42; - hops[0][0] = RouteHop.constructor_new(hop_pubkey, NodeFeatures.constructor_known(), 42, ChannelFeatures.constructor_known(), 100, 0); - Route r2 = Route.constructor_new(hops); + hops[0][0] = RouteHop.of(hop_pubkey, NodeFeatures.known(), 42, ChannelFeatures.known(), 100, 0); + Route r2 = Route.of(hops); payment_res = peer1.chan_manager.send_payment(r2, payment_hash, payment_secret); assert payment_res instanceof Result_NonePaymentSendFailureZ.Result_NonePaymentSendFailureZ_Err; - if (!use_chan_manager_constructor) { - peer1.get_monitor_events(0); - peer2.get_monitor_events(0); - } else { - // The events are combined across manager + monitors but peer1 still has no events - } - if (reload_peers) { - if (use_nio_peer_handler) { - peer1.nio_peer_handler.interrupt(); - peer2.nio_peer_handler.interrupt(); - } if (use_chan_manager_constructor) { peer1.constructor.interrupt(); peer2.constructor.interrupt(); + } else if (use_nio_peer_handler) { + peer1.nio_peer_handler.interrupt(); + peer2.nio_peer_handler.interrupt(); } WeakReference op1 = new WeakReference(peer1); peer1 = new Peer(peer1); @@ -727,7 +733,7 @@ class HumanObjectPeerTestInstance { this.best_blockhash = best_blockhash; } } - void do_test_message_handler_b(TestState state) { + void do_test_message_handler_b(TestState state) throws InterruptedException { GcCheck obj = new GcCheck(); if (state.ref_block != null) { // Ensure the original peers get freed before we move on. Note that we have to be in a different function @@ -738,36 +744,52 @@ class HumanObjectPeerTestInstance { } connect_peers(state.peer1, state.peer2); } - wait_events_processed(state.peer1, state.peer2); - Event[] events = state.peer2.get_manager_events(1); + Event[] events = state.peer2.get_manager_events(1, state.peer1, state.peer2); assert events[0] instanceof Event.PendingHTLCsForwardable; state.peer2.chan_manager.process_pending_htlc_forwards(); - events = state.peer2.get_manager_events(1); + events = state.peer2.get_manager_events(1, state.peer1, state.peer2); assert events[0] instanceof Event.PaymentReceived; byte[] payment_preimage = ((Event.PaymentReceived)events[0]).payment_preimage; assert !Arrays.equals(payment_preimage, new byte[32]); state.peer2.chan_manager.claim_funds(payment_preimage); - wait_events_processed(state.peer1, state.peer2); - events = state.peer1.get_manager_events(1); + events = state.peer1.get_manager_events(1, state.peer1, state.peer2); assert events[0] instanceof Event.PaymentSent; assert Arrays.equals(((Event.PaymentSent) events[0]).payment_preimage, payment_preimage); - wait_events_processed(state.peer1, state.peer2); + + if (use_nio_peer_handler) { + // We receive PaymentSent immediately upon receipt of the payment preimage, but we expect to not have an + // HTLC transaction to broadcast below, which requires a bit more time to fully complete the + // commitment-transaction-update dance between both peers. + Thread.sleep(100); + } ChannelDetails[] peer1_chans = state.peer1.chan_manager.list_channels(); if (nice_close) { Result_NoneAPIErrorZ close_res = state.peer1.chan_manager.close_channel(peer1_chans[0].get_channel_id()); assert close_res instanceof Result_NoneAPIErrorZ.Result_NoneAPIErrorZ_OK; - wait_events_processed(state.peer1, state.peer2); + maybe_exchange_peer_messages(state.peer1, state.peer2); + synchronized (state.peer1.broadcast_set) { + while (state.peer1.broadcast_set.size() != 1) state.peer1.broadcast_set.wait(); + } + synchronized (state.peer2.broadcast_set) { + while (state.peer2.broadcast_set.size() != 1) state.peer2.broadcast_set.wait(); + } assert state.peer1.broadcast_set.size() == 1; assert state.peer2.broadcast_set.size() == 1; } else { state.peer1.chan_manager.force_close_all_channels(); - wait_events_processed(state.peer1, state.peer2); + maybe_exchange_peer_messages(state.peer1, state.peer2); + synchronized (state.peer1.broadcast_set) { + while (state.peer1.broadcast_set.size() != 1) state.peer1.broadcast_set.wait(); + } + synchronized (state.peer2.broadcast_set) { + while (state.peer2.broadcast_set.size() != 1) state.peer2.broadcast_set.wait(); + } assert state.peer1.broadcast_set.size() == 1; assert state.peer2.broadcast_set.size() == 1; @@ -808,9 +830,8 @@ class HumanObjectPeerTestInstance { if (use_nio_peer_handler) { state.peer1.peer_manager.disconnect_by_node_id(state.peer2.chan_manager.get_our_node_id(), false); - wait_events_processed(state.peer1, state.peer2); - assert state.peer1.peer_manager.get_peer_node_ids().length == 0; - assert state.peer2.peer_manager.get_peer_node_ids().length == 0; + while (state.peer1.peer_manager.get_peer_node_ids().length != 0) Thread.yield(); + while (state.peer2.peer_manager.get_peer_node_ids().length != 0) Thread.yield(); state.peer1.nio_peer_handler.interrupt(); state.peer2.nio_peer_handler.interrupt(); } @@ -822,6 +843,8 @@ class HumanObjectPeerTestInstance { state.peer1.constructor.interrupt(); state.peer2.constructor.interrupt(); } + + t.interrupt(); } java.util.LinkedList> must_free_objs = new java.util.LinkedList(); @@ -866,12 +889,23 @@ public class HumanObjectPeerTest { // There are no cross refs to break without reloading peers. continue; } - if (use_chan_manager_constructor && use_manual_watch) { - // ChannelManagerConstructor requires a ChainMonitor as the Watch + if (use_chan_manager_constructor && (use_manual_watch || !nio_peer_handler)) { + // ChannelManagerConstructor requires a ChainMonitor as the Watch and creates a NioPeerHandler for us. continue; } System.err.println("Running test with flags " + i); do_test(nice_close, use_km_wrapper, use_manual_watch, reload_peers, break_cross_refs, nio_peer_handler, use_chan_manager_constructor); } } + + // This is used in the test jar to test the built jar is runnable + public static void main(String[] args) { + try { + new HumanObjectPeerTest().test_message_handler(); + } catch (Exception e) { + System.err.println("Caught exception:"); + System.err.println(e); + System.exit(1); + } + } }