Handle trait return values

diff --git a/genbindings.py b/genbindings.py
index d9944e7edfdd7da0d557c0e4eee91963451f3bad..79f910602b71c1557191861daf08482ed61762d9 100755 (executable)
--- a/genbindings.py
+++ b/genbindings.py
@@ -257,13 +257,6 @@ public class bindings {
                 if is_opaque:
                     opaque_structs.add(struct_name)
                 if len(trait_fn_lines) > 0:
-                    out_java.write("\tpublic interface " + struct_name + " {\n")
-                    for fn_line in trait_fn_lines:
-                        if fn_line.group(2) != "free" and fn_line.group(2) != "clone":
-                            out_java.write("\t\t void " + fn_line.group(2) + "(/* TODO + rtype */);\n")
-                    out_java.write("\t}\n")
-                    out_java.write("\tpublic static native long " + struct_name + "_new(" + struct_name + " impl);\n")
-
                     out_c.write("typedef struct " + struct_name + "_JCalls {\n")
                     out_c.write("\tJNIEnv *env;\n")
                     out_c.write("\tjobject o;\n")
@@ -272,11 +265,16 @@ public class bindings {
                             out_c.write("\tjmethodID " + fn_line.group(2) + "_meth;\n")
                     out_c.write("} " + struct_name + "_JCalls;\n")
 
+                    out_java.write("\tpublic interface " + struct_name + " {\n")
                     for fn_line in trait_fn_lines:
                         if fn_line.group(2) != "free" and fn_line.group(2) != "clone":
-                            out_c.write("void " + fn_line.group(2) + "_jcall(void* this_arg/* TODO + rtype */) {\n")
+                            (java_ty, c_ty, is_ptr) = java_c_types(fn_line.group(1), None)
+
+                            out_java.write("\t\t " + java_ty + " " + fn_line.group(2) + "(/* TODO */);\n")
+
+                            out_c.write(c_ty + " " + fn_line.group(2) + "_jcall(void* this_arg/* TODO */) {\n")
                             out_c.write("\t" + struct_name + "_JCalls *arg = (" + struct_name + "_JCalls*) this_arg;\n")
-                            out_c.write("\t(*arg->env)->CallObjectMethod(arg->env, arg->o, arg->" + fn_line.group(2) + "_meth);\n");
+                            out_c.write("\treturn (*arg->env)->Call" + java_ty.title() + "Method(arg->env, arg->o, arg->" + fn_line.group(2) + "_meth);\n");
                             out_c.write("}\n")
                         elif fn_line.group(2) == "free":
                             out_c.write("void " + struct_name + "_JCalls_free(void* this_arg) {\n")
@@ -290,6 +288,8 @@ public class bindings {
                             out_c.write("\tmemcpy(ret, this_arg, sizeof(" + struct_name + "_JCalls));\n")
                             out_c.write("\treturn ret;\n")
                             out_c.write("}\n")
+                    out_java.write("\t}\n")
+                    out_java.write("\tpublic static native long " + struct_name + "_new(" + struct_name + " impl);\n")
 
                     out_c.write("JNIEXPORT long JNICALL Java_org_ldk_impl_bindings_" + struct_name.replace("_", "_1") + "_1new (JNIEnv * env, jclass _a, jobject o) {\n")
                     out_c.write("\tjclass c = (*env)->GetObjectClass(env, o);\n")

diff --git a/src/main/java/org/ldk/impl/bindings.java b/src/main/java/org/ldk/impl/bindings.java
index 9ce76a0dacbb571da2c01a6cd7e6696f8d29e425..e96e4c2eba30cb254873cb9170d95ac17d78eb78 100644 (file)
--- a/src/main/java/org/ldk/impl/bindings.java
+++ b/src/main/java/org/ldk/impl/bindings.java
@@ -6,104 +6,104 @@ public class bindings {
        }
 
        public interface LDKMessageSendEventsProvider {
-                void get_and_clear_pending_msg_events(/* TODO + rtype */);
+                long get_and_clear_pending_msg_events(/* TODO */);
        }
        public static native long LDKMessageSendEventsProvider_new(LDKMessageSendEventsProvider impl);
        public interface LDKEventsProvider {
-                void get_and_clear_pending_events(/* TODO + rtype */);
+                long get_and_clear_pending_events(/* TODO */);
        }
        public static native long LDKEventsProvider_new(LDKEventsProvider impl);
        public interface LDKLogger {
-                void log(/* TODO + rtype */);
+                void log(/* TODO */);
        }
        public static native long LDKLogger_new(LDKLogger impl);
        public interface LDKChainWatchInterface {
-                void install_watch_tx(/* TODO + rtype */);
-                void install_watch_outpoint(/* TODO + rtype */);
-                void watch_all_txn(/* TODO + rtype */);
-                void get_chain_utxo(/* TODO + rtype */);
-                void filter_block(/* TODO + rtype */);
-                void reentered(/* TODO + rtype */);
+                void install_watch_tx(/* TODO */);
+                void install_watch_outpoint(/* TODO */);
+                void watch_all_txn(/* TODO */);
+                long get_chain_utxo(/* TODO */);
+                long filter_block(/* TODO */);
+                long reentered(/* TODO */);
        }
        public static native long LDKChainWatchInterface_new(LDKChainWatchInterface impl);
        public interface LDKBroadcasterInterface {
-                void broadcast_transaction(/* TODO + rtype */);
+                void broadcast_transaction(/* TODO */);
        }
        public static native long LDKBroadcasterInterface_new(LDKBroadcasterInterface impl);
        public interface LDKChainListener {
-                void block_connected(/* TODO + rtype */);
-                void block_disconnected(/* TODO + rtype */);
+                void block_connected(/* TODO */);
+                void block_disconnected(/* TODO */);
        }
        public static native long LDKChainListener_new(LDKChainListener impl);
        public interface LDKFeeEstimator {
-                void get_est_sat_per_1000_weight(/* TODO + rtype */);
+                int get_est_sat_per_1000_weight(/* TODO */);
        }
        public static native long LDKFeeEstimator_new(LDKFeeEstimator impl);
        public interface LDKChannelKeys {
-                void get_per_commitment_point(/* TODO + rtype */);
-                void release_commitment_secret(/* TODO + rtype */);
-                void key_derivation_params(/* TODO + rtype */);
-                void sign_remote_commitment(/* TODO + rtype */);
-                void sign_local_commitment(/* TODO + rtype */);
-                void sign_local_commitment_htlc_transactions(/* TODO + rtype */);
-                void sign_justice_transaction(/* TODO + rtype */);
-                void sign_remote_htlc_transaction(/* TODO + rtype */);
-                void sign_closing_transaction(/* TODO + rtype */);
-                void sign_channel_announcement(/* TODO + rtype */);
-                void on_accept(/* TODO + rtype */);
+                long get_per_commitment_point(/* TODO */);
+                long release_commitment_secret(/* TODO */);
+                long key_derivation_params(/* TODO */);
+                long sign_remote_commitment(/* TODO */);
+                long sign_local_commitment(/* TODO */);
+                long sign_local_commitment_htlc_transactions(/* TODO */);
+                long sign_justice_transaction(/* TODO */);
+                long sign_remote_htlc_transaction(/* TODO */);
+                long sign_closing_transaction(/* TODO */);
+                long sign_channel_announcement(/* TODO */);
+                void on_accept(/* TODO */);
        }
        public static native long LDKChannelKeys_new(LDKChannelKeys impl);
        public interface LDKKeysInterface {
-                void get_node_secret(/* TODO + rtype */);
-                void get_destination_script(/* TODO + rtype */);
-                void get_shutdown_pubkey(/* TODO + rtype */);
-                void get_channel_keys(/* TODO + rtype */);
-                void get_secure_random_bytes(/* TODO + rtype */);
+                long get_node_secret(/* TODO */);
+                long get_destination_script(/* TODO */);
+                long get_shutdown_pubkey(/* TODO */);
+                long get_channel_keys(/* TODO */);
+                long get_secure_random_bytes(/* TODO */);
        }
        public static native long LDKKeysInterface_new(LDKKeysInterface impl);
        public interface LDKManyChannelMonitor {
-                void add_monitor(/* TODO + rtype */);
-                void update_monitor(/* TODO + rtype */);
-                void get_and_clear_pending_monitor_events(/* TODO + rtype */);
+                long add_monitor(/* TODO */);
+                long update_monitor(/* TODO */);
+                long get_and_clear_pending_monitor_events(/* TODO */);
        }
        public static native long LDKManyChannelMonitor_new(LDKManyChannelMonitor impl);
        public interface LDKChannelMessageHandler {
-                void handle_open_channel(/* TODO + rtype */);
-                void handle_accept_channel(/* TODO + rtype */);
-                void handle_funding_created(/* TODO + rtype */);
-                void handle_funding_signed(/* TODO + rtype */);
-                void handle_funding_locked(/* TODO + rtype */);
-                void handle_shutdown(/* TODO + rtype */);
-                void handle_closing_signed(/* TODO + rtype */);
-                void handle_update_add_htlc(/* TODO + rtype */);
-                void handle_update_fulfill_htlc(/* TODO + rtype */);
-                void handle_update_fail_htlc(/* TODO + rtype */);
-                void handle_update_fail_malformed_htlc(/* TODO + rtype */);
-                void handle_commitment_signed(/* TODO + rtype */);
-                void handle_revoke_and_ack(/* TODO + rtype */);
-                void handle_update_fee(/* TODO + rtype */);
-                void handle_announcement_signatures(/* TODO + rtype */);
-                void peer_disconnected(/* TODO + rtype */);
-                void peer_connected(/* TODO + rtype */);
-                void handle_channel_reestablish(/* TODO + rtype */);
-                void handle_error(/* TODO + rtype */);
+                void handle_open_channel(/* TODO */);
+                void handle_accept_channel(/* TODO */);
+                void handle_funding_created(/* TODO */);
+                void handle_funding_signed(/* TODO */);
+                void handle_funding_locked(/* TODO */);
+                void handle_shutdown(/* TODO */);
+                void handle_closing_signed(/* TODO */);
+                void handle_update_add_htlc(/* TODO */);
+                void handle_update_fulfill_htlc(/* TODO */);
+                void handle_update_fail_htlc(/* TODO */);
+                void handle_update_fail_malformed_htlc(/* TODO */);
+                void handle_commitment_signed(/* TODO */);
+                void handle_revoke_and_ack(/* TODO */);
+                void handle_update_fee(/* TODO */);
+                void handle_announcement_signatures(/* TODO */);
+                void peer_disconnected(/* TODO */);
+                void peer_connected(/* TODO */);
+                void handle_channel_reestablish(/* TODO */);
+                void handle_error(/* TODO */);
        }
        public static native long LDKChannelMessageHandler_new(LDKChannelMessageHandler impl);
        public interface LDKRoutingMessageHandler {
-                void handle_node_announcement(/* TODO + rtype */);
-                void handle_channel_announcement(/* TODO + rtype */);
-                void handle_channel_update(/* TODO + rtype */);
-                void handle_htlc_fail_channel_update(/* TODO + rtype */);
-                void get_next_channel_announcements(/* TODO + rtype */);
-                void get_next_node_announcements(/* TODO + rtype */);
-                void should_request_full_sync(/* TODO + rtype */);
+                long handle_node_announcement(/* TODO */);
+                long handle_channel_announcement(/* TODO */);
+                long handle_channel_update(/* TODO */);
+                void handle_htlc_fail_channel_update(/* TODO */);
+                long get_next_channel_announcements(/* TODO */);
+                long get_next_node_announcements(/* TODO */);
+                boolean should_request_full_sync(/* TODO */);
        }
        public static native long LDKRoutingMessageHandler_new(LDKRoutingMessageHandler impl);
        public interface LDKSocketDescriptor {
-                void send_data(/* TODO + rtype */);
-                void disconnect_socket(/* TODO + rtype */);
-                void eq(/* TODO + rtype */);
-                void hash(/* TODO + rtype */);
+                long send_data(/* TODO */);
+                void disconnect_socket(/* TODO */);
+                boolean eq(/* TODO */);
+                long hash(/* TODO */);
        }
        public static native long LDKSocketDescriptor_new(LDKSocketDescriptor impl);
        /// extern const void (*C2Tuple_HTLCOutputInCommitmentSignatureZ_free)(LDKC2Tuple_HTLCOutputInCommitmentSignatureZ);

diff --git a/src/main/java/org/ldk/ln/channelmanager/ChannelManager.java b/src/main/java/org/ldk/ln/channelmanager/ChannelManager.java
deleted file mode 100644 (file)
index 70c9d85..0000000
--- a/src/main/java/org/ldk/ln/channelmanager/ChannelManager.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.ldk.ln.channelmanager;
-
-import org.ldk.bindings;
-
-public class ChannelManager {
-    void asdf() {
-        bindings.CResult_NonePaymentSendFailureZ_err(0);
-    }
-
-
-}

diff --git a/src/main/jni/bindings.c b/src/main/jni/bindings.c
index fd69cfc12d000fc7e9d7c82853cecd7a334ac1fa..0e7acb2722407d8f254f97a7b2af9f017c2344b6 100644 (file)
--- a/src/main/jni/bindings.c
+++ b/src/main/jni/bindings.c
@@ -10,9 +10,9 @@ typedef struct LDKMessageSendEventsProvider_JCalls {
        jobject o;
        jmethodID get_and_clear_pending_msg_events_meth;
 } LDKMessageSendEventsProvider_JCalls;
-void get_and_clear_pending_msg_events_jcall(void* this_arg/* TODO + rtype */) {
+jlong get_and_clear_pending_msg_events_jcall(void* this_arg/* TODO */) {
        LDKMessageSendEventsProvider_JCalls *arg = (LDKMessageSendEventsProvider_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->get_and_clear_pending_msg_events_meth);
+       return (*arg->env)->CallLongMethod(arg->env, arg->o, arg->get_and_clear_pending_msg_events_meth);
 }
 void LDKMessageSendEventsProvider_JCalls_free(void* this_arg) {
        LDKMessageSendEventsProvider_JCalls *arg = (LDKMessageSendEventsProvider_JCalls*) this_arg;
@@ -40,9 +40,9 @@ typedef struct LDKEventsProvider_JCalls {
        jobject o;
        jmethodID get_and_clear_pending_events_meth;
 } LDKEventsProvider_JCalls;
-void get_and_clear_pending_events_jcall(void* this_arg/* TODO + rtype */) {
+jlong get_and_clear_pending_events_jcall(void* this_arg/* TODO */) {
        LDKEventsProvider_JCalls *arg = (LDKEventsProvider_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->get_and_clear_pending_events_meth);
+       return (*arg->env)->CallLongMethod(arg->env, arg->o, arg->get_and_clear_pending_events_meth);
 }
 void LDKEventsProvider_JCalls_free(void* this_arg) {
        LDKEventsProvider_JCalls *arg = (LDKEventsProvider_JCalls*) this_arg;
@@ -70,9 +70,9 @@ typedef struct LDKLogger_JCalls {
        jobject o;
        jmethodID log_meth;
 } LDKLogger_JCalls;
-void log_jcall(void* this_arg/* TODO + rtype */) {
+void log_jcall(void* this_arg/* TODO */) {
        LDKLogger_JCalls *arg = (LDKLogger_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->log_meth);
+       return (*arg->env)->CallVoidMethod(arg->env, arg->o, arg->log_meth);
 }
 void LDKLogger_JCalls_free(void* this_arg) {
        LDKLogger_JCalls *arg = (LDKLogger_JCalls*) this_arg;
@@ -105,29 +105,29 @@ typedef struct LDKChainWatchInterface_JCalls {
        jmethodID filter_block_meth;
        jmethodID reentered_meth;
 } LDKChainWatchInterface_JCalls;
-void install_watch_tx_jcall(void* this_arg/* TODO + rtype */) {
+void install_watch_tx_jcall(void* this_arg/* TODO */) {
        LDKChainWatchInterface_JCalls *arg = (LDKChainWatchInterface_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->install_watch_tx_meth);
+       return (*arg->env)->CallVoidMethod(arg->env, arg->o, arg->install_watch_tx_meth);
 }
-void install_watch_outpoint_jcall(void* this_arg/* TODO + rtype */) {
+void install_watch_outpoint_jcall(void* this_arg/* TODO */) {
        LDKChainWatchInterface_JCalls *arg = (LDKChainWatchInterface_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->install_watch_outpoint_meth);
+       return (*arg->env)->CallVoidMethod(arg->env, arg->o, arg->install_watch_outpoint_meth);
 }
-void watch_all_txn_jcall(void* this_arg/* TODO + rtype */) {
+void watch_all_txn_jcall(void* this_arg/* TODO */) {
        LDKChainWatchInterface_JCalls *arg = (LDKChainWatchInterface_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->watch_all_txn_meth);
+       return (*arg->env)->CallVoidMethod(arg->env, arg->o, arg->watch_all_txn_meth);
 }
-void get_chain_utxo_jcall(void* this_arg/* TODO + rtype */) {
+jlong get_chain_utxo_jcall(void* this_arg/* TODO */) {
        LDKChainWatchInterface_JCalls *arg = (LDKChainWatchInterface_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->get_chain_utxo_meth);
+       return (*arg->env)->CallLongMethod(arg->env, arg->o, arg->get_chain_utxo_meth);
 }
-void filter_block_jcall(void* this_arg/* TODO + rtype */) {
+jlong filter_block_jcall(void* this_arg/* TODO */) {
        LDKChainWatchInterface_JCalls *arg = (LDKChainWatchInterface_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->filter_block_meth);
+       return (*arg->env)->CallLongMethod(arg->env, arg->o, arg->filter_block_meth);
 }
-void reentered_jcall(void* this_arg/* TODO + rtype */) {
+jlong reentered_jcall(void* this_arg/* TODO */) {
        LDKChainWatchInterface_JCalls *arg = (LDKChainWatchInterface_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->reentered_meth);
+       return (*arg->env)->CallLongMethod(arg->env, arg->o, arg->reentered_meth);
 }
 void LDKChainWatchInterface_JCalls_free(void* this_arg) {
        LDKChainWatchInterface_JCalls *arg = (LDKChainWatchInterface_JCalls*) this_arg;
@@ -170,9 +170,9 @@ typedef struct LDKBroadcasterInterface_JCalls {
        jobject o;
        jmethodID broadcast_transaction_meth;
 } LDKBroadcasterInterface_JCalls;
-void broadcast_transaction_jcall(void* this_arg/* TODO + rtype */) {
+void broadcast_transaction_jcall(void* this_arg/* TODO */) {
        LDKBroadcasterInterface_JCalls *arg = (LDKBroadcasterInterface_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->broadcast_transaction_meth);
+       return (*arg->env)->CallVoidMethod(arg->env, arg->o, arg->broadcast_transaction_meth);
 }
 void LDKBroadcasterInterface_JCalls_free(void* this_arg) {
        LDKBroadcasterInterface_JCalls *arg = (LDKBroadcasterInterface_JCalls*) this_arg;
@@ -201,13 +201,13 @@ typedef struct LDKChainListener_JCalls {
        jmethodID block_connected_meth;
        jmethodID block_disconnected_meth;
 } LDKChainListener_JCalls;
-void block_connected_jcall(void* this_arg/* TODO + rtype */) {
+void block_connected_jcall(void* this_arg/* TODO */) {
        LDKChainListener_JCalls *arg = (LDKChainListener_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->block_connected_meth);
+       return (*arg->env)->CallVoidMethod(arg->env, arg->o, arg->block_connected_meth);
 }
-void block_disconnected_jcall(void* this_arg/* TODO + rtype */) {
+void block_disconnected_jcall(void* this_arg/* TODO */) {
        LDKChainListener_JCalls *arg = (LDKChainListener_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->block_disconnected_meth);
+       return (*arg->env)->CallVoidMethod(arg->env, arg->o, arg->block_disconnected_meth);
 }
 void LDKChainListener_JCalls_free(void* this_arg) {
        LDKChainListener_JCalls *arg = (LDKChainListener_JCalls*) this_arg;
@@ -238,9 +238,9 @@ typedef struct LDKFeeEstimator_JCalls {
        jobject o;
        jmethodID get_est_sat_per_1000_weight_meth;
 } LDKFeeEstimator_JCalls;
-void get_est_sat_per_1000_weight_jcall(void* this_arg/* TODO + rtype */) {
+jint get_est_sat_per_1000_weight_jcall(void* this_arg/* TODO */) {
        LDKFeeEstimator_JCalls *arg = (LDKFeeEstimator_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->get_est_sat_per_1000_weight_meth);
+       return (*arg->env)->CallIntMethod(arg->env, arg->o, arg->get_est_sat_per_1000_weight_meth);
 }
 void LDKFeeEstimator_JCalls_free(void* this_arg) {
        LDKFeeEstimator_JCalls *arg = (LDKFeeEstimator_JCalls*) this_arg;
@@ -278,49 +278,49 @@ typedef struct LDKChannelKeys_JCalls {
        jmethodID sign_channel_announcement_meth;
        jmethodID on_accept_meth;
 } LDKChannelKeys_JCalls;
-void get_per_commitment_point_jcall(void* this_arg/* TODO + rtype */) {
+jlong get_per_commitment_point_jcall(void* this_arg/* TODO */) {
        LDKChannelKeys_JCalls *arg = (LDKChannelKeys_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->get_per_commitment_point_meth);
+       return (*arg->env)->CallLongMethod(arg->env, arg->o, arg->get_per_commitment_point_meth);
 }
-void release_commitment_secret_jcall(void* this_arg/* TODO + rtype */) {
+jlong release_commitment_secret_jcall(void* this_arg/* TODO */) {
        LDKChannelKeys_JCalls *arg = (LDKChannelKeys_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->release_commitment_secret_meth);
+       return (*arg->env)->CallLongMethod(arg->env, arg->o, arg->release_commitment_secret_meth);
 }
-void key_derivation_params_jcall(void* this_arg/* TODO + rtype */) {
+jlong key_derivation_params_jcall(void* this_arg/* TODO */) {
        LDKChannelKeys_JCalls *arg = (LDKChannelKeys_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->key_derivation_params_meth);
+       return (*arg->env)->CallLongMethod(arg->env, arg->o, arg->key_derivation_params_meth);
 }
-void sign_remote_commitment_jcall(void* this_arg/* TODO + rtype */) {
+jlong sign_remote_commitment_jcall(void* this_arg/* TODO */) {
        LDKChannelKeys_JCalls *arg = (LDKChannelKeys_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->sign_remote_commitment_meth);
+       return (*arg->env)->CallLongMethod(arg->env, arg->o, arg->sign_remote_commitment_meth);
 }
-void sign_local_commitment_jcall(void* this_arg/* TODO + rtype */) {
+jlong sign_local_commitment_jcall(void* this_arg/* TODO */) {
        LDKChannelKeys_JCalls *arg = (LDKChannelKeys_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->sign_local_commitment_meth);
+       return (*arg->env)->CallLongMethod(arg->env, arg->o, arg->sign_local_commitment_meth);
 }
-void sign_local_commitment_htlc_transactions_jcall(void* this_arg/* TODO + rtype */) {
+jlong sign_local_commitment_htlc_transactions_jcall(void* this_arg/* TODO */) {
        LDKChannelKeys_JCalls *arg = (LDKChannelKeys_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->sign_local_commitment_htlc_transactions_meth);
+       return (*arg->env)->CallLongMethod(arg->env, arg->o, arg->sign_local_commitment_htlc_transactions_meth);
 }
-void sign_justice_transaction_jcall(void* this_arg/* TODO + rtype */) {
+jlong sign_justice_transaction_jcall(void* this_arg/* TODO */) {
        LDKChannelKeys_JCalls *arg = (LDKChannelKeys_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->sign_justice_transaction_meth);
+       return (*arg->env)->CallLongMethod(arg->env, arg->o, arg->sign_justice_transaction_meth);
 }
-void sign_remote_htlc_transaction_jcall(void* this_arg/* TODO + rtype */) {
+jlong sign_remote_htlc_transaction_jcall(void* this_arg/* TODO */) {
        LDKChannelKeys_JCalls *arg = (LDKChannelKeys_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->sign_remote_htlc_transaction_meth);
+       return (*arg->env)->CallLongMethod(arg->env, arg->o, arg->sign_remote_htlc_transaction_meth);
 }
-void sign_closing_transaction_jcall(void* this_arg/* TODO + rtype */) {
+jlong sign_closing_transaction_jcall(void* this_arg/* TODO */) {
        LDKChannelKeys_JCalls *arg = (LDKChannelKeys_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->sign_closing_transaction_meth);
+       return (*arg->env)->CallLongMethod(arg->env, arg->o, arg->sign_closing_transaction_meth);
 }
-void sign_channel_announcement_jcall(void* this_arg/* TODO + rtype */) {
+jlong sign_channel_announcement_jcall(void* this_arg/* TODO */) {
        LDKChannelKeys_JCalls *arg = (LDKChannelKeys_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->sign_channel_announcement_meth);
+       return (*arg->env)->CallLongMethod(arg->env, arg->o, arg->sign_channel_announcement_meth);
 }
-void on_accept_jcall(void* this_arg/* TODO + rtype */) {
+void on_accept_jcall(void* this_arg/* TODO */) {
        LDKChannelKeys_JCalls *arg = (LDKChannelKeys_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->on_accept_meth);
+       return (*arg->env)->CallVoidMethod(arg->env, arg->o, arg->on_accept_meth);
 }
 void* LDKChannelKeys_JCalls_clone(void* this_arg) {
        LDKChannelKeys_JCalls *ret = malloc(sizeof(LDKChannelKeys_JCalls));
@@ -388,25 +388,25 @@ typedef struct LDKKeysInterface_JCalls {
        jmethodID get_channel_keys_meth;
        jmethodID get_secure_random_bytes_meth;
 } LDKKeysInterface_JCalls;
-void get_node_secret_jcall(void* this_arg/* TODO + rtype */) {
+jlong get_node_secret_jcall(void* this_arg/* TODO */) {
        LDKKeysInterface_JCalls *arg = (LDKKeysInterface_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->get_node_secret_meth);
+       return (*arg->env)->CallLongMethod(arg->env, arg->o, arg->get_node_secret_meth);
 }
-void get_destination_script_jcall(void* this_arg/* TODO + rtype */) {
+jlong get_destination_script_jcall(void* this_arg/* TODO */) {
        LDKKeysInterface_JCalls *arg = (LDKKeysInterface_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->get_destination_script_meth);
+       return (*arg->env)->CallLongMethod(arg->env, arg->o, arg->get_destination_script_meth);
 }
-void get_shutdown_pubkey_jcall(void* this_arg/* TODO + rtype */) {
+jlong get_shutdown_pubkey_jcall(void* this_arg/* TODO */) {
        LDKKeysInterface_JCalls *arg = (LDKKeysInterface_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->get_shutdown_pubkey_meth);
+       return (*arg->env)->CallLongMethod(arg->env, arg->o, arg->get_shutdown_pubkey_meth);
 }
-void get_channel_keys_jcall(void* this_arg/* TODO + rtype */) {
+jlong get_channel_keys_jcall(void* this_arg/* TODO */) {
        LDKKeysInterface_JCalls *arg = (LDKKeysInterface_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->get_channel_keys_meth);
+       return (*arg->env)->CallLongMethod(arg->env, arg->o, arg->get_channel_keys_meth);
 }
-void get_secure_random_bytes_jcall(void* this_arg/* TODO + rtype */) {
+jlong get_secure_random_bytes_jcall(void* this_arg/* TODO */) {
        LDKKeysInterface_JCalls *arg = (LDKKeysInterface_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->get_secure_random_bytes_meth);
+       return (*arg->env)->CallLongMethod(arg->env, arg->o, arg->get_secure_random_bytes_meth);
 }
 void LDKKeysInterface_JCalls_free(void* this_arg) {
        LDKKeysInterface_JCalls *arg = (LDKKeysInterface_JCalls*) this_arg;
@@ -448,17 +448,17 @@ typedef struct LDKManyChannelMonitor_JCalls {
        jmethodID update_monitor_meth;
        jmethodID get_and_clear_pending_monitor_events_meth;
 } LDKManyChannelMonitor_JCalls;
-void add_monitor_jcall(void* this_arg/* TODO + rtype */) {
+jlong add_monitor_jcall(void* this_arg/* TODO */) {
        LDKManyChannelMonitor_JCalls *arg = (LDKManyChannelMonitor_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->add_monitor_meth);
+       return (*arg->env)->CallLongMethod(arg->env, arg->o, arg->add_monitor_meth);
 }
-void update_monitor_jcall(void* this_arg/* TODO + rtype */) {
+jlong update_monitor_jcall(void* this_arg/* TODO */) {
        LDKManyChannelMonitor_JCalls *arg = (LDKManyChannelMonitor_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->update_monitor_meth);
+       return (*arg->env)->CallLongMethod(arg->env, arg->o, arg->update_monitor_meth);
 }
-void get_and_clear_pending_monitor_events_jcall(void* this_arg/* TODO + rtype */) {
+jlong get_and_clear_pending_monitor_events_jcall(void* this_arg/* TODO */) {
        LDKManyChannelMonitor_JCalls *arg = (LDKManyChannelMonitor_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->get_and_clear_pending_monitor_events_meth);
+       return (*arg->env)->CallLongMethod(arg->env, arg->o, arg->get_and_clear_pending_monitor_events_meth);
 }
 void LDKManyChannelMonitor_JCalls_free(void* this_arg) {
        LDKManyChannelMonitor_JCalls *arg = (LDKManyChannelMonitor_JCalls*) this_arg;
@@ -510,81 +510,81 @@ typedef struct LDKChannelMessageHandler_JCalls {
        jmethodID handle_channel_reestablish_meth;
        jmethodID handle_error_meth;
 } LDKChannelMessageHandler_JCalls;
-void handle_open_channel_jcall(void* this_arg/* TODO + rtype */) {
+void handle_open_channel_jcall(void* this_arg/* TODO */) {
        LDKChannelMessageHandler_JCalls *arg = (LDKChannelMessageHandler_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->handle_open_channel_meth);
+       return (*arg->env)->CallVoidMethod(arg->env, arg->o, arg->handle_open_channel_meth);
 }
-void handle_accept_channel_jcall(void* this_arg/* TODO + rtype */) {
+void handle_accept_channel_jcall(void* this_arg/* TODO */) {
        LDKChannelMessageHandler_JCalls *arg = (LDKChannelMessageHandler_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->handle_accept_channel_meth);
+       return (*arg->env)->CallVoidMethod(arg->env, arg->o, arg->handle_accept_channel_meth);
 }
-void handle_funding_created_jcall(void* this_arg/* TODO + rtype */) {
+void handle_funding_created_jcall(void* this_arg/* TODO */) {
        LDKChannelMessageHandler_JCalls *arg = (LDKChannelMessageHandler_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->handle_funding_created_meth);
+       return (*arg->env)->CallVoidMethod(arg->env, arg->o, arg->handle_funding_created_meth);
 }
-void handle_funding_signed_jcall(void* this_arg/* TODO + rtype */) {
+void handle_funding_signed_jcall(void* this_arg/* TODO */) {
        LDKChannelMessageHandler_JCalls *arg = (LDKChannelMessageHandler_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->handle_funding_signed_meth);
+       return (*arg->env)->CallVoidMethod(arg->env, arg->o, arg->handle_funding_signed_meth);
 }
-void handle_funding_locked_jcall(void* this_arg/* TODO + rtype */) {
+void handle_funding_locked_jcall(void* this_arg/* TODO */) {
        LDKChannelMessageHandler_JCalls *arg = (LDKChannelMessageHandler_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->handle_funding_locked_meth);
+       return (*arg->env)->CallVoidMethod(arg->env, arg->o, arg->handle_funding_locked_meth);
 }
-void handle_shutdown_jcall(void* this_arg/* TODO + rtype */) {
+void handle_shutdown_jcall(void* this_arg/* TODO */) {
        LDKChannelMessageHandler_JCalls *arg = (LDKChannelMessageHandler_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->handle_shutdown_meth);
+       return (*arg->env)->CallVoidMethod(arg->env, arg->o, arg->handle_shutdown_meth);
 }
-void handle_closing_signed_jcall(void* this_arg/* TODO + rtype */) {
+void handle_closing_signed_jcall(void* this_arg/* TODO */) {
        LDKChannelMessageHandler_JCalls *arg = (LDKChannelMessageHandler_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->handle_closing_signed_meth);
+       return (*arg->env)->CallVoidMethod(arg->env, arg->o, arg->handle_closing_signed_meth);
 }
-void handle_update_add_htlc_jcall(void* this_arg/* TODO + rtype */) {
+void handle_update_add_htlc_jcall(void* this_arg/* TODO */) {
        LDKChannelMessageHandler_JCalls *arg = (LDKChannelMessageHandler_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->handle_update_add_htlc_meth);
+       return (*arg->env)->CallVoidMethod(arg->env, arg->o, arg->handle_update_add_htlc_meth);
 }
-void handle_update_fulfill_htlc_jcall(void* this_arg/* TODO + rtype */) {
+void handle_update_fulfill_htlc_jcall(void* this_arg/* TODO */) {
        LDKChannelMessageHandler_JCalls *arg = (LDKChannelMessageHandler_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->handle_update_fulfill_htlc_meth);
+       return (*arg->env)->CallVoidMethod(arg->env, arg->o, arg->handle_update_fulfill_htlc_meth);
 }
-void handle_update_fail_htlc_jcall(void* this_arg/* TODO + rtype */) {
+void handle_update_fail_htlc_jcall(void* this_arg/* TODO */) {
        LDKChannelMessageHandler_JCalls *arg = (LDKChannelMessageHandler_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->handle_update_fail_htlc_meth);
+       return (*arg->env)->CallVoidMethod(arg->env, arg->o, arg->handle_update_fail_htlc_meth);
 }
-void handle_update_fail_malformed_htlc_jcall(void* this_arg/* TODO + rtype */) {
+void handle_update_fail_malformed_htlc_jcall(void* this_arg/* TODO */) {
        LDKChannelMessageHandler_JCalls *arg = (LDKChannelMessageHandler_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->handle_update_fail_malformed_htlc_meth);
+       return (*arg->env)->CallVoidMethod(arg->env, arg->o, arg->handle_update_fail_malformed_htlc_meth);
 }
-void handle_commitment_signed_jcall(void* this_arg/* TODO + rtype */) {
+void handle_commitment_signed_jcall(void* this_arg/* TODO */) {
        LDKChannelMessageHandler_JCalls *arg = (LDKChannelMessageHandler_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->handle_commitment_signed_meth);
+       return (*arg->env)->CallVoidMethod(arg->env, arg->o, arg->handle_commitment_signed_meth);
 }
-void handle_revoke_and_ack_jcall(void* this_arg/* TODO + rtype */) {
+void handle_revoke_and_ack_jcall(void* this_arg/* TODO */) {
        LDKChannelMessageHandler_JCalls *arg = (LDKChannelMessageHandler_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->handle_revoke_and_ack_meth);
+       return (*arg->env)->CallVoidMethod(arg->env, arg->o, arg->handle_revoke_and_ack_meth);
 }
-void handle_update_fee_jcall(void* this_arg/* TODO + rtype */) {
+void handle_update_fee_jcall(void* this_arg/* TODO */) {
        LDKChannelMessageHandler_JCalls *arg = (LDKChannelMessageHandler_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->handle_update_fee_meth);
+       return (*arg->env)->CallVoidMethod(arg->env, arg->o, arg->handle_update_fee_meth);
 }
-void handle_announcement_signatures_jcall(void* this_arg/* TODO + rtype */) {
+void handle_announcement_signatures_jcall(void* this_arg/* TODO */) {
        LDKChannelMessageHandler_JCalls *arg = (LDKChannelMessageHandler_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->handle_announcement_signatures_meth);
+       return (*arg->env)->CallVoidMethod(arg->env, arg->o, arg->handle_announcement_signatures_meth);
 }
-void peer_disconnected_jcall(void* this_arg/* TODO + rtype */) {
+void peer_disconnected_jcall(void* this_arg/* TODO */) {
        LDKChannelMessageHandler_JCalls *arg = (LDKChannelMessageHandler_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->peer_disconnected_meth);
+       return (*arg->env)->CallVoidMethod(arg->env, arg->o, arg->peer_disconnected_meth);
 }
-void peer_connected_jcall(void* this_arg/* TODO + rtype */) {
+void peer_connected_jcall(void* this_arg/* TODO */) {
        LDKChannelMessageHandler_JCalls *arg = (LDKChannelMessageHandler_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->peer_connected_meth);
+       return (*arg->env)->CallVoidMethod(arg->env, arg->o, arg->peer_connected_meth);
 }
-void handle_channel_reestablish_jcall(void* this_arg/* TODO + rtype */) {
+void handle_channel_reestablish_jcall(void* this_arg/* TODO */) {
        LDKChannelMessageHandler_JCalls *arg = (LDKChannelMessageHandler_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->handle_channel_reestablish_meth);
+       return (*arg->env)->CallVoidMethod(arg->env, arg->o, arg->handle_channel_reestablish_meth);
 }
-void handle_error_jcall(void* this_arg/* TODO + rtype */) {
+void handle_error_jcall(void* this_arg/* TODO */) {
        LDKChannelMessageHandler_JCalls *arg = (LDKChannelMessageHandler_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->handle_error_meth);
+       return (*arg->env)->CallVoidMethod(arg->env, arg->o, arg->handle_error_meth);
 }
 void LDKChannelMessageHandler_JCalls_free(void* this_arg) {
        LDKChannelMessageHandler_JCalls *arg = (LDKChannelMessageHandler_JCalls*) this_arg;
@@ -672,33 +672,33 @@ typedef struct LDKRoutingMessageHandler_JCalls {
        jmethodID get_next_node_announcements_meth;
        jmethodID should_request_full_sync_meth;
 } LDKRoutingMessageHandler_JCalls;
-void handle_node_announcement_jcall(void* this_arg/* TODO + rtype */) {
+jlong handle_node_announcement_jcall(void* this_arg/* TODO */) {
        LDKRoutingMessageHandler_JCalls *arg = (LDKRoutingMessageHandler_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->handle_node_announcement_meth);
+       return (*arg->env)->CallLongMethod(arg->env, arg->o, arg->handle_node_announcement_meth);
 }
-void handle_channel_announcement_jcall(void* this_arg/* TODO + rtype */) {
+jlong handle_channel_announcement_jcall(void* this_arg/* TODO */) {
        LDKRoutingMessageHandler_JCalls *arg = (LDKRoutingMessageHandler_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->handle_channel_announcement_meth);
+       return (*arg->env)->CallLongMethod(arg->env, arg->o, arg->handle_channel_announcement_meth);
 }
-void handle_channel_update_jcall(void* this_arg/* TODO + rtype */) {
+jlong handle_channel_update_jcall(void* this_arg/* TODO */) {
        LDKRoutingMessageHandler_JCalls *arg = (LDKRoutingMessageHandler_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->handle_channel_update_meth);
+       return (*arg->env)->CallLongMethod(arg->env, arg->o, arg->handle_channel_update_meth);
 }
-void handle_htlc_fail_channel_update_jcall(void* this_arg/* TODO + rtype */) {
+void handle_htlc_fail_channel_update_jcall(void* this_arg/* TODO */) {
        LDKRoutingMessageHandler_JCalls *arg = (LDKRoutingMessageHandler_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->handle_htlc_fail_channel_update_meth);
+       return (*arg->env)->CallVoidMethod(arg->env, arg->o, arg->handle_htlc_fail_channel_update_meth);
 }
-void get_next_channel_announcements_jcall(void* this_arg/* TODO + rtype */) {
+jlong get_next_channel_announcements_jcall(void* this_arg/* TODO */) {
        LDKRoutingMessageHandler_JCalls *arg = (LDKRoutingMessageHandler_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->get_next_channel_announcements_meth);
+       return (*arg->env)->CallLongMethod(arg->env, arg->o, arg->get_next_channel_announcements_meth);
 }
-void get_next_node_announcements_jcall(void* this_arg/* TODO + rtype */) {
+jlong get_next_node_announcements_jcall(void* this_arg/* TODO */) {
        LDKRoutingMessageHandler_JCalls *arg = (LDKRoutingMessageHandler_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->get_next_node_announcements_meth);
+       return (*arg->env)->CallLongMethod(arg->env, arg->o, arg->get_next_node_announcements_meth);
 }
-void should_request_full_sync_jcall(void* this_arg/* TODO + rtype */) {
+jboolean should_request_full_sync_jcall(void* this_arg/* TODO */) {
        LDKRoutingMessageHandler_JCalls *arg = (LDKRoutingMessageHandler_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->should_request_full_sync_meth);
+       return (*arg->env)->CallBooleanMethod(arg->env, arg->o, arg->should_request_full_sync_meth);
 }
 void LDKRoutingMessageHandler_JCalls_free(void* this_arg) {
        LDKRoutingMessageHandler_JCalls *arg = (LDKRoutingMessageHandler_JCalls*) this_arg;
@@ -747,21 +747,21 @@ typedef struct LDKSocketDescriptor_JCalls {
        jmethodID eq_meth;
        jmethodID hash_meth;
 } LDKSocketDescriptor_JCalls;
-void send_data_jcall(void* this_arg/* TODO + rtype */) {
+jlong send_data_jcall(void* this_arg/* TODO */) {
        LDKSocketDescriptor_JCalls *arg = (LDKSocketDescriptor_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->send_data_meth);
+       return (*arg->env)->CallLongMethod(arg->env, arg->o, arg->send_data_meth);
 }
-void disconnect_socket_jcall(void* this_arg/* TODO + rtype */) {
+void disconnect_socket_jcall(void* this_arg/* TODO */) {
        LDKSocketDescriptor_JCalls *arg = (LDKSocketDescriptor_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->disconnect_socket_meth);
+       return (*arg->env)->CallVoidMethod(arg->env, arg->o, arg->disconnect_socket_meth);
 }
-void eq_jcall(void* this_arg/* TODO + rtype */) {
+jboolean eq_jcall(void* this_arg/* TODO */) {
        LDKSocketDescriptor_JCalls *arg = (LDKSocketDescriptor_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->eq_meth);
+       return (*arg->env)->CallBooleanMethod(arg->env, arg->o, arg->eq_meth);
 }
-void hash_jcall(void* this_arg/* TODO + rtype */) {
+jlong hash_jcall(void* this_arg/* TODO */) {
        LDKSocketDescriptor_JCalls *arg = (LDKSocketDescriptor_JCalls*) this_arg;
-       (*arg->env)->CallObjectMethod(arg->env, arg->o, arg->hash_meth);
+       return (*arg->env)->CallLongMethod(arg->env, arg->o, arg->hash_meth);
 }
 void* LDKSocketDescriptor_JCalls_clone(void* this_arg) {
        LDKSocketDescriptor_JCalls *ret = malloc(sizeof(LDKSocketDescriptor_JCalls));