package org.ldk;
+import com.google.j2objc.annotations.Weak;
import org.bitcoinj.core.*;
import org.bitcoinj.script.Script;
import org.junit.jupiter.api.Test;
final KeysInterface keys_interface;
final ChannelManager chan_manager;
final EventsProvider chan_manager_events;
- final long chan_handler;
- final long router;
- final long route_handler;
- final long message_handler;
- final long peer_manager;
+ final NetGraphMsgHandler router;
+ final PeerManager peer_manager;
HashMap<String, Long> monitors; // Wow I forgot just how terrible Java is - we can't put a byte array here.
byte[] node_id;
}), new Logger(log_trait), keys.as_KeysInterface(), new UserConfig(), 1);
this.node_id = chan_manager.get_our_node_id();
this.chan_manager_events = chan_manager.as_EventsProvider();
-
- this.chan_handler = bindings.ChannelManager_as_ChannelMessageHandler(chan_manager._test_only_get_ptr());
- this.router = bindings.NetGraphMsgHandler_new(0, logger);
- this.route_handler = bindings.NetGraphMsgHandler_as_RoutingMessageHandler(router);
- this.message_handler = bindings.MessageHandler_new(chan_handler, route_handler);
+ this.router = new NetGraphMsgHandler(null, new Logger(log_trait));
byte[] random_data = new byte[32];
for (byte i = 0; i < 32; i++) {
random_data[i] = (byte) ((i ^ seed) ^ 0xf0);
}
- this.peer_manager = bindings.PeerManager_new(message_handler, keys_interface.call_get_node_secret(), random_data, logger);
+ this.peer_manager = new PeerManager(chan_manager.as_ChannelMessageHandler(), router.as_RoutingMessageHandler(), keys_interface.get_node_secret(), random_data, new Logger(log_trait));
System.gc();
}
void connect_block(Block b, Transaction t, int height) {
- byte[] header = b.bitcoinSerialize();
+ byte[] header = Arrays.copyOfRange(b.bitcoinSerialize(), 0, 80);
long txn;
if (t != null)
txn = bindings.LDKCVecTempl_C2TupleTempl_usize__Transaction_new(
bindings.Logger_free(logger);
bindings.FeeEstimator_free(fee_estimator);
bindings.BroadcasterInterface_free(tx_broadcaster);
- bindings.ChannelMessageHandler_free(chan_handler);
- bindings.NetGraphMsgHandler_free(router);
- bindings.RoutingMessageHandler_free(route_handler);
- //MessageHandler was actually moved into the route_handler!: bindings.MessageHandler_free(message_handler);
- bindings.PeerManager_free(peer_manager);
synchronized (monitors) {
for (Long mon : monitors.values()) {
bindings.ChannelMonitor_free(mon);
}
}
}
+
+ long get_route(byte[] dest_node, long our_chans) {
+ LockedNetworkGraph netgraph = this.router.read_locked_graph();
+ //r = new WeakReference(netgraph);
+ NetworkGraph graph = netgraph.graph();
+ return bindings.get_route(this.node_id, graph._test_only_get_ptr(), dest_node, our_chans,
+ bindings.LDKCVecTempl_RouteHint_new(new long[0]), 1000, 42, this.logger);
+ }
}
class LongHolder { long val; }
- byte[] do_read_event(ConcurrentLinkedQueue<Thread> list, long pm, long descriptor, long data) {
- byte[] arr = bindings.get_u8_slice_bytes(data);
+ java.util.LinkedList<WeakReference> must_free_objs = new java.util.LinkedList();
+ void do_read_event(ConcurrentLinkedQueue<Thread> list, PeerManager pm, long descriptor, byte[] data) {
Thread thread = new Thread(() -> {
- long arr_vec = bindings.bytes_to_u8_vec(arr);
- long res = bindings.PeerManager_read_event(pm, descriptor, arr_vec);
+ 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);
- bindings.CVec_u8Z_free(arr_vec);
});
thread.start();
list.add(thread);
- return arr;
+ must_free_objs.add(new WeakReference(data));
}
boolean gc_ran = false;
LongHolder descriptor1ref = descriptor1;
bindings.LDKSocketDescriptor sock1 = new bindings.LDKSocketDescriptor() {
@Override
- public long send_data(long data, boolean resume_read) {
- return do_read_event(list, peer1.peer_manager, descriptor1ref.val, data).length;
+ public long send_data(byte[] data, boolean resume_read) {
+ do_read_event(list, peer1.peer_manager, descriptor1ref.val, data);
+ return data.length;
}
@Override public void disconnect_socket() { assert false; }
bindings.LDKSocketDescriptor sock2 = new bindings.LDKSocketDescriptor() {
@Override
- public long send_data(long data, boolean resume_read) {
- return do_read_event(list, peer2.peer_manager, descriptor2, data).length;
+ public long send_data(byte[] data, boolean resume_read) {
+ do_read_event(list, peer2.peer_manager, descriptor2, data);
+ return data.length;
}
@Override public void disconnect_socket() { assert false; }
};
descriptor1.val = bindings.LDKSocketDescriptor_new(sock2);
- long init_vec = bindings.PeerManager_new_outbound_connection(peer1.peer_manager, peer2.node_id, descriptor1.val);
+ 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));
- long con_res = bindings.PeerManager_new_inbound_connection(peer2.peer_manager, descriptor2);
+ 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_inner(init_vec));
+ do_read_event(list, peer2.peer_manager, descriptor2, bindings.get_u8_slice_bytes(bindings.LDKCResult_CVec_u8ZPeerHandleErrorZ_get_inner(init_vec)));
bindings.CResult_CVec_u8ZPeerHandleErrorZ_free(init_vec);
while (!list.isEmpty()) { list.poll().join(); }
assert bindings.LDKCResult_NoneAPIErrorZ_result_ok(cc_res);
bindings.CResult_NoneAPIErrorZ_free(cc_res);
- bindings.PeerManager_process_events(peer1.peer_manager);
+ peer1.peer_manager.process_events();
while (!list.isEmpty()) { list.poll().join(); }
- bindings.PeerManager_process_events(peer2.peer_manager);
+ peer2.peer_manager.process_events();
while (!list.isEmpty()) { list.poll().join(); }
- long events = bindings.EventsProvider_call_get_and_clear_pending_events(peer1.chan_manager_events._test_only_get_ptr());
+ long events = bindings.EventsProvider_get_and_clear_pending_events(peer1.chan_manager_events._test_only_get_ptr());
bindings.VecOrSliceDef events_arr_info = bindings.LDKCVecTempl_Event_arr_info(events);
assert events_arr_info.datalen == 1;
bindings.LDKEvent event = bindings.LDKEvent_ref_from_ptr(events_arr_info.dataptr);
funding.addOutput(Coin.SATOSHI.multiply(10000), new Script(funding_spk));
peer1.chan_manager.funding_transaction_generated(chan_id, new OutPoint(funding.getTxId().getReversedBytes(), (short) 0));
- bindings.PeerManager_process_events(peer1.peer_manager);
+ peer1.peer_manager.process_events();
while (!list.isEmpty()) { list.poll().join(); }
- bindings.PeerManager_process_events(peer2.peer_manager);
+ peer2.peer_manager.process_events();
while (!list.isEmpty()) { list.poll().join(); }
- events = bindings.EventsProvider_call_get_and_clear_pending_events(peer1.chan_manager_events._test_only_get_ptr());
+ events = bindings.EventsProvider_get_and_clear_pending_events(peer1.chan_manager_events._test_only_get_ptr());
events_arr_info = bindings.LDKCVecTempl_Event_arr_info(events);
assert events_arr_info.datalen == 1;
event = bindings.LDKEvent_ref_from_ptr(events_arr_info.dataptr);
peer2.connect_block(b, null, height);
}
- bindings.PeerManager_process_events(peer1.peer_manager);
- bindings.PeerManager_process_events(peer2.peer_manager);
+ peer1.peer_manager.process_events();
+ peer2.peer_manager.process_events();
while (!list.isEmpty()) { list.poll().join(); }
long peer1_chans = bindings.ChannelManager_list_channels(peer1.chan_manager._test_only_get_ptr());
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 netgraph = bindings.NetGraphMsgHandler_read_locked_graph(peer1.router);
- long route = bindings.get_route(peer1.node_id, bindings.LockedNetworkGraph_graph(netgraph), peer2.node_id, peer1_chans,
- bindings.LDKCVecTempl_RouteHint_new(new long[0]), 1000, 42, peer1.logger);
+ long route = peer1.get_route(peer2.node_id, peer1_chans);
+ System.gc(); // Force the lock to release that we took in get_route - we need something better here!
+ System.runFinalization();
bindings.CVec_ChannelDetailsZ_free(peer1_chans);
assert bindings.LDKCResult_RouteLightningErrorZ_result_ok(route);
- bindings.LockedNetworkGraph_free(netgraph);
long payment_res = bindings.ChannelManager_send_payment(peer1.chan_manager._test_only_get_ptr(), bindings.LDKCResult_RouteLightningErrorZ_get_inner(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);
- bindings.PeerManager_process_events(peer1.peer_manager);
+ peer1.peer_manager.process_events();
while (!list.isEmpty()) { list.poll().join(); }
- bindings.PeerManager_process_events(peer2.peer_manager);
+ peer2.peer_manager.process_events();
while (!list.isEmpty()) { list.poll().join(); }
- bindings.PeerManager_process_events(peer1.peer_manager);
+ peer1.peer_manager.process_events();
while (!list.isEmpty()) { list.poll().join(); }
- long peer2_events = bindings.EventsProvider_call_get_and_clear_pending_events(peer2.chan_manager_events._test_only_get_ptr());
+ long peer2_events = bindings.EventsProvider_get_and_clear_pending_events(peer2.chan_manager_events._test_only_get_ptr());
bindings.VecOrSliceDef event_arr_info = bindings.LDKCVecTempl_Event_arr_info(peer2_events);
assert event_arr_info.datalen == 1;
bindings.LDKEvent forwardable = bindings.LDKEvent_ref_from_ptr(event_arr_info.dataptr);
bindings.CVec_EventZ_free(peer2_events);
bindings.ChannelManager_process_pending_htlc_forwards(peer2.chan_manager._test_only_get_ptr());
- peer2_events = bindings.EventsProvider_call_get_and_clear_pending_events(peer2.chan_manager_events._test_only_get_ptr());
+ peer2_events = bindings.EventsProvider_get_and_clear_pending_events(peer2.chan_manager_events._test_only_get_ptr());
event_arr_info = bindings.LDKCVecTempl_Event_arr_info(peer2_events);
assert event_arr_info.datalen == 1;
bindings.LDKEvent payment_recvd = bindings.LDKEvent_ref_from_ptr(event_arr_info.dataptr);
peer2.chan_manager.claim_funds(payment_preimage, new byte[32], ((bindings.LDKEvent.PaymentReceived) payment_recvd).amt);
bindings.CVec_EventZ_free(peer2_events);
- bindings.PeerManager_process_events(peer2.peer_manager);
+ peer2.peer_manager.process_events();
while (!list.isEmpty()) { list.poll().join(); }
- bindings.PeerManager_process_events(peer1.peer_manager);
+ peer1.peer_manager.process_events();
while (!list.isEmpty()) { list.poll().join(); }
- long peer1_events = bindings.EventsProvider_call_get_and_clear_pending_events(peer1.chan_manager_events._test_only_get_ptr());
+ long peer1_events = bindings.EventsProvider_get_and_clear_pending_events(peer1.chan_manager_events._test_only_get_ptr());
event_arr_info = bindings.LDKCVecTempl_Event_arr_info(peer1_events);
assert event_arr_info.datalen == 1;
bindings.LDKEvent sent = bindings.LDKEvent_ref_from_ptr(event_arr_info.dataptr);
System.gc();
System.runFinalization();
}
+ for (WeakReference o : must_free_objs)
+ assert o.get() == null;
}
}
projects / ldk-java / blobdiff