X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fldk%2FHumanObjectPeerTest.java;h=781d4d2c9870ada248bdba729dc2bf6b802058d9;hb=2d1f01998cb6bc9b880b0894e747aae9f9daccbe;hp=3d9c553d15368200fdcca06786cbb827a18aa31e;hpb=196f002e1d9016295c51b37b16986068ecf8db3e;p=ldk-java diff --git a/src/test/java/org/ldk/HumanObjectPeerTest.java b/src/test/java/org/ldk/HumanObjectPeerTest.java index 3d9c553d..781d4d2c 100644 --- a/src/test/java/org/ldk/HumanObjectPeerTest.java +++ b/src/test/java/org/ldk/HumanObjectPeerTest.java @@ -13,26 +13,14 @@ import java.lang.ref.WeakReference; import java.util.Arrays; import java.util.HashMap; import java.util.LinkedList; -import java.util.concurrent.ConcurrentLinkedQueue; class HumanObjectPeerTestInstance { class Peer { KeysInterface manual_keysif(KeysInterface underlying_if) { return KeysInterface.new_impl(new KeysInterface.KeysInterfaceInterface() { - @Override - public byte[] get_node_secret() { - return underlying_if.get_node_secret(); - } - - @Override - public byte[] get_destination_script() { - return underlying_if.get_destination_script(); - } - - @Override - public byte[] get_shutdown_pubkey() { - return underlying_if.get_shutdown_pubkey(); - } + @Override public byte[] get_node_secret() { return underlying_if.get_node_secret(); } + @Override public byte[] get_destination_script() { return underlying_if.get_destination_script(); } + @Override public byte[] get_shutdown_pubkey() { return underlying_if.get_shutdown_pubkey(); } @Override public ChannelKeys get_channel_keys(boolean inbound, long channel_value_satoshis) { @@ -54,8 +42,8 @@ class HumanObjectPeerTestInstance { } @Override - public Result_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_counterparty_commitment(int feerate_per_kw, byte[] commitment_tx, PreCalculatedTxCreationKeys keys, HTLCOutputInCommitment[] htlcs) { - return underlying_ck.sign_counterparty_commitment(feerate_per_kw, commitment_tx, keys, htlcs); + public Result_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_counterparty_commitment(CommitmentTransaction commitment_tx) { + return underlying_ck.sign_counterparty_commitment(commitment_tx); } @Override @@ -89,8 +77,13 @@ class HumanObjectPeerTestInstance { } @Override - public void on_accept(ChannelPublicKeys channel_points, short counterparty_selected_contest_delay, short holder_selected_contest_delay) { - underlying_ck.on_accept(channel_points, counterparty_selected_contest_delay, holder_selected_contest_delay); + public void ready_channel(ChannelTransactionParameters params) { + underlying_ck.ready_channel(params); + } + + @Override + public byte[] write() { + return underlying_ck.write(); } }; ChannelKeys resp = ChannelKeys.new_impl(cki, underlying_ck.get_pubkeys()); @@ -104,6 +97,11 @@ class HumanObjectPeerTestInstance { public byte[] get_secure_random_bytes() { return underlying_if.get_secure_random_bytes(); } + + @Override + public Result_ChanKeySignerDecodeErrorZ read_chan_signer(byte[] reader) { + return underlying_if.read_chan_signer(reader); + } }); } @@ -120,7 +118,7 @@ class HumanObjectPeerTestInstance { synchronized (monitors) { String txid = Arrays.toString(funding_txo.get_txid()); assert monitors.containsKey(txid); - Result_NoneMonitorUpdateErrorZ update_res = monitors.get(txid).update_monitor(update, tx_broadcaster, logger); + 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 new Result_NoneChannelMonitorUpdateErrZ.Result_NoneChannelMonitorUpdateErrZ_OK(); @@ -159,12 +157,23 @@ class HumanObjectPeerTestInstance { broadcast_set.add(tx); }); this.monitors = new HashMap<>(); + Persist persister = Persist.new_impl(new Persist.PersistInterface() { + @Override + public Result_NoneChannelMonitorUpdateErrZ persist_new_channel(OutPoint id, ChannelMonitor data) { + return new Result_NoneChannelMonitorUpdateErrZ.Result_NoneChannelMonitorUpdateErrZ_OK(); + } + + @Override + public Result_NoneChannelMonitorUpdateErrZ update_persisted_channel(OutPoint id, ChannelMonitorUpdate update, ChannelMonitor data) { + return new Result_NoneChannelMonitorUpdateErrZ.Result_NoneChannelMonitorUpdateErrZ_OK(); + } + }); 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_monitor = ChainMonitor.constructor_new(null, tx_broadcaster, logger, fee_estimator, persister); chain_watch = chain_monitor.as_Watch(); } @@ -182,7 +191,7 @@ class HumanObjectPeerTestInstance { 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); + this.router = NetGraphMsgHandler.constructor_new(new byte[32], null, logger); byte[] random_data = new byte[32]; for (byte i = 0; i < 32; i++) { @@ -192,7 +201,7 @@ class HumanObjectPeerTestInstance { System.gc(); } - TwoTuple[] connect_block(Block b, int height, long expected_monitor_update_len) { + 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()) { @@ -208,7 +217,7 @@ class HumanObjectPeerTestInstance { synchronized (monitors) { assert monitors.size() == 1; for (ChannelMonitor mon : monitors.values()) { - TwoTuple[] ret = mon.block_connected(header, txn, height, tx_broadcaster, fee_estimator, logger); + TwoTuple[]>[] ret = mon.block_connected(header, txn, height, tx_broadcaster, fee_estimator, logger); assert ret.length == expected_monitor_update_len; return ret; } @@ -225,23 +234,56 @@ class HumanObjectPeerTestInstance { 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); + Result_RouteDecodeErrorZ copy = Route.constructor_read(serialized_route); + assert copy instanceof Result_RouteDecodeErrorZ.Result_RouteDecodeErrorZ_OK; bindings.CResult_RouteLightningErrorZ_free(res); - return copy; + return ((Result_RouteDecodeErrorZ.Result_RouteDecodeErrorZ_OK) copy).res; } } } class DescriptorHolder { SocketDescriptor val; } - void do_read_event(ConcurrentLinkedQueue list, PeerManager pm, SocketDescriptor descriptor, byte[] data) { - Thread thread = new Thread(() -> { - 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); + boolean running = false; + final LinkedList runqueue = new LinkedList(); + Thread t = new Thread(() -> { + while (true) { + try { + Runnable r; + synchronized (runqueue) { + while (runqueue.isEmpty()) { + runqueue.wait(); + } + running = true; + r = runqueue.pollFirst(); + } + r.run(); + synchronized (runqueue) { + running = false; + runqueue.notifyAll(); + } + } catch (InterruptedException e) { + return; + } + } + }); + void wait_events_processed() { + while (true) { + synchronized (runqueue) { + if (runqueue.isEmpty() && !running) break; + try { runqueue.wait(); } catch (InterruptedException e) { assert false; } + } + } + } + void do_read_event(PeerManager pm, SocketDescriptor descriptor, byte[] data) { + if (!t.isAlive()) t.start(); + synchronized (runqueue) { + runqueue.add(() -> { + Result_boolPeerHandleErrorZ res = pm.read_event(descriptor, data); + assert res instanceof Result_boolPeerHandleErrorZ.Result_boolPeerHandleErrorZ_OK; + }); + runqueue.notifyAll(); + } must_free_objs.add(new WeakReference<>(data)); } @@ -250,13 +292,12 @@ class HumanObjectPeerTestInstance { 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(); 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); + do_read_event(peer1.peer_manager, descriptor1ref.val, data); return data.length; } @@ -268,7 +309,7 @@ class HumanObjectPeerTestInstance { 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); + do_read_event(peer2.peer_manager, descriptor2, data); return data.length; } @@ -282,17 +323,17 @@ 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(list, peer2.peer_manager, descriptor2, ((Result_CVec_u8ZPeerHandleErrorZ.Result_CVec_u8ZPeerHandleErrorZ_OK) conn_res).res); + do_read_event(peer2.peer_manager, descriptor2, ((Result_CVec_u8ZPeerHandleErrorZ.Result_CVec_u8ZPeerHandleErrorZ_OK) conn_res).res); - while (!list.isEmpty()) { list.poll().join(); } + wait_events_processed(); 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(); } + wait_events_processed(); peer2.peer_manager.process_events(); - while (!list.isEmpty()) { list.poll().join(); } + wait_events_processed(); Event[] events = peer1.chan_manager_events.get_and_clear_pending_events(); assert events.length == 1; @@ -313,9 +354,9 @@ class HumanObjectPeerTestInstance { peer1.chan_manager.funding_transaction_generated(chan_id, OutPoint.constructor_new(funding.getTxId().getReversedBytes(), (short) 0)); peer1.peer_manager.process_events(); - while (!list.isEmpty()) { list.poll().join(); } + wait_events_processed(); peer2.peer_manager.process_events(); - while (!list.isEmpty()) { list.poll().join(); } + wait_events_processed(); events = peer1.chan_manager_events.get_and_clear_pending_events(); assert events.length == 1; @@ -334,7 +375,7 @@ class HumanObjectPeerTestInstance { peer1.peer_manager.process_events(); peer2.peer_manager.process_events(); - while (!list.isEmpty()) { list.poll().join(); } + wait_events_processed(); peer1.chan_manager.list_channels(); ChannelDetails[] peer1_chans = peer1.chan_manager.list_channels(); @@ -354,11 +395,16 @@ class HumanObjectPeerTestInstance { assert payment_res instanceof Result_NonePaymentSendFailureZ.Result_NonePaymentSendFailureZ_OK; peer1.peer_manager.process_events(); - while (!list.isEmpty()) { list.poll().join(); } + wait_events_processed(); peer2.peer_manager.process_events(); - while (!list.isEmpty()) { list.poll().join(); } + wait_events_processed(); peer1.peer_manager.process_events(); - while (!list.isEmpty()) { list.poll().join(); } + wait_events_processed(); + + { + peer1.chan_manager.write(); + //ChannelManager. + } events = peer2.chan_manager_events.get_and_clear_pending_events(); assert events.length == 1; @@ -371,11 +417,11 @@ class HumanObjectPeerTestInstance { 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(); } + wait_events_processed(); peer1.peer_manager.process_events(); - while (!list.isEmpty()) { list.poll().join(); } + wait_events_processed(); peer2.peer_manager.process_events(); - while (!list.isEmpty()) { list.poll().join(); } + wait_events_processed(); events = peer1.chan_manager_events.get_and_clear_pending_events(); assert events.length == 1; @@ -387,13 +433,13 @@ class HumanObjectPeerTestInstance { assert close_res instanceof Result_NoneAPIErrorZ.Result_NoneAPIErrorZ_OK; peer1.peer_manager.process_events(); - while (!list.isEmpty()) { list.poll().join(); } + wait_events_processed(); peer2.peer_manager.process_events(); - while (!list.isEmpty()) { list.poll().join(); } + wait_events_processed(); peer1.peer_manager.process_events(); - while (!list.isEmpty()) { list.poll().join(); } + wait_events_processed(); peer2.peer_manager.process_events(); - while (!list.isEmpty()) { list.poll().join(); } + wait_events_processed(); assert peer1.broadcast_set.size() == 1; assert peer2.broadcast_set.size() == 1; @@ -401,13 +447,13 @@ class HumanObjectPeerTestInstance { peer1.chan_manager.force_close_all_channels(); peer1.peer_manager.process_events(); - while (!list.isEmpty()) { list.poll().join(); } + wait_events_processed(); peer2.peer_manager.process_events(); - while (!list.isEmpty()) { list.poll().join(); } + wait_events_processed(); peer1.peer_manager.process_events(); - while (!list.isEmpty()) { list.poll().join(); } + wait_events_processed(); peer2.peer_manager.process_events(); - while (!list.isEmpty()) { list.poll().join(); } + wait_events_processed(); assert peer1.broadcast_set.size() == 1; assert peer2.broadcast_set.size() == 0; @@ -415,12 +461,17 @@ 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, 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; } + + // This used to be buggy and double-free, so go ahead and fetch them! + for (ChannelMonitor mon : peer2.monitors.values()) { + byte[][] txn = mon.get_latest_holder_commitment_txn(peer2.logger); + } } }