X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fldk%2FManualMsgHandlingPeerTest.java;h=fd9fa7ef01ed836f6ab5ba42b32dd869decffac5;hb=df2ad7bd23428f6955c551a82bd943bf9c9f7996;hp=90320d4bc32e1b806a872683dc760703bd1443da;hpb=7d6be8a5ef72a4ebfe07660cce55f43f6cc30b80;p=ldk-java

diff --git a/src/test/java/org/ldk/ManualMsgHandlingPeerTest.java b/src/test/java/org/ldk/ManualMsgHandlingPeerTest.java
index 90320d4b..fd9fa7ef 100644
--- a/src/test/java/org/ldk/ManualMsgHandlingPeerTest.java
+++ b/src/test/java/org/ldk/ManualMsgHandlingPeerTest.java
@@ -3,12 +3,14 @@ package org.ldk;
 import org.junit.jupiter.api.Test;
 import org.ldk.impl.bindings;
 import org.ldk.enums.*;
+import org.ldk.structs.Record;
 
 public class ManualMsgHandlingPeerTest {
     @Test
     void test_message_handler() {
-        long logger = bindings.LDKLogger_new((String arg)->{
-            System.out.println(arg);
+        long logger = bindings.LDKLogger_new((long arg)->{
+            System.out.println(bindings.Record_get_args(arg));
+            bindings.Record_free(arg);
         });
         long chan_handler = bindings.LDKChannelMessageHandler_new(new bindings.LDKChannelMessageHandler() {
             @Override
@@ -32,7 +34,7 @@ public class ManualMsgHandlingPeerTest {
             }
 
             @Override
-            public void handle_funding_locked(byte[] their_node_id, long msg) {
+            public void handle_channel_ready(byte[] their_node_id, long msg) {
 
             }
 
@@ -92,8 +94,9 @@ public class ManualMsgHandlingPeerTest {
             }
 
             @Override
-            public void peer_connected(byte[] their_node_id, long msg) {
-
+            public long peer_connected(byte[] their_node_id, long msg) {
+                assert false;
+                return 0;
             }
 
             @Override
@@ -110,6 +113,18 @@ public class ManualMsgHandlingPeerTest {
             public void handle_error(byte[] their_node_id, long msg) {
 
             }
+
+            @Override
+            public long provided_node_features() {
+                assert false;
+                return 0;
+            }
+
+            @Override
+            public long provided_init_features(byte[] their_node_id) {
+                assert false;
+                return 0;
+            }
         }, () -> new long[0]);
         long route_handler = bindings.LDKRoutingMessageHandler_new(new bindings.LDKRoutingMessageHandler() {
             @Override public long handle_node_announcement(long msg) {
@@ -121,18 +136,21 @@ public class ManualMsgHandlingPeerTest {
             @Override public long handle_channel_update(long msg) {
                 return 0;
             }
-            @Override public long[] get_next_channel_announcements(long starting_point, byte batch_amount) {
-                return new long[0];
-            }
-            @Override public long[] get_next_node_announcements(byte[] starting_point, byte batch_amount) {
-                return new long[0];
-            }
 
             @Override
-            public void sync_routing_table(byte[] their_node_id, long init) {
+            public long get_next_channel_announcement(long starting_point) {
+                assert false;
+                return 0;
+            }
 
+            @Override
+            public long get_next_node_announcement(byte[] starting_point) {
+                assert false;
+                return 0;
             }
 
+            @Override public long peer_connected(byte[] their_node_id, long init) { assert false; return 0; }
+
             @Override
             public long handle_reply_channel_range(byte[] their_node_id, long msg) {
                 return 0;
@@ -152,23 +170,39 @@ public class ManualMsgHandlingPeerTest {
             public long handle_query_short_channel_ids(byte[] their_node_id, long msg) {
                 return 0;
             }
+
+            @Override
+            public long provided_node_features() {
+                assert false;
+                return 0;
+            }
+
+            @Override
+            public long provided_init_features(byte[] their_node_id) {
+                assert false;
+                return 0;
+            }
         }, () -> new long[0]);
-        long message_handler = bindings.MessageHandler_new(chan_handler, route_handler);
+        long ignoring_message_handler = bindings.IgnoringMessageHandler_new();
+        long onion_message_handler = bindings.IgnoringMessageHandler_as_OnionMessageHandler(ignoring_message_handler);
+        long message_handler = bindings.MessageHandler_new(chan_handler, route_handler, onion_message_handler);
         byte[] our_node_secret = new byte[32];
         byte[] random_data = new byte[32];
         for (byte i = 0; i < 32; i++) { random_data[i] = i; our_node_secret[i] = (byte) (i ^ 0xff); }
 
-        long ignoring_message_handler = bindings.IgnoringMessageHandler_new();
-        long peer_manager = bindings.PeerManager_new(message_handler, our_node_secret, random_data, logger,
+        long peer_manager = bindings.PeerManager_new(message_handler, our_node_secret, (int)(System.currentTimeMillis() / 1000),
+                random_data, logger,
                 bindings.IgnoringMessageHandler_as_CustomMessageHandler(ignoring_message_handler));
 
         // Test Level_max() since its the only place we create a java object from a Rust-returned enum.
-        assert bindings.Level_max() == Level.LDKLevel_Trace;
+        assert bindings.Level_max() == Level.LDKLevel_Gossip;
 
         // Note that we can't rely on finalizer order, so don't bother trying to rely on it here
         bindings.Logger_free(logger);
         bindings.ChannelMessageHandler_free(chan_handler);
         bindings.RoutingMessageHandler_free(route_handler);
+        bindings.OnionMessageHandler_free(onion_message_handler);
+        bindings.IgnoringMessageHandler_free(ignoring_message_handler);
         //bindings.MessageHandler_free(message_handler);
         bindings.PeerManager_free(peer_manager);
     }