update to new upstream

[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 746307862d04cda0a7cec84fa2ecbe49fbb46edb..2cabf2540e030bae688f14c2a785f6b18d4f7e23 100644 (file)
--- a/src/test/java/org/ldk/PeerTest.java
+++ b/src/test/java/org/ldk/PeerTest.java
@@ -58,7 +58,7 @@ public class PeerTest {
                     synchronized (monitors) {
                         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, logger);
+                        long update_res = bindings.ChannelMonitor_update_monitor(monitors.get(txid), update, tx_broadcaster, fee_estimator, logger);
                         assert bindings.LDKCResult_NoneMonitorUpdateErrorZ_result_ok(update_res);
                         bindings.CResult_NoneMonitorUpdateErrorZ_free(update_res);
                     }
@@ -90,7 +90,7 @@ 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(0, logger);
+            this.router = bindings.NetGraphMsgHandler_new(new byte[32], 0, logger);
             this.route_handler = bindings.NetGraphMsgHandler_as_RoutingMessageHandler(router);
             this.message_handler = bindings.MessageHandler_new(chan_handler, route_handler);
 
@@ -102,25 +102,20 @@ public class PeerTest {
         void connect_block(Block b, Transaction t, int height) {
             byte[] header = Arrays.copyOfRange(b.bitcoinSerialize(), 0, 80);
             long[] txn;
-            long txdata = 0;
-            if (t != null) {
-                txdata = bindings.new_txpointer_copy_data(t.bitcoinSerialize());
-                txn = new long[]{bindings.C2Tuple_usizeTransactionZ_new(1, txdata)};
-            } else
+            if (t != null)
+                txn = new long[]{bindings.C2Tuple_usizeTransactionZ_new(1, t.bitcoinSerialize())};
+            else
                 txn = new long[0];
             bindings.ChannelManager_block_connected(chan_manager, header, txn, height);
-            if (txdata != 0) bindings.txpointer_free(txdata);
             synchronized (monitors) {
                 for (Long mon : monitors.values()) {
-                    if (t != null) {
-                        txdata = bindings.new_txpointer_copy_data(t.bitcoinSerialize());
-                        txn = new long[]{bindings.C2Tuple_usizeTransactionZ_new(1, txdata)};
-                    } else
+                    if (t != null)
+                        txn = new long[]{bindings.C2Tuple_usizeTransactionZ_new(1, t.bitcoinSerialize())};
+                    else
                         txn = new long[0];
                     long[] ret = bindings.ChannelMonitor_block_connected(mon, header, txn, height, tx_broadcaster, fee_estimator, logger);
-                    if (txdata != 0) bindings.txpointer_free(txdata);
                     for (long r : ret) {
-                        bindings.C2Tuple_TxidCVec_TxOutZZ_free(r);
+                        bindings.C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_free(r);
                     }
                 }
             }
@@ -179,7 +174,7 @@ public class PeerTest {
             }
 
             @Override public void disconnect_socket() { assert false; }
-            @Override public boolean eq(long other_arg) { return bindings.LDKSocketDescriptor_get_obj_from_jcalls(other_arg).hash() == 2; }
+            @Override public boolean eq(long other_arg) { boolean ret = bindings.SocketDescriptor_hash(other_arg) == 2; bindings.SocketDescriptor_free(other_arg); return ret; }
             @Override public long hash() { return 2; }
         };
         long descriptor2 = bindings.LDKSocketDescriptor_new(sock1);
@@ -192,7 +187,7 @@ public class PeerTest {
             }
 
             @Override public void disconnect_socket() { assert false; }
-            @Override public boolean eq(long other_arg) { return bindings.LDKSocketDescriptor_get_obj_from_jcalls(other_arg).hash() == 1; }
+            @Override public boolean eq(long other_arg) { boolean ret = bindings.SocketDescriptor_hash(other_arg) == 1; bindings.SocketDescriptor_free(other_arg); return ret; }
             @Override public long hash() { return 1; }
         };
         descriptor1.val = bindings.LDKSocketDescriptor_new(sock2);