Update PeerTest for new trait-object-return call semantics

[ldk-java] / src / test / java / org / ldk / PeerTest.java

diff --git a/src/test/java/org/ldk/PeerTest.java b/src/test/java/org/ldk/PeerTest.java
index 660984197306f84e4bb009de8f9fa897cfadb378..fe157b95eb40cfd9307a32246a0d915d2dc25f85 100644 (file)
--- a/src/test/java/org/ldk/PeerTest.java
+++ b/src/test/java/org/ldk/PeerTest.java
@@ -24,6 +24,7 @@ public class PeerTest {
         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;
@@ -34,7 +35,6 @@ public class PeerTest {
         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);
@@ -44,7 +44,6 @@ public class PeerTest {
             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() {
@@ -54,9 +53,7 @@ public class PeerTest {
                         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
@@ -65,14 +62,12 @@ public class PeerTest {
                         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);
                     bindings.ChannelMonitorUpdate_free(update);
-                    long res = bindings.CResult_NoneChannelMonitorUpdateErrZ_ok();
-                    results_to_free.add(res);
-                    return res;
+                    return bindings.CResult_NoneChannelMonitorUpdateErrZ_ok();
                 }
 
                 @Override
@@ -99,8 +94,9 @@ public class PeerTest {
             this.chan_manager_events = bindings.ChannelManager_as_EventsProvider(chan_manager);
 
             this.chan_handler = bindings.ChannelManager_as_ChannelMessageHandler(chan_manager);
-            this.router = bindings.NetGraphMsgHandler_new(bindings.NetworkGraph_new(new byte[32]), bindings.COption_AccessZ_none(), 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();
 
@@ -142,7 +138,8 @@ public class PeerTest {
             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);
@@ -151,9 +148,6 @@ public class PeerTest {
                     bindings.ChannelMonitor_free(mon);
                 }
             }
-            for (Long res : results_to_free) {
-                bindings.CResult_NoneChannelMonitorUpdateErrZ_free(res);
-            }
         }
     }
 
@@ -162,7 +156,7 @@ public class PeerTest {
     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);
         });
@@ -215,10 +209,10 @@ public class PeerTest {
         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);
@@ -226,7 +220,7 @@ public class PeerTest {
         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);
@@ -279,21 +273,29 @@ public class PeerTest {
         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_get_network_graph(peer1.router);
         long scorer = bindings.Scorer_default();
         long scorer_interface = bindings.Scorer_as_Score(scorer);
-        long route = bindings.get_route(peer1.node_id, netgraph, peer2.node_id, 0L, peer1_chans,
-                new long[0], 1000, 42, peer1.logger, scorer_interface);
+
+        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.NetworkGraph_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.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);
 
         deliver_peer_messages(list, peer1.peer_manager, peer2.peer_manager);