X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=genbindings.py;h=e5a59700352c6f0c1cdff2de3546783770396ee8;hb=4e40a51f771022cc30d977c0b5d92b031eab1e6a;hp=4ce0240cced347830126c77d7f8a7fd7f8ec2fdf;hpb=f8f3544e5c1e8ed55b15b54cd0f3c85a7f2c3e14;p=ldk-java diff --git a/genbindings.py b/genbindings.py index 4ce0240c..e5a59700 100755 --- a/genbindings.py +++ b/genbindings.py @@ -132,13 +132,15 @@ def java_c_types(fn_arg, ret_arr_len): rust_obj = None arr_access = None java_hu_ty = None - if fn_arg.startswith("LDKPaymentPreimage") or fn_arg.startswith("LDKPaymentSecret") or fn_arg.startswith("LDKPaymentHash"): + if fn_arg.startswith("LDKPaymentPreimage") or fn_arg.startswith("LDKPaymentSecret") or fn_arg.startswith("LDKPaymentHash") or fn_arg.startswith("LDKChainHash"): if fn_arg.startswith("LDKPaymentPreimage"): fn_arg = "uint8_t (*" + fn_arg[19:] + ")[32]" elif fn_arg.startswith("LDKPaymentSecret"): fn_arg = "uint8_t (*" + fn_arg[17:] + ")[32]" elif fn_arg.startswith("LDKPaymentHash"): fn_arg = "uint8_t (*" + fn_arg[15:] + ")[32]" + elif fn_arg.startswith("LDKChainHash"): + fn_arg = "uint8_t (*" + fn_arg[13:] + ")[32]" assert var_is_arr_regex.match(fn_arg[8:]) rust_obj = "LDKThirtyTwoBytes" arr_access = "data" @@ -343,14 +345,17 @@ def java_c_types(fn_arg, ret_arr_len): arr_ty = "LDKStr" fn_ty_arg = "Ljava/lang/String;" fn_arg = fn_arg[6:].strip() - elif fn_arg.startswith("LDKStr"): + elif fn_arg.startswith("LDKStr") or fn_arg.startswith("LDKAddress"): rust_obj = "LDKStr" arr_ty = "LDKStr" java_ty = consts.java_type_map["String"] java_hu_ty = consts.java_hu_type_map["String"] c_ty = "jstring" fn_ty_arg = "Ljava/lang/String;" - fn_arg = fn_arg[6:].strip() + if fn_arg.startswith("LDKAddress"): + fn_arg = fn_arg[10:].strip() + else: + fn_arg = fn_arg[6:].strip() arr_access = "chars" arr_len = "len" elif fn_arg.startswith("LDKError ") or fn_arg == "LDKError":