import org.junit.jupiter.api.Test;
import org.ldk.batteries.ChannelManagerConstructor;
import org.ldk.batteries.NioPeerHandler;
-import org.ldk.enums.AccessError;
+import org.ldk.enums.*;
import org.ldk.enums.Currency;
-import org.ldk.enums.Level;
-import org.ldk.enums.Network;
import org.ldk.structs.*;
-import org.ldk.util.TwoTuple;
+import org.ldk.util.UInt5;
import java.io.IOException;
import java.lang.ref.WeakReference;
import java.net.InetSocketAddress;
import java.util.*;
+import java.util.function.IntConsumer;
class HumanObjectPeerTestInstance {
private final boolean nice_close;
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 Result_SecretKeyNoneZ get_node_secret(Recipient recipient) { return underlying_if.get_node_secret(recipient); }
@Override public byte[] get_destination_script() { return underlying_if.get_destination_script(); }
@Override public ShutdownScript get_shutdown_scriptpubkey() { return underlying_if.get_shutdown_scriptpubkey(); }
@Override public byte[] release_commitment_secret(long idx) {
return underlying_base.release_commitment_secret(idx);
}
- @Override public Result_NoneNoneZ validate_holder_commitment(HolderCommitmentTransaction holder_tx) {
- return underlying_base.validate_holder_commitment(holder_tx);
+ @Override public Result_NoneNoneZ validate_holder_commitment(HolderCommitmentTransaction holder_tx, byte[][] preimages) {
+ return underlying_base.validate_holder_commitment(holder_tx, preimages);
}
@Override public byte[] channel_keys_id() {
return new byte[32];
}
- @Override public Result_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_counterparty_commitment(CommitmentTransaction commitment_tx) {
- return underlying_base.sign_counterparty_commitment(commitment_tx);
+ @Override public Result_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_counterparty_commitment(CommitmentTransaction commitment_tx, byte[][] preimages) {
+ return underlying_base.sign_counterparty_commitment(commitment_tx, preimages);
}
@Override public Result_NoneNoneZ validate_counterparty_revocation(long idx, byte[] secret) {
return underlying_base.validate_counterparty_revocation(idx, secret);
@Override public Result_SignatureNoneZ sign_closing_transaction(ClosingTransaction closing_tx) {
return underlying_base.sign_closing_transaction(closing_tx);
}
- @Override public Result_SignatureNoneZ sign_channel_announcement(UnsignedChannelAnnouncement msg) {
+ @Override public Result_C2Tuple_SignatureSignatureZNoneZ sign_channel_announcement(UnsignedChannelAnnouncement msg) {
return underlying_base.sign_channel_announcement(msg);
}
@Override public void ready_channel(ChannelTransactionParameters params) {
}
@Override
- public Result_RecoverableSignatureNoneZ sign_invoice(byte[] invoice_preimage) {
- return underlying_if.sign_invoice(invoice_preimage);
+ public Result_RecoverableSignatureNoneZ sign_invoice(byte[] hrp_bytes, UInt5[] invoice_data, Recipient receipient) {
+ return underlying_if.sign_invoice(hrp_bytes, invoice_data, receipient);
+ }
+
+ @Override
+ public byte[] get_inbound_payment_key_material() {
+ return underlying_if.get_inbound_payment_key_material();
}
});
}
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, fee_estimator, logger);
- assert update_res instanceof Result_NoneMonitorUpdateErrorZ.Result_NoneMonitorUpdateErrorZ_OK;
+ Result_NoneNoneZ update_res = monitors.get(txid).update_monitor(update, tx_broadcaster, fee_estimator, logger);
+ assert update_res instanceof Result_NoneNoneZ.Result_NoneNoneZ_OK;
}
return Result_NoneChannelMonitorUpdateErrZ.ok();
}
InvoicePayer payer = null;
GcCheck obj = new GcCheck();
- private TwoTuple_OutPointScriptZ test_mon_roundtrip(ChannelMonitor mon) {
+ private ChannelMonitor test_mon_roundtrip(OutPoint expected_id, byte[] data) {
// 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.C2Tuple_BlockHashChannelMonitorZ_read(mon.write(), keys_interface);
+ Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ roundtrip_monitor = UtilMethods.C2Tuple_BlockHashChannelMonitorZ_read(data, keys_interface);
assert roundtrip_monitor instanceof Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ.Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_OK;
TwoTuple_OutPointScriptZ funding_txo = ((Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ.Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_OK) roundtrip_monitor).res.get_b().get_funding_txo();
System.gc(); System.runFinalization(); // Give the GC a chance to run.
- return funding_txo;
+ assert Arrays.equals(funding_txo.get_a().get_txid(), expected_id.get_txid());
+ assert funding_txo.get_a().get_index() == expected_id.get_index();
+ Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ roundtrip_two = UtilMethods.C2Tuple_BlockHashChannelMonitorZ_read(data, keys_interface);
+ assert roundtrip_two instanceof Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ.Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_OK;
+ return ((Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ.Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_OK) roundtrip_two).res.get_b();
}
private Peer(Object _dummy, byte seed) {
- logger = Logger.new_impl((Record arg)->{
+ logger = Logger.new_impl((org.ldk.structs.Record arg)->{
if (arg.get_level() == Level.LDKLevel_Error)
System.err.println(seed + ": " + arg.get_module_path() + " - " + arg.get_args());
else
public Result_NoneChannelMonitorUpdateErrZ persist_new_channel(OutPoint id, ChannelMonitor data, MonitorUpdateId update_id) {
synchronized (monitors) {
String key = Arrays.toString(id.to_channel_id());
- assert monitors.put(key, data) == null;
- TwoTuple_OutPointScriptZ res = test_mon_roundtrip(data);
- assert Arrays.equals(res.get_a().get_txid(), id.get_txid());
- assert res.get_a().get_index() == id.get_index();
+ ChannelMonitor res = test_mon_roundtrip(id, data.write());
+ assert monitors.put(key, res) == null;
}
return Result_NoneChannelMonitorUpdateErrZ.ok();
}
public Result_NoneChannelMonitorUpdateErrZ update_persisted_channel(OutPoint id, ChannelMonitorUpdate update, ChannelMonitor data, MonitorUpdateId update_id) {
synchronized (monitors) {
String key = Arrays.toString(id.to_channel_id());
- assert monitors.put(key, data) != null;
- TwoTuple_OutPointScriptZ res = test_mon_roundtrip(data);
- assert Arrays.equals(res.get_a().get_txid(), id.get_txid());
- assert res.get_a().get_index() == id.get_index();
+ ChannelMonitor res = test_mon_roundtrip(id, data.write());
+ // Note that we use a serialization-roundtrip copy of data here, not the original, as this can
+ // expose the JVM JIT bug where it finalize()s things still being called.
+ assert monitors.put(key, res) != null;
}
return Result_NoneChannelMonitorUpdateErrZ.ok();
}
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);
}
- LockableScore scorer = null;
- if (use_invoice_payer) { scorer = LockableScore.of(Scorer.with_default().as_Score()); }
+ Result_ScorerDecodeErrorZ score_res = Scorer.read(Scorer.with_default().write());
+ assert score_res.is_ok();
+ Score score = ((Result_ScorerDecodeErrorZ.Result_ScorerDecodeErrorZ_OK) score_res).res.as_Score();
+ MultiThreadedLockableScore scorer = null;
+ if (use_invoice_payer) { scorer = MultiThreadedLockableScore.of(score); }
constructor.chain_sync_completed(new ChannelManagerConstructor.EventHandler() {
@Override public void handle_event(Event event) {
synchronized (pending_manager_events) {
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(), route_handler.as_RoutingMessageHandler(), keys_interface.get_node_secret(), random_data, logger, this.custom_message_handler);
+ Result_SecretKeyNoneZ node_secret = keys_interface.get_node_secret(Recipient.LDKRecipient_Node);
+ assert node_secret.is_ok();
+ this.peer_manager = PeerManager.of(chan_manager.as_ChannelMessageHandler(), route_handler.as_RoutingMessageHandler(),
+ ((Result_SecretKeyNoneZ.Result_SecretKeyNoneZ_OK)node_secret).res, random_data, logger, this.custom_message_handler);
if (use_invoice_payer) {
this.payer = InvoicePayer.of(this.chan_manager.as_Payer(), Router.new_impl(new Router.RouterInterface() {
@Override
- public Result_RouteLightningErrorZ find_route(byte[] payer, RouteParameters params, ChannelDetails[] first_hops, Score scorer) {
+ public Result_RouteLightningErrorZ find_route(byte[] payer, RouteParameters params, byte[] payment_hash, ChannelDetails[] first_hops, Score scorer) {
return UtilMethods.find_route(payer, params, router, first_hops, logger, scorer);
}
- }), LockableScore.of(Score.new_impl(new Score.ScoreInterface() {
+ }), MultiThreadedLockableScore.of(Score.new_impl(new Score.ScoreInterface() {
@Override public void payment_path_failed(RouteHop[] path, long scid) {}
- @Override public long channel_penalty_msat(long scid, NodeId src, NodeId dst) { return 0; }
+ @Override public long channel_penalty_msat(long short_channel_id, long send_amt_msat, long channel_capacity_msat, NodeId source, NodeId target) { return 0; }
+ @Override public void payment_path_successful(RouteHop[] path) {}
@Override public byte[] write() { assert false; return null; }
})), logger, EventHandler.new_impl(new EventHandler.EventHandlerInterface() {
@Override public void handle_event(Event event) {
this.constructor = new ChannelManagerConstructor(serialized, monitors, UserConfig.with_default(),
this.keys_interface, this.fee_estimator, this.chain_monitor, filter_nullable,
this.router, this.tx_broadcaster, this.logger);
+ try {
+ // Test that ChannelManagerConstructor correctly rejects duplicate ChannelMonitors
+ byte[][] monitors_dupd = new byte[2][];
+ monitors_dupd[0] = monitors[0];
+ monitors_dupd[1] = monitors[0];
+ ChannelManagerConstructor constr = this.constructor = new ChannelManagerConstructor(serialized, monitors_dupd, UserConfig.with_default(),
+ this.keys_interface, this.fee_estimator, this.chain_monitor, filter_nullable,
+ null, this.tx_broadcaster, this.logger);
+ assert false;
+ } catch (ChannelManagerConstructor.InvalidSerializedDataException e) {}
}
- LockableScore scorer = null;
- if (use_invoice_payer) { scorer = LockableScore.of(Scorer.with_default().as_Score()); }
+ MultiThreadedLockableScore scorer = null;
+ if (use_invoice_payer) { scorer = MultiThreadedLockableScore.of(Scorer.with_default().as_Score()); }
constructor.chain_sync_completed(new ChannelManagerConstructor.EventHandler() {
@Override public void handle_event(Event event) {
synchronized (pending_manager_events) {
this.chan_manager = ((Result_C2Tuple_BlockHashChannelManagerZDecodeErrorZ.Result_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_OK) read_res).res.get_b();
this.chain_watch.watch_channel(monitors[0].get_funding_txo().get_a(), monitors[0]);
byte[] random_data = keys_interface.get_secure_random_bytes();
- this.peer_manager = PeerManager.of(chan_manager.as_ChannelMessageHandler(), route_handler.as_RoutingMessageHandler(), keys_interface.get_node_secret(), random_data, logger, this.custom_message_handler);
+ Result_SecretKeyNoneZ node_secret = keys_interface.get_node_secret(Recipient.LDKRecipient_Node);
+ assert node_secret.is_ok();
+ this.peer_manager = PeerManager.of(chan_manager.as_ChannelMessageHandler(), route_handler.as_RoutingMessageHandler(),
+ ((Result_SecretKeyNoneZ.Result_SecretKeyNoneZ_OK)node_secret).res,
+ random_data, logger, this.custom_message_handler);
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
if (use_invoice_payer) {
this.payer = InvoicePayer.of(this.chan_manager.as_Payer(), Router.new_impl(new Router.RouterInterface() {
@Override
- public Result_RouteLightningErrorZ find_route(byte[] payer, RouteParameters params, ChannelDetails[] first_hops, Score scorer) {
+ public Result_RouteLightningErrorZ find_route(byte[] payer, RouteParameters params, byte[] _payment_hash, ChannelDetails[] first_hops, Score scorer) {
return UtilMethods.find_route(payer, params, router, first_hops, logger, scorer);
}
- }), LockableScore.of(Score.new_impl(new Score.ScoreInterface() {
+ }), MultiThreadedLockableScore.of(Score.new_impl(new Score.ScoreInterface() {
+ @Override public long channel_penalty_msat(long short_channel_id, long send_amt_msat, long channel_capacity_msat, NodeId source, NodeId target) { return 0; }
@Override public void payment_path_failed(RouteHop[] path, long scid) {}
- @Override public long channel_penalty_msat(long scid, NodeId src, NodeId dst) { return 0; }
+ @Override public void payment_path_successful(RouteHop[] path) {}
@Override public byte[] write() { assert false; return null; }
})), logger, EventHandler.new_impl(new EventHandler.EventHandlerInterface() {
@Override public void handle_event(Event event) {
if (use_chan_manager_constructor) {
while (res.length < expected_len) {
synchronized (this.pending_manager_events) {
- res = this.pending_manager_events.toArray(res);
- assert res.length == expected_len || res.length == 0; // We don't handle partial results
- this.pending_manager_events.clear();
+ if (this.pending_manager_events.size() >= expected_len) {
+ res = this.pending_manager_events.toArray(res);
+ assert res.length == expected_len;
+ this.pending_manager_events.clear();
+ }
if (res.length < expected_len) {
try { this.pending_manager_events.wait(); } catch (InterruptedException e) { assert false; }
}
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]);
}
InvoiceFeatures invoice_features = ((Result_InvoiceSignOrCreationErrorZ.Result_InvoiceSignOrCreationErrorZ_OK) invoice).res.features();
RouteHint[] route_hints = ((Result_InvoiceSignOrCreationErrorZ.Result_InvoiceSignOrCreationErrorZ_OK) invoice).res.route_hints();
- Payee payee = Payee.of(peer2.node_id, invoice_features, route_hints, Option_u64Z.none());
+ PaymentParameters payee = PaymentParameters.of(peer2.node_id, invoice_features, route_hints, Option_u64Z.none(), 6*24*14);
RouteParameters route_params = RouteParameters.of(payee, 10000000, 42);
Result_RouteLightningErrorZ route_res = UtilMethods.find_route(
peer1.chan_manager.get_our_node_id(), route_params, peer1.router,
assert !Arrays.equals(payment_preimage, new byte[32]);
state.peer2.chan_manager.claim_funds(payment_preimage);
- events = state.peer1.get_manager_events(1, state.peer1, state.peer2);
+ events = state.peer1.get_manager_events(2, state.peer1, state.peer2);
assert events[0] instanceof Event.PaymentSent;
assert Arrays.equals(((Event.PaymentSent) events[0]).payment_preimage, payment_preimage);
+ assert events[1] instanceof Event.PaymentPathSuccessful;
+ assert Arrays.equals(((Event.PaymentPathSuccessful) events[1]).payment_hash, ((Event.PaymentSent) events[0]).payment_hash);
if (use_nio_peer_handler) {
// We receive PaymentSent immediately upon receipt of the payment preimage, but we expect to not have an
}
}
public class HumanObjectPeerTest {
- HumanObjectPeerTestInstance do_test_run(boolean nice_close, boolean use_km_wrapper, boolean use_manual_watch, boolean reload_peers, boolean break_cross_peer_refs, boolean nio_peer_handler, boolean use_ignoring_routing_handler, boolean use_chan_manager_constructor, boolean use_invoice_payer) throws InterruptedException {
+ static HumanObjectPeerTestInstance do_test_run(boolean nice_close, boolean use_km_wrapper, boolean use_manual_watch, boolean reload_peers, boolean break_cross_peer_refs, boolean nio_peer_handler, boolean use_ignoring_routing_handler, boolean use_chan_manager_constructor, boolean use_invoice_payer) throws InterruptedException {
HumanObjectPeerTestInstance instance = new HumanObjectPeerTestInstance(nice_close, use_km_wrapper, use_manual_watch, reload_peers, break_cross_peer_refs, nio_peer_handler, !nio_peer_handler, use_ignoring_routing_handler, use_chan_manager_constructor, use_invoice_payer);
HumanObjectPeerTestInstance.TestState state = instance.do_test_message_handler();
instance.do_test_message_handler_b(state);
return instance;
}
- void do_test(boolean nice_close, boolean use_km_wrapper, boolean use_manual_watch, boolean reload_peers, boolean break_cross_peer_refs, boolean nio_peer_handler, boolean use_ignoring_routing_handler, boolean use_chan_manager_constructor, boolean use_invoice_payer) throws InterruptedException {
+ static void do_test(boolean nice_close, boolean use_km_wrapper, boolean use_manual_watch, boolean reload_peers, boolean break_cross_peer_refs, boolean nio_peer_handler, boolean use_ignoring_routing_handler, boolean use_chan_manager_constructor, boolean use_invoice_payer) throws InterruptedException {
HumanObjectPeerTestInstance instance = do_test_run(nice_close, use_km_wrapper, use_manual_watch, reload_peers, break_cross_peer_refs, nio_peer_handler, use_ignoring_routing_handler, use_chan_manager_constructor, use_invoice_payer);
while (instance.gc_count != instance.gc_exp_count) {
System.gc();
for (WeakReference<Object> o : instance.must_free_objs)
assert o.get() == null;
}
- @Test
- public void test_message_handler() throws InterruptedException {
- for (int i = 0; i < (1 << 9) - 1; i++) {
+ public static final int TEST_ITERATIONS = (1 << 9);
+ public static void do_test_message_handler(IntConsumer statusFunction) throws InterruptedException {
+ Thread gc_thread = new Thread(() -> {
+ while (true) {
+ System.gc();
+ System.runFinalization();
+ try { Thread.sleep(0, 1); } catch (InterruptedException e) { break; }
+ }
+ }, "Test GC Thread");
+ gc_thread.start();
+ for (int i = 0; i < TEST_ITERATIONS; i++) {
boolean nice_close = (i & (1 << 0)) != 0;
boolean use_km_wrapper = (i & (1 << 1)) != 0;
boolean use_manual_watch = (i & (1 << 2)) != 0;
// InvoicePayer to send payments in this case.
continue;
}
- System.err.println("Running test with flags " + i);
+ statusFunction.accept(i);
do_test(nice_close, use_km_wrapper, use_manual_watch, reload_peers, break_cross_refs, nio_peer_handler, use_ignoring_routing_handler, use_chan_manager_constructor, use_invoice_payer);
}
+ gc_thread.interrupt();
+ gc_thread.join();
+ }
+ @Test
+ public void test_message_handler() throws InterruptedException {
+ do_test_message_handler(i -> System.err.println("Running test with flags " + i));
}
// 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();
+ do_test_message_handler(i -> System.err.println("Running test with flags " + i));
} catch (Exception e) {
System.err.println("Caught exception:");
System.err.println(e);
projects / ldk-java / blobdiff