X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=ldk-java;a=blobdiff_plain;f=genbindings.py;h=fe0d6f74a3bf3fbb2625e043f720b027df121825;hp=32980aa3c4e7cf8071ebcff248bac9d1ca9993d2;hb=ece2ac7ada46913e4250ba0ff0d71b5a70ae28f6;hpb=16e22740df36a3d28f8bcc5e9d8bd1c1f670f75a diff --git a/genbindings.py b/genbindings.py index 32980aa3..fe0d6f74 100755 --- a/genbindings.py +++ b/genbindings.py @@ -468,8 +468,8 @@ with open(sys.argv[1]) as in_h, open(sys.argv[2], "w") as out_java: or expected_struct in complex_enums or expected_cstruct in complex_enums or expected_cstruct in result_types) and not is_free: out_java_struct = open(f"{sys.argv[3]}/structs/{struct_meth}{consts.file_ext}", "a") - elif method_name.startswith("C2Tuple_") and method_name.endswith("_read"): - struct_meth = method_name.rsplit("_", 1)[0] + elif (method_name.startswith("C2Tuple_") and method_name.endswith("_read")) or \ + (return_type_info.rust_obj is not None and "Result" in return_type_info.rust_obj and "from" in method_name): out_java_struct = open(f"{sys.argv[3]}/structs/UtilMethods{consts.file_ext}", "a") if out_java_struct is not None: out_java_struct.write(out_java_struct_delta)