import org.bitcoinj.script.Script;
import org.junit.jupiter.api.Test;
import org.ldk.enums.Network;
+import org.ldk.enums.Recipient;
import org.ldk.impl.bindings;
+import java.lang.ref.Reference;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
bindings.LDKBroadcasterInterface broad_trait;
bindings.LDKLogger log_trait;
bindings.LDKWatch watcher;
- ArrayList<Long> results_to_free;
Peer(byte seed) {
- this.log_trait = (String arg)-> System.out.println(seed + ": " + arg);
+ this.log_trait = (long arg) -> {
+ System.out.println(seed + ": " + bindings.Record_get_args(arg));
+ bindings.Record_free(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.results_to_free = new ArrayList<>();
this.tx_broadcaster = bindings.LDKBroadcasterInterface_new(this.broad_trait);
this.monitors = new HashMap<>();
this.watcher = new bindings.LDKWatch() {
assert monitors.put(Arrays.toString(bindings.OutPoint_get_txid(funding_txo)), monitor) == null;
}
bindings.OutPoint_free(funding_txo);
- long res = bindings.CResult_NoneChannelMonitorUpdateErrZ_ok();
- results_to_free.add(res);
- return res;
+ return bindings.CResult_NoneChannelMonitorUpdateErrZ_ok();
}
@Override
String txid = Arrays.toString(bindings.OutPoint_get_txid(funding_txo));
assert monitors.containsKey(txid);
long update_res = bindings.ChannelMonitor_update_monitor(monitors.get(txid), update, tx_broadcaster, fee_estimator, logger);
- assert bindings.LDKCResult_NoneMonitorUpdateErrorZ_result_ok(update_res);
- bindings.CResult_NoneMonitorUpdateErrorZ_free(update_res);
+ assert bindings.CResult_NoneNoneZ_is_ok(update_res);
+ bindings.CResult_NoneNoneZ_free(update_res);
}
bindings.OutPoint_free(funding_txo);
bindings.ChannelMonitorUpdate_free(update);
- long res = bindings.CResult_NoneChannelMonitorUpdateErrZ_ok();
- results_to_free.add(res);
- return res;
+ return bindings.CResult_NoneChannelMonitorUpdateErrZ_ok();
}
@Override
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.KeysInterface_get_node_secret(keys_interface), random_data,
- logger, bindings.IgnoringMessageHandler_as_CustomMessageHandler(this.custom_message_handler));
+
+ long node_id_result = bindings.KeysInterface_get_node_secret(keys_interface, Recipient.LDKRecipient_Node);
+ assert bindings.CResult_SecretKeyNoneZ_is_ok(node_id_result);
+ this.peer_manager = bindings.PeerManager_new(message_handler, bindings.CResult_SecretKeyNoneZ_get_ok(node_id_result),
+ random_data, logger, bindings.IgnoringMessageHandler_as_CustomMessageHandler(this.custom_message_handler));
+ bindings.CResult_SecretKeyNoneZ_free(node_id_result);
}
void connect_block(Block b, Transaction t, int height) {
bindings.ChannelMonitor_free(mon);
}
}
- for (Long res : results_to_free) {
- bindings.CResult_NoneChannelMonitorUpdateErrZ_free(res);
- }
}
}
void do_read_event(ConcurrentLinkedQueue<Thread> list, long pm, long descriptor, byte[] arr) {
Thread thread = new Thread(() -> {
long res = bindings.PeerManager_read_event(pm, descriptor, arr);
- assert bindings.LDKCResult_boolPeerHandleErrorZ_result_ok(res);
+ assert bindings.CResult_boolPeerHandleErrorZ_is_ok(res);
//assert bindings.deref_bool(bindings.LDKCResult_boolPeerHandleErrorZ_get_inner(res));
bindings.CResult_boolPeerHandleErrorZ_free(res);
});
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));
+ assert(bindings.CResult_CVec_u8ZPeerHandleErrorZ_is_ok(init_vec));
long con_res = bindings.PeerManager_new_inbound_connection(peer2.peer_manager, descriptor2);
- assert(bindings.LDKCResult_NonePeerHandleErrorZ_result_ok(con_res));
+ assert(bindings.CResult_NonePeerHandleErrorZ_is_ok(con_res));
bindings.CResult_NonePeerHandleErrorZ_free(con_res);
- do_read_event(list, peer2.peer_manager, descriptor2, bindings.LDKCResult_CVec_u8ZPeerHandleErrorZ_get_ok(init_vec));
+ do_read_event(list, peer2.peer_manager, descriptor2, bindings.CResult_CVec_u8ZPeerHandleErrorZ_get_ok(init_vec));
bindings.CResult_CVec_u8ZPeerHandleErrorZ_free(init_vec);
deliver_peer_messages(list, peer1.peer_manager, peer2.peer_manager);
long cc_res = bindings.ChannelManager_create_channel(peer1.chan_manager, peer2.node_id, 10000, 1000, 42, 0);
- assert bindings.LDKCResult_NoneAPIErrorZ_result_ok(cc_res);
+ assert bindings.CResult_NoneAPIErrorZ_is_ok(cc_res);
bindings.CResult_NoneAPIErrorZ_free(cc_res);
deliver_peer_messages(list, peer1.peer_manager, peer2.peer_manager);
ArrayList<Long> events = new ArrayList();
- long handler = bindings.LDKEventHandler_new(events::add);
+ bindings.LDKEventHandler events_adder = events::add;
+ long handler = bindings.LDKEventHandler_new(events_adder);
bindings.EventsProvider_process_pending_events(peer1.chan_manager_events, handler);
assert events.size() == 1;
for (long chan : peer2_chans) bindings.ChannelDetails_free(chan);
long no_min_val = bindings.COption_u64Z_none();
- long inbound_payment = bindings.ChannelManager_create_inbound_payment(peer2.chan_manager, no_min_val, 7200, 42);
+ long inbound_payment = bindings.ChannelManager_create_inbound_payment(peer2.chan_manager, no_min_val, 7200);
+ assert bindings.CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_is_ok(inbound_payment);
+ long payment_tuple = bindings.CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_get_ok(inbound_payment);
bindings.COption_u64Z_free(no_min_val);
long scorer = bindings.Scorer_default();
long scorer_interface = bindings.Scorer_as_Score(scorer);
long no_u64 = bindings.COption_u64Z_none();
long invoice_features = bindings.InvoiceFeatures_known();
- long payee = bindings.Payee_new(peer2.node_id, invoice_features, new long[0], no_u64);
+ long payee = bindings.PaymentParameters_new(peer2.node_id, invoice_features, new long[0], no_u64, 6*24*14);
bindings.InvoiceFeatures_free(invoice_features);
bindings.COption_u64Z_free(no_u64);
long route_params = bindings.RouteParameters_new(payee, 1000, 42);
long route = bindings.find_route(peer1.node_id, route_params, peer1.router, peer1_chans,
peer1.logger, scorer_interface);
bindings.RouteParameters_free(route_params);
- bindings.Payee_free(payee);
+ bindings.PaymentParameters_free(payee);
bindings.Score_free(scorer_interface);
bindings.Scorer_free(scorer);
for (long chan : peer1_chans) bindings.ChannelDetails_free(chan);
- assert bindings.LDKCResult_RouteLightningErrorZ_result_ok(route);
- long payment_res = bindings.ChannelManager_send_payment(peer1.chan_manager, bindings.LDKCResult_RouteLightningErrorZ_get_ok(route),
- bindings.C2Tuple_PaymentHashPaymentSecretZ_get_a(inbound_payment), bindings.C2Tuple_PaymentHashPaymentSecretZ_get_b(inbound_payment));
+ assert bindings.CResult_RouteLightningErrorZ_is_ok(route);
+ long payment_res = bindings.ChannelManager_send_payment(peer1.chan_manager, bindings.CResult_RouteLightningErrorZ_get_ok(route),
+ bindings.C2Tuple_PaymentHashPaymentSecretZ_get_a(payment_tuple), bindings.C2Tuple_PaymentHashPaymentSecretZ_get_b(payment_tuple));
bindings.CResult_RouteLightningErrorZ_free(route);
- bindings.C2Tuple_PaymentHashPaymentSecretZ_free(inbound_payment);
- assert bindings.LDKCResult_NonePaymentSendFailureZ_result_ok(payment_res);
+ bindings.CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_is_ok(inbound_payment);
+ assert bindings.CResult_NonePaymentSendFailureZ_is_ok(payment_res);
bindings.CResult_NonePaymentSendFailureZ_free(payment_res);
deliver_peer_messages(list, peer1.peer_manager, peer2.peer_manager);
deliver_peer_messages(list, peer1.peer_manager, peer2.peer_manager);
bindings.EventsProvider_process_pending_events(peer1.chan_manager_events, handler);
- assert events.size() == 1;
+ assert events.size() == 2;
bindings.LDKEvent sent = bindings.LDKEvent_ref_from_ptr(events.get(0));
assert sent instanceof bindings.LDKEvent.PaymentSent;
bindings.Event_free(events.remove(0));
+ bindings.LDKEvent sent_path = bindings.LDKEvent_ref_from_ptr(events.get(0));
+ assert sent_path instanceof bindings.LDKEvent.PaymentPathSuccessful;
+ bindings.Event_free(events.remove(0));
+ Reference.reachabilityFence(events_adder);
bindings.EventHandler_free(handler);
projects / ldk-java / blobdiff