From 9f23b35fcea4857035bca01adc3c30bac367239e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Galder=20Zamarren=CC=83o?= Date: Thu, 18 Mar 2021 08:06:54 +0100 Subject: [PATCH 1/2] Update API usages after bindings update --- src/main/java/org/ldk/batteries/NioPeerHandler.java | 2 +- src/test/java/org/ldk/HumanObjectPeerTest.java | 2 +- src/test/java/org/ldk/PeerTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/ldk/batteries/NioPeerHandler.java b/src/main/java/org/ldk/batteries/NioPeerHandler.java index a77f1f0f4..277405e8c 100644 --- a/src/main/java/org/ldk/batteries/NioPeerHandler.java +++ b/src/main/java/org/ldk/batteries/NioPeerHandler.java @@ -173,7 +173,7 @@ public NioPeerHandler(PeerManager manager) throws IOException { } } if (lastTimerTick < System.currentTimeMillis() - 30 * 1000) { - peer_manager.timer_tick_occured(); + peer_manager.timer_tick_occurred(); lastTimerTick = System.currentTimeMillis(); } peer_manager.process_events(); diff --git a/src/test/java/org/ldk/HumanObjectPeerTest.java b/src/test/java/org/ldk/HumanObjectPeerTest.java index a8d439ec6..cc67cfe87 100644 --- a/src/test/java/org/ldk/HumanObjectPeerTest.java +++ b/src/test/java/org/ldk/HumanObjectPeerTest.java @@ -384,7 +384,7 @@ Event[] get_monitor_events() { Route get_route(byte[] dest_node, ChannelDetails[] our_chans) { try (LockedNetworkGraph netgraph = this.router.read_locked_graph()) { NetworkGraph graph = netgraph.graph(); - long res = bindings.get_route(this.node_id, graph._test_only_get_ptr(), dest_node, new long[]{our_chans[0]._test_only_get_ptr()}, + long res = bindings.get_route(this.node_id, graph._test_only_get_ptr(), dest_node, 0L, new long[]{our_chans[0]._test_only_get_ptr()}, new long[0], 1000, 42, this.logger._test_only_get_ptr()); assert bindings.LDKCResult_RouteLightningErrorZ_result_ok(res); byte[] serialized_route = bindings.Route_write(bindings.LDKCResult_RouteLightningErrorZ_get_ok(res)); diff --git a/src/test/java/org/ldk/PeerTest.java b/src/test/java/org/ldk/PeerTest.java index bfb85754f..bc83c95b6 100644 --- a/src/test/java/org/ldk/PeerTest.java +++ b/src/test/java/org/ldk/PeerTest.java @@ -283,7 +283,7 @@ public long send_data(byte[] data, boolean resume_read) { 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, + 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); for (long chan : peer1_chans) bindings.ChannelDetails_free(chan); assert bindings.LDKCResult_RouteLightningErrorZ_result_ok(route); From 48334b18a470cfaddcda4feec933b97d124c2fe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Galder=20Zamarren=CC=83o?= Date: Thu, 18 Mar 2021 08:07:40 +0100 Subject: [PATCH 2/2] Ignore IDE metadata and pycache --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index c1c131bf7..6c39c2cfc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ liblightningjni.so target +.idea +*.iml +__pycache__