X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=genbindings.py;h=b9189b0695de3f46196495f614974301e688f588;hb=68437301d6d8209c09c7df0b1d11999ca77665d2;hp=2443dac65feaed290d4088dd00ad106f0fb21901;hpb=87edea7d57517740751cd325c61f121283342d32;p=ldk-java

diff --git a/genbindings.py b/genbindings.py
index 2443dac6..b9189b06 100755
--- a/genbindings.py
+++ b/genbindings.py
@@ -578,7 +578,8 @@ with open(sys.argv[1]) as in_h, open(sys.argv[2], "w") as out_java:
                         arg_conv = opaque_arg_conv, arg_conv_name = "&" + ty_info.var_name + "_conv", arg_conv_cleanup = None,
                         ret_conv = (ty_info.rust_obj + " " + ty_info.var_name + "_var = *", opaque_ret_conv_suf),
                         ret_conv_name = ty_info.var_name + "_ref",
-                        to_hu_conv = ty_info.java_hu_ty + " " + ty_info.var_name + "_hu_conv = new " + ty_info.java_hu_ty + "(null, " + ty_info.var_name + ");",
+                        # to_hu_conv = ty_info.java_hu_ty + " " + ty_info.var_name + "_hu_conv = new " + ty_info.java_hu_ty + "(null, " + ty_info.var_name + ");",
+                        to_hu_conv = consts.to_hu_conv_templates['ptr'].replace('{human_type}', ty_info.java_hu_ty).replace('{var_name}', ty_info.var_name),
                         to_hu_conv_name = ty_info.var_name + "_hu_conv",
                         from_hu_conv = (ty_info.var_name + " == null ? 0 : " + ty_info.var_name + ".ptr & ~1", "this.ptrs_to.add(" + ty_info.var_name + ")"))
                 else:
@@ -586,7 +587,8 @@ with open(sys.argv[1]) as in_h, open(sys.argv[2], "w") as out_java:
                         arg_conv = opaque_arg_conv, arg_conv_name = ty_info.var_name + "_conv", arg_conv_cleanup = None,
                         ret_conv = (ty_info.rust_obj + " " + ty_info.var_name + "_var = ", opaque_ret_conv_suf),
                         ret_conv_name = ty_info.var_name + "_ref",
-                        to_hu_conv = ty_info.java_hu_ty + " " + ty_info.var_name + "_hu_conv = new " + ty_info.java_hu_ty + "(null, " + ty_info.var_name + ");",
+                        # to_hu_conv = ty_info.java_hu_ty + " " + ty_info.var_name + "_hu_conv = new " + ty_info.java_hu_ty + "(null, " + ty_info.var_name + ");",
+                        to_hu_conv = consts.to_hu_conv_templates['default'].replace('{human_type}', ty_info.java_hu_ty).replace('{var_name}', ty_info.var_name),
                         to_hu_conv_name = ty_info.var_name + "_hu_conv",
                         from_hu_conv = (ty_info.var_name + " == null ? 0 : " + ty_info.var_name + ".ptr & ~1", "this.ptrs_to.add(" + ty_info.var_name + ")"))
 
@@ -1208,39 +1210,7 @@ with open(sys.argv[1]) as in_h, open(sys.argv[2], "w") as out_java:
                 write_c("\treturn tuple->" + e + ";\n")
             write_c("}\n")
 
-    out_java.write("""package org.ldk.impl;
-import org.ldk.enums.*;
-
-public class bindings {
-	public static class VecOrSliceDef {
-		public long dataptr;
-		public long datalen;
-		public long stride;
-		public VecOrSliceDef(long dataptr, long datalen, long stride) {
-			this.dataptr = dataptr; this.datalen = datalen; this.stride = stride;
-		}
-	}
-	static {
-		System.loadLibrary(\"lightningjni\");
-		init(java.lang.Enum.class, VecOrSliceDef.class);
-		init_class_cache();
-	}
-	static native void init(java.lang.Class c, java.lang.Class slicedef);
-	static native void init_class_cache();
-
-	public static native boolean deref_bool(long ptr);
-	public static native long deref_long(long ptr);
-	public static native void free_heap_ptr(long ptr);
-	public static native byte[] read_bytes(long ptr, long len);
-	public static native byte[] get_u8_slice_bytes(long slice_ptr);
-	public static native long bytes_to_u8_vec(byte[] bytes);
-	public static native long new_txpointer_copy_data(byte[] txdata);
-	public static native void txpointer_free(long ptr);
-	public static native byte[] txpointer_get_buffer(long ptr);
-	public static native long vec_slice_len(long vec);
-	public static native long new_empty_slice_vec();
-
-""")
+    out_java.write(consts.bindings_header)
 
     with open(f"{sys.argv[3]}/structs/CommonBase{consts.file_ext}", "w") as out_java_struct:
         out_java_struct.write(consts.common_base)