final long chan_manager_events;
final long chan_handler;
final long router;
+ final long router_wrapper;
final long route_handler;
final long message_handler;
+ final long custom_message_handler;
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;
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);
+ assert bindings.CResult_NoneMonitorUpdateErrorZ_is_ok(update_res);
bindings.CResult_NoneMonitorUpdateErrorZ_free(update_res);
}
bindings.OutPoint_free(funding_txo);
this.chan_manager_events = bindings.ChannelManager_as_EventsProvider(chan_manager);
this.chan_handler = bindings.ChannelManager_as_ChannelMessageHandler(chan_manager);
- this.router = bindings.NetGraphMsgHandler_new(new byte[32], 0, logger);
- this.route_handler = bindings.NetGraphMsgHandler_as_RoutingMessageHandler(router);
+ this.router = bindings.NetworkGraph_new(new byte[32]);
+ this.router_wrapper = bindings.NetGraphMsgHandler_new(router, bindings.COption_AccessZ_none(), logger);
+ this.route_handler = bindings.NetGraphMsgHandler_as_RoutingMessageHandler(router_wrapper);
this.message_handler = bindings.MessageHandler_new(chan_handler, route_handler);
+ this.custom_message_handler = bindings.IgnoringMessageHandler_new();
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);
+ 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));
}
void connect_block(Block b, Transaction t, int height) {
bindings.ChannelManager_free(chan_manager);
bindings.EventsProvider_free(chan_manager_events);
bindings.ChannelMessageHandler_free(chan_handler);
- bindings.NetGraphMsgHandler_free(router);
+ bindings.NetworkGraph_free(router);
+ bindings.NetGraphMsgHandler_free(router_wrapper);
bindings.RoutingMessageHandler_free(route_handler);
//MessageHandler was actually moved into the route_handler!: bindings.MessageHandler_free(message_handler);
bindings.PeerManager_free(peer_manager);
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);
});
list.add(thread);
}
+ void deliver_peer_messages(ConcurrentLinkedQueue<Thread> list, long peer1, long peer2) throws InterruptedException {
+ bindings.PeerManager_process_events(peer1);
+ bindings.PeerManager_process_events(peer2);
+ while (!list.isEmpty()) {
+ list.poll().join();
+ bindings.PeerManager_process_events(peer1);
+ bindings.PeerManager_process_events(peer2);
+ }
+ }
+
@Test
void test_message_handler() throws InterruptedException {
Peer peer1 = new Peer((byte) 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));
+ 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));
bindings.CResult_CVec_u8ZPeerHandleErrorZ_free(init_vec);
- while (!list.isEmpty()) { list.poll().join(); }
+ 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);
- 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(); }
+ deliver_peer_messages(list, peer1.peer_manager, peer2.peer_manager);
ArrayList<Long> events = new ArrayList();
long handler = bindings.LDKEventHandler_new(events::add);
funding.addOutput(Coin.SATOSHI.multiply(10000), new Script(funding_spk));
bindings.ChannelManager_funding_transaction_generated(peer1.chan_manager, chan_id, funding.bitcoinSerialize());
- 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(); }
+ deliver_peer_messages(list, peer1.peer_manager, peer2.peer_manager);
Block b = new Block(NetworkParameters.fromID(NetworkParameters.ID_MAINNET), 2, Sha256Hash.ZERO_HASH, Sha256Hash.ZERO_HASH, 42, 0, 0, Arrays.asList(new Transaction[]{funding}));
peer1.connect_block(b, funding, 1);
peer2.connect_block(b, null, height);
}
- bindings.PeerManager_process_events(peer1.peer_manager);
- bindings.PeerManager_process_events(peer2.peer_manager);
- while (!list.isEmpty()) { list.poll().join(); }
+ deliver_peer_messages(list, peer1.peer_manager, peer2.peer_manager);
long[] peer1_chans = bindings.ChannelManager_list_channels(peer1.chan_manager);
long[] peer2_chans = bindings.ChannelManager_list_channels(peer2.chan_manager);
long no_min_val = bindings.COption_u64Z_none();
long inbound_payment = bindings.ChannelManager_create_inbound_payment(peer2.chan_manager, no_min_val, 7200, 42);
bindings.COption_u64Z_free(no_min_val);
- long netgraph = bindings.NetGraphMsgHandler_read_locked_graph(peer1.router);
- long route = bindings.get_route(peer1.node_id, bindings.LockedNetworkGraph_graph(netgraph), peer2.node_id, 0L, peer1_chans,
- new long[0], 1000, 42, peer1.logger);
+ 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);
+ 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.Score_free(scorer_interface);
+ bindings.Scorer_free(scorer);
+
for (long chan : peer1_chans) bindings.ChannelDetails_free(chan);
- assert bindings.LDKCResult_RouteLightningErrorZ_result_ok(route);
- bindings.LockedNetworkGraph_free(netgraph);
+ assert bindings.CResult_RouteLightningErrorZ_is_ok(route);
long payment_res = bindings.ChannelManager_send_payment(peer1.chan_manager, bindings.LDKCResult_RouteLightningErrorZ_get_ok(route),
- bindings.LDKC2Tuple_PaymentHashPaymentSecretZ_get_a(inbound_payment), bindings.LDKC2Tuple_PaymentHashPaymentSecretZ_get_b(inbound_payment));
+ bindings.C2Tuple_PaymentHashPaymentSecretZ_get_a(inbound_payment), bindings.C2Tuple_PaymentHashPaymentSecretZ_get_b(inbound_payment));
bindings.CResult_RouteLightningErrorZ_free(route);
bindings.C2Tuple_PaymentHashPaymentSecretZ_free(inbound_payment);
- assert bindings.LDKCResult_NonePaymentSendFailureZ_result_ok(payment_res);
+ assert bindings.CResult_NonePaymentSendFailureZ_is_ok(payment_res);
bindings.CResult_NonePaymentSendFailureZ_free(payment_res);
- 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(); }
- bindings.PeerManager_process_events(peer1.peer_manager);
- while (!list.isEmpty()) { list.poll().join(); }
+ deliver_peer_messages(list, peer1.peer_manager, peer2.peer_manager);
bindings.EventsProvider_process_pending_events(peer2.chan_manager_events, handler);
assert events.size() == 1;
assert events.size() == 1;
bindings.LDKEvent payment_recvd = bindings.LDKEvent_ref_from_ptr(events.get(0));
assert payment_recvd instanceof bindings.LDKEvent.PaymentReceived;
- assert bindings.ChannelManager_claim_funds(peer2.chan_manager, ((bindings.LDKEvent.PaymentReceived) payment_recvd).payment_preimage);
+ bindings.LDKPaymentPurpose purpose = bindings.LDKPaymentPurpose_ref_from_ptr(((bindings.LDKEvent.PaymentReceived) payment_recvd).purpose);
+ assert purpose instanceof bindings.LDKPaymentPurpose.InvoicePayment;
+ assert bindings.ChannelManager_claim_funds(peer2.chan_manager, ((bindings.LDKPaymentPurpose.InvoicePayment) purpose).payment_preimage);
bindings.Event_free(events.remove(0));
- bindings.PeerManager_process_events(peer2.peer_manager);
- while (!list.isEmpty()) { list.poll().join(); }
- bindings.PeerManager_process_events(peer1.peer_manager);
- while (!list.isEmpty()) { list.poll().join(); }
+ deliver_peer_messages(list, peer1.peer_manager, peer2.peer_manager);
bindings.EventsProvider_process_pending_events(peer1.chan_manager_events, handler);
assert events.size() == 1;
projects / ldk-java / blobdiff