projects
/
ldk-java
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add handling for the new WitnessVersion type, similar to u5 but 4-bits
[ldk-java]
/
genbindings.py
diff --git
a/genbindings.py
b/genbindings.py
index a3ea7d40c57052da323b53301ba1aac1c11fe8c5..b9538114ed9b3b3bbfbbde870620fb6078e5feb9 100755
(executable)
--- a/
genbindings.py
+++ b/
genbindings.py
@@
-263,14
+263,19
@@
def java_c_types(fn_arg, ret_arr_len):
arr_ty = "uint8_t"
fn_arg = fn_arg[7:].strip()
is_primitive = True
arr_ty = "uint8_t"
fn_arg = fn_arg[7:].strip()
is_primitive = True
- elif fn_arg.startswith("LDKu5"):
+ elif fn_arg.startswith("LDKu5")
or fn_arg.startswith("LDKWitnessVersion")
:
java_ty = consts.c_type_map['uint8_t'][0]
java_ty = consts.c_type_map['uint8_t'][0]
- java_hu_ty = "UInt5"
- rust_obj = "LDKu5"
+ if fn_arg.startswith("LDKu5"):
+ java_hu_ty = "UInt5"
+ rust_obj = "LDKu5"
+ fn_arg = fn_arg[6:].strip()
+ else:
+ java_hu_ty = "WitnessVersion"
+ rust_obj = "LDKWitnessVersion"
+ fn_arg = fn_arg[18:].strip()
c_ty = "int8_t"
arr_ty = "uint8_t"
fn_ty_arg = "B"
c_ty = "int8_t"
arr_ty = "uint8_t"
fn_ty_arg = "B"
- fn_arg = fn_arg[6:].strip()
elif fn_arg.startswith("uint16_t"):
mapped_type = consts.c_type_map['uint16_t']
java_ty = mapped_type[0]
elif fn_arg.startswith("uint16_t"):
mapped_type = consts.c_type_map['uint16_t']
java_ty = mapped_type[0]
@@
-320,6
+325,14
@@
def java_c_types(fn_arg, ret_arr_len):
fn_arg = fn_arg[6:].strip()
arr_access = "chars"
arr_len = "len"
fn_arg = fn_arg[6:].strip()
arr_access = "chars"
arr_len = "len"
+ elif fn_arg.startswith("LDKError ") or fn_arg == "LDKError":
+ java_ty = consts.c_type_map['uint32_t'][0]
+ java_hu_ty = "UnqualifiedError"
+ rust_obj = "LDKError"
+ c_ty = "int32_t"
+ arr_ty = "uint32_t"
+ fn_ty_arg = "I"
+ fn_arg = fn_arg[8:].strip()
else:
ma = var_ty_regex.match(fn_arg)
arr_ty = ma.group(1).strip()
else:
ma = var_ty_regex.match(fn_arg)
arr_ty = ma.group(1).strip()