package org.ldk;
import org.bitcoinj.core.*;
+import org.bitcoinj.core.Transaction;
import org.bitcoinj.script.Script;
import org.junit.jupiter.api.Test;
import org.ldk.enums.LDKNetwork;
}
@Override
- public long release_pending_monitor_events() {
+ public long[] release_pending_monitor_events() {
synchronized (monitors) {
assert monitors.size() <= 1;
for (Long mon : monitors.values()) {
return bindings.ChannelMonitor_get_and_clear_pending_monitor_events(mon);
}
}
- return bindings.new_empty_slice_vec();
+ return new long[0];
}
});
for (byte i = 0; i < 32; i++) {
key_seed[i] = (byte) (i ^ seed);
}
- this.keys = new KeysManager(key_seed, LDKNetwork.LDKNetwork_Bitcoin, System.currentTimeMillis() / 1000, (int) (System.currentTimeMillis() * 1000) & 0xffffffff);
+ this.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 = new ChannelManager(LDKNetwork.LDKNetwork_Bitcoin, new FeeEstimator(confirmation_target -> 0), chain_monitor,
+ this.chan_manager = ChannelManager.constructor_new(LDKNetwork.LDKNetwork_Bitcoin, new FeeEstimator(confirmation_target -> 0), chain_monitor,
new BroadcasterInterface(tx -> {
- }), new Logger(log_trait), keys.as_KeysInterface(), new UserConfig(), 1);
+ }), new Logger(log_trait), keys.as_KeysInterface(), UserConfig.constructor_default(), 1);
this.node_id = chan_manager.get_our_node_id();
this.chan_manager_events = chan_manager.as_EventsProvider();
- this.router = new NetGraphMsgHandler(null, new Logger(log_trait));
+ this.router = NetGraphMsgHandler.constructor_new(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 = new PeerManager(chan_manager.as_ChannelMessageHandler(), router.as_RoutingMessageHandler(), keys_interface.get_node_secret(), random_data, new Logger(log_trait));
+ this.peer_manager = PeerManager.constructor_new(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 = Arrays.copyOfRange(b.bitcoinSerialize(), 0, 80);
- long txn;
+ long[] txn;
if (t != null)
- txn = bindings.LDKCVecTempl_C2TupleTempl_usize__Transaction_new(
- new long[]{bindings.C2Tuple_usizeTransactionZ_new(1, bindings.new_txpointer_copy_data(t.bitcoinSerialize()))});
+ txn = new long[]{bindings.C2Tuple_usizeTransactionZ_new(1, bindings.new_txpointer_copy_data(t.bitcoinSerialize()))};
else
- txn = bindings.LDKCVecTempl_C2TupleTempl_usize__Transaction_new(new long[0]);
+ txn = new long[0];
bindings.ChannelManager_block_connected(chan_manager._test_only_get_ptr(), header, txn, height);
synchronized (monitors) {
for (Long mon : monitors.values()) {
if (t != null)
- txn = bindings.LDKCVecTempl_C2TupleTempl_usize__Transaction_new(
- new long[]{bindings.C2Tuple_usizeTransactionZ_new(1, bindings.new_txpointer_copy_data(t.bitcoinSerialize()))});
+ txn = new long[]{bindings.C2Tuple_usizeTransactionZ_new(1, bindings.new_txpointer_copy_data(t.bitcoinSerialize()))};
else
- txn = bindings.LDKCVecTempl_C2TupleTempl_usize__Transaction_new(new long[0]);
- long ret = bindings.ChannelMonitor_block_connected(mon, header, txn, height, tx_broadcaster, fee_estimator, logger);
- bindings.CVec_C2Tuple_TxidCVec_TxOutZZZ_free(ret);
+ txn = new long[0];
+ long[] ret = bindings.ChannelMonitor_block_connected(mon, header, txn, height, tx_broadcaster, fee_estimator, logger);
+ for (long r : ret) bindings.C2Tuple_TxidCVec_TxOutZZ_free(r);
}
}
}
}
}
- long get_route(byte[] dest_node, long our_chans) {
+ long get_route(byte[] dest_node, ChannelDetails[] our_chans) {
try (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);
+ return bindings.get_route(this.node_id, graph._test_only_get_ptr(), dest_node, new long[] {our_chans[0]._test_only_get_ptr()},
+ new long[0], 1000, 42, this.logger);
}
}
}
class LongHolder { long val; }
- java.util.LinkedList<WeakReference> must_free_objs = new java.util.LinkedList();
+ java.util.LinkedList<WeakReference<Object>> 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 res = bindings.PeerManager_read_event(pm._test_only_get_ptr(), descriptor, data);
});
thread.start();
list.add(thread);
- must_free_objs.add(new WeakReference(data));
+ must_free_objs.add(new WeakReference<>(data));
}
boolean gc_ran = false;
peer2.peer_manager.process_events();
while (!list.isEmpty()) { list.poll().join(); }
- 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);
+ long[] events = bindings.EventsProvider_get_and_clear_pending_events(peer1.chan_manager_events._test_only_get_ptr());
+ assert events.length == 1;
+ bindings.LDKEvent event = bindings.LDKEvent_ref_from_ptr(events[0]);
assert event instanceof bindings.LDKEvent.FundingGenerationReady;
assert ((bindings.LDKEvent.FundingGenerationReady) event).channel_value_satoshis == 10000;
assert ((bindings.LDKEvent.FundingGenerationReady) event).user_channel_id == 42;
funding.getInputs().get(0).setWitness(new TransactionWitness(2)); // Make sure we don't complain about lack of witness
funding.getInput(0).getWitness().setPush(0, new byte[]{0x1});
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));
+ 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(); }
while (!list.isEmpty()) { list.poll().join(); }
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);
+ assert events.length == 1;
+ event = bindings.LDKEvent_ref_from_ptr(events[0]);
assert event instanceof bindings.LDKEvent.FundingBroadcastSafe;
bindings.CVec_EventZ_free(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());
- long peer2_chans = bindings.ChannelManager_list_channels(peer2.chan_manager._test_only_get_ptr());
- assert bindings.vec_slice_len(peer1_chans) == 1;
- assert bindings.vec_slice_len(peer2_chans) == 1;
- long[] peer_1_chan_info = bindings.LDKCVecTempl_ChannelDetails_arr_info(peer1_chans);
- assert peer_1_chan_info.length == 1;
- assert bindings.ChannelDetails_get_channel_value_satoshis(peer_1_chan_info[0]) == 10000;
- assert bindings.ChannelDetails_get_is_live(peer_1_chan_info[0]);
- assert Arrays.equals(bindings.ChannelDetails_get_channel_id(peer_1_chan_info[0]), funding.getTxId().getReversedBytes());
- assert Arrays.equals(bindings.ChannelDetails_get_channel_id(bindings.LDKCVecTempl_ChannelDetails_arr_info(peer2_chans)[0]), funding.getTxId().getReversedBytes());
- bindings.CVec_ChannelDetailsZ_free(peer2_chans);
+ peer1.chan_manager.list_channels();
+ ChannelDetails[] peer1_chans = peer1.chan_manager.list_channels();
+ ChannelDetails[] peer2_chans = peer2.chan_manager.list_channels();
+ 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 Arrays.equals(peer1_chans[0].get_channel_id(), funding.getTxId().getReversedBytes());
+ assert Arrays.equals(peer2_chans[0].get_channel_id(), funding.getTxId().getReversedBytes());
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 route = peer1.get_route(peer2.node_id, peer1_chans);
- bindings.CVec_ChannelDetailsZ_free(peer1_chans);
assert bindings.LDKCResult_RouteLightningErrorZ_result_ok(route);
long payment_res = bindings.ChannelManager_send_payment(peer1.chan_manager._test_only_get_ptr(), bindings.LDKCResult_RouteLightningErrorZ_get_ok(route), payment_hash, new byte[32]);
bindings.CResult_RouteLightningErrorZ_free(route);
peer1.peer_manager.process_events();
while (!list.isEmpty()) { list.poll().join(); }
- 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);
+ long[] peer2_events = bindings.EventsProvider_get_and_clear_pending_events(peer2.chan_manager_events._test_only_get_ptr());
+ assert peer2_events.length == 1;
+ bindings.LDKEvent forwardable = bindings.LDKEvent_ref_from_ptr(peer2_events[0]);
assert forwardable instanceof bindings.LDKEvent.PendingHTLCsForwardable;
bindings.CVec_EventZ_free(peer2_events);
bindings.ChannelManager_process_pending_htlc_forwards(peer2.chan_manager._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);
+ assert peer2_events.length == 1;
+ bindings.LDKEvent payment_recvd = bindings.LDKEvent_ref_from_ptr(peer2_events[0]);
assert payment_recvd instanceof bindings.LDKEvent.PaymentReceived;
peer2.chan_manager.claim_funds(payment_preimage, new byte[32], ((bindings.LDKEvent.PaymentReceived) payment_recvd).amt);
bindings.CVec_EventZ_free(peer2_events);
peer1.peer_manager.process_events();
while (!list.isEmpty()) { list.poll().join(); }
- 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);
+ long[] peer1_events = bindings.EventsProvider_get_and_clear_pending_events(peer1.chan_manager_events._test_only_get_ptr());
+ assert peer1_events.length == 1;
+ bindings.LDKEvent sent = bindings.LDKEvent_ref_from_ptr(peer1_events[0]);
assert sent instanceof bindings.LDKEvent.PaymentSent;
assert Arrays.equals(((bindings.LDKEvent.PaymentSent) sent).payment_preimage, payment_preimage);
bindings.CVec_EventZ_free(peer1_events);
System.gc();
System.runFinalization();
}
- for (WeakReference o : must_free_objs)
+ for (WeakReference<Object> o : must_free_objs)
assert o.get() == null;
}
-}
+}
\ No newline at end of file
projects / ldk-java / blobdiff