[Java] Update tests + batteries to latest upstream API

[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 929787f48b18b7dd4d1bd676d8cb1b64332b261f..7dc3f1a39df568c31362d562388836752e2076a8 100644 (file)
--- a/src/test/java/org/ldk/PeerTest.java
+++ b/src/test/java/org/ldk/PeerTest.java
@@ -4,6 +4,7 @@ import org.bitcoinj.core.*;
 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.util.ArrayList;
@@ -105,8 +106,12 @@ public class PeerTest {
 
             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) {
@@ -283,14 +288,14 @@ public class PeerTest {
 
         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);