import org.ldk.impl.bindings;
import org.ldk.enums.*;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
-import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
public class PeerTest {
final long 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;
+ bindings.LDKFeeEstimator fee_est;
+ bindings.LDKBroadcasterInterface broad_trait;
+ bindings.LDKLogger log_trait;
+ bindings.LDKWatch watcher;
Peer(byte seed) {
- logger = bindings.LDKLogger_new((String arg)-> System.out.println(seed + ": " + arg));
- this.fee_estimator = bindings.LDKFeeEstimator_new(confirmation_target -> 0);
- this.tx_broadcaster = bindings.LDKBroadcasterInterface_new(tx -> {
+ this.log_trait = (String arg)-> System.out.println(seed + ": " + arg);
+ logger = bindings.LDKLogger_new(this.log_trait);
+ this.fee_est = confirmation_target -> 0;
+ this.fee_estimator = bindings.LDKFeeEstimator_new(this.fee_est);
+ this.broad_trait = tx -> {
// We should broadcast
- });
+ };
+ this.tx_broadcaster = bindings.LDKBroadcasterInterface_new(this.broad_trait);
this.monitors = new HashMap<>();
- this.chain_monitor = bindings.LDKWatch_new(new bindings.LDKWatch() {
+ this.watcher = new bindings.LDKWatch() {
@Override
public long watch_channel(long funding_txo, long monitor) {
synchronized (monitors) {
bindings.CResult_NoneMonitorUpdateErrorZ_free(update_res);
}
bindings.OutPoint_free(funding_txo);
- //bindings.ChannelMonitorUpdate_free(update); We'll need this after 681
+ bindings.ChannelMonitorUpdate_free(update);
return bindings.CResult_NoneChannelMonitorUpdateErrZ_ok();
}
}
return bindings.new_empty_slice_vec();
}
- });
+ };
+ this.chain_monitor = bindings.LDKWatch_new(this.watcher);
byte[] key_seed = new byte[32];
for (byte i = 0; i < 32; i++) { key_seed[i] = (byte) (i ^ seed); }
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, bindings.LDKKeysInterface_call_get_node_secret(keys_interface), random_data, logger);
+ this.peer_manager = bindings.PeerManager_new(message_handler, bindings.KeysInterface_get_node_secret(keys_interface), random_data, logger);
}
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.Watch_free(chain_monitor);
bindings.KeysManager_free(keys);
bindings.KeysInterface_free(keys_interface);
+ bindings.UserConfig_free(config);
bindings.ChannelManager_free(chan_manager);
bindings.EventsProvider_free(chan_manager_events);
bindings.ChannelMessageHandler_free(chan_handler);
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);
+ void do_read_event(ConcurrentLinkedQueue<Thread> list, long pm, long descriptor, byte[] arr) {
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, descriptor, arr);
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;
}
@Test
ConcurrentLinkedQueue<Thread> list = new ConcurrentLinkedQueue<Thread>();
LongHolder descriptor1 = new LongHolder();
LongHolder descriptor1ref = descriptor1;
- long descriptor2 = bindings.LDKSocketDescriptor_new(new bindings.LDKSocketDescriptor() {
+ 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; }
@Override public boolean eq(long other_arg) { return bindings.LDKSocketDescriptor_get_obj_from_jcalls(other_arg).hash() == 2; }
@Override public long hash() { return 2; }
- });
+ };
+ long descriptor2 = bindings.LDKSocketDescriptor_new(sock1);
- descriptor1.val = bindings.LDKSocketDescriptor_new(new bindings.LDKSocketDescriptor() {
+ 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; }
@Override public boolean eq(long other_arg) { return bindings.LDKSocketDescriptor_get_obj_from_jcalls(other_arg).hash() == 1; }
@Override public long hash() { return 1; }
- });
+ };
+ descriptor1.val = bindings.LDKSocketDescriptor_new(sock2);
long init_vec = bindings.PeerManager_new_outbound_connection(peer1.peer_manager, 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);
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(); }
bindings.PeerManager_process_events(peer2.peer_manager);
while (!list.isEmpty()) { list.poll().join(); }
- long events = bindings.LDKEventsProvider_call_get_and_clear_pending_events(peer1.chan_manager_events);
+ long events = bindings.EventsProvider_get_and_clear_pending_events(peer1.chan_manager_events);
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.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));
- bindings.ChannelManager_funding_transaction_generated(peer1.chan_manager, chan_id, bindings.OutPoint_new(funding.getTxId().getReversedBytes(), (short) 0));
+ long funding_txo = bindings.OutPoint_new(funding.getTxId().getReversedBytes(), (short) 0);
+ bindings.ChannelManager_funding_transaction_generated(peer1.chan_manager, chan_id, funding_txo);
+ bindings.OutPoint_free(funding_txo);
bindings.PeerManager_process_events(peer1.peer_manager);
while (!list.isEmpty()) { list.poll().join(); }
bindings.PeerManager_process_events(peer2.peer_manager);
while (!list.isEmpty()) { list.poll().join(); }
- events = bindings.LDKEventsProvider_call_get_and_clear_pending_events(peer1.chan_manager_events);
+ events = bindings.EventsProvider_get_and_clear_pending_events(peer1.chan_manager_events);
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);
bindings.PeerManager_process_events(peer1.peer_manager);
while (!list.isEmpty()) { list.poll().join(); }
- long peer2_events = bindings.LDKEventsProvider_call_get_and_clear_pending_events(peer2.chan_manager_events);
+ long peer2_events = bindings.EventsProvider_get_and_clear_pending_events(peer2.chan_manager_events);
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);
- peer2_events = bindings.LDKEventsProvider_call_get_and_clear_pending_events(peer2.chan_manager_events);
+ peer2_events = bindings.EventsProvider_get_and_clear_pending_events(peer2.chan_manager_events);
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);
bindings.PeerManager_process_events(peer1.peer_manager);
while (!list.isEmpty()) { list.poll().join(); }
- long peer1_events = bindings.LDKEventsProvider_call_get_and_clear_pending_events(peer1.chan_manager_events);
+ long peer1_events = bindings.EventsProvider_get_and_clear_pending_events(peer1.chan_manager_events);
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);