X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=ldk-java;a=blobdiff_plain;f=gen_type_mapping.py;h=ad7d46fcfa5b8ce1628503f8e33fe6bac83c7b9e;hp=9cee9ab454773332293ae6711bf8b5b6e5e2159f;hb=48812b35db8e4c14e9dc40fd1aff3f0b9ce423dd;hpb=8f8b6aaddcb1dad3d708327c78850cdb30f2a64b diff --git a/gen_type_mapping.py b/gen_type_mapping.py index 9cee9ab4..ad7d46fc 100644 --- a/gen_type_mapping.py +++ b/gen_type_mapping.py @@ -486,7 +486,15 @@ class TypeMappingGenerator: to_hu_conv = self.consts.var_decl_statement(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_sfx, to_hu_conv_name = ty_info.var_name + "_hu_conv", from_hu_conv = from_hu_conv) - # The manually-defined types - TxOut and u5 + # The manually-defined types - TxOut, u5, and Error + if ty_info.rust_obj == "LDKError": + assert from_hu_conv is None + return ConvInfo(ty_info = ty_info, arg_name = ty_info.var_name, + arg_conv = "", arg_conv_name = "(LDKError){ ._dummy = 0 }", arg_conv_cleanup = None, + ret_conv = ("/*", "*/"), ret_conv_name = "0", + to_hu_conv = self.consts.var_decl_statement(ty_info.java_hu_ty, ty_info.var_name + "_conv", "new " + ty_info.java_hu_ty + "(" + ty_info.var_name + ")") + ";", + to_hu_conv_name = ty_info.var_name + "_conv", from_hu_conv = ("0", "")) + if ty_info.rust_obj == "LDKu5": assert from_hu_conv is None return ConvInfo(ty_info = ty_info, arg_name = ty_info.var_name,