Restore android builds to Debian bullseye

[ldk-java] / genbindings.py

diff --git a/genbindings.py b/genbindings.py
index 67de282141766d5422cc5911e3a2add7e3a6ddd1..ee5c3783670e18da56ca7336e9b94945568c2eb3 100755 (executable)
--- a/genbindings.py
+++ b/genbindings.py
@@ -655,7 +655,8 @@ with open(sys.argv[1]) as in_h, open(f"{sys.argv[2]}/bindings{consts.file_ext}",
             expected_struct in result_types or expected_struct in tuple_types) and not is_free
         impl_on_utils = not impl_on_struct and (not is_free and not method_name.endswith("_clone") and
             not method_name.startswith("TxOut") and not method_name.startswith("TxIn") and
-            not method_name.startswith("BigEndianScalar") and not method_name.startswith("_") and
+            not method_name.startswith("BigEndianScalar") and not method_name.startswith("WitnessProgram") and
+            not method_name.startswith("_") and
             method_name != "check_platform" and method_name != "Result_read" and
             not expected_struct in unitary_enums and
             ((not method_name.startswith("C2Tuple_") and not method_name.startswith("C3Tuple_"))
@@ -1099,46 +1100,11 @@ with open(sys.argv[1]) as in_h, open(f"{sys.argv[2]}/bindings{consts.file_ext}",
                         out_java_struct.write(consts.hu_struct_file_prefix)
                         out_java_struct.write(consts.txout_defn)
                         out_java_struct.write(consts.hu_struct_file_suffix)
-                        fn_line = "struct LDKCVec_u8Z TxOut_get_script_pubkey (struct LDKTxOut* thing)"
-                        write_c(fn_line + " {")
-                        write_c("\treturn CVec_u8Z_clone(&thing->script_pubkey);")
-                        write_c("}")
-                        map_fn(fn_line + "\n", re.compile("(.*) (TxOut_get_script_pubkey) \((.*)\)").match(fn_line), None, None, None)
-                        fn_line = "uint64_t TxOut_get_value (struct LDKTxOut* thing)"
-                        write_c(fn_line + " {")
-                        write_c("\treturn thing->value;")
-                        write_c("}")
-                        map_fn(fn_line + "\n", re.compile("(.*) (TxOut_get_value) \((.*)\)").match(fn_line), None, None, None)
                 elif struct_name == "LDKTxIn":
                     with open(f"{sys.argv[3]}/structs/TxIn{consts.file_ext}", "w") as out_java_struct:
                         out_java_struct.write(consts.hu_struct_file_prefix)
                         out_java_struct.write(consts.txin_defn)
                         out_java_struct.write(consts.hu_struct_file_suffix)
-                        fn_line = "struct LDKWitness TxIn_get_witness (struct LDKTxIn* thing)"
-                        write_c(fn_line + " {")
-                        write_c("\treturn Witness_clone(&thing->witness);")
-                        write_c("}")
-                        map_fn(fn_line + "\n", re.compile("(.*) (TxIn_get_witness) \((.*)\)").match(fn_line), None, None, None)
-                        fn_line = "struct LDKCVec_u8Z TxIn_get_script_sig (struct LDKTxIn* thing)"
-                        write_c(fn_line + " {")
-                        write_c("\treturn CVec_u8Z_clone(&thing->script_sig);")
-                        write_c("}")
-                        map_fn(fn_line + "\n", re.compile("(.*) (TxIn_get_script_sig) \((.*)\)").match(fn_line), None, None, None)
-                        fn_line = "LDKThirtyTwoBytes TxIn_get_previous_txid (struct LDKTxIn* thing)"
-                        write_c(fn_line + " {")
-                        write_c("\treturn thing->previous_txid;")
-                        write_c("}")
-                        map_fn(fn_line + "\n", re.compile("(.*) (TxIn_get_previous_txid) \((.*)\)").match(fn_line), None, None, None)
-                        fn_line = "uint32_t TxIn_get_previous_vout (struct LDKTxIn* thing)"
-                        write_c(fn_line + " {")
-                        write_c("\treturn thing->previous_vout;")
-                        write_c("}")
-                        map_fn(fn_line + "\n", re.compile("(.*) (TxIn_get_previous_vout) \((.*)\)").match(fn_line), None, None, None)
-                        fn_line = "uint32_t TxIn_get_sequence (struct LDKTxIn* thing)"
-                        write_c(fn_line + " {")
-                        write_c("\treturn thing->sequence;")
-                        write_c("}")
-                        map_fn(fn_line + "\n", re.compile("(.*) (TxIn_get_sequence) \((.*)\)").match(fn_line), None, None, None)
                 elif struct_name == "LDKBigEndianScalar":
                     with open(f"{sys.argv[3]}/structs/BigEndianScalar{consts.file_ext}", "w") as out_java_struct:
                         out_java_struct.write(consts.hu_struct_file_prefix)
@@ -1159,6 +1125,11 @@ with open(sys.argv[1]) as in_h, open(f"{sys.argv[2]}/bindings{consts.file_ext}",
                         fn_line = "static void BigEndianScalar_free (struct LDKBigEndianScalar thing)"
                         write_c(fn_line + " {}\n")
                         map_fn(fn_line + "\n", re.compile("static (.*) (BigEndianScalar_free) \((.*)\)").match(fn_line), None, None, None)
+                elif struct_name == "LDKWitnessProgram":
+                    with open(f"{sys.argv[3]}/structs/WitnessProgram{consts.file_ext}", "w") as out_java_struct:
+                        out_java_struct.write(consts.hu_struct_file_prefix)
+                        out_java_struct.write(consts.witness_program_defn)
+                        out_java_struct.write(consts.hu_struct_file_suffix)
                 else:
                     pass # Everything remaining is a byte[] of some form
                 cur_block_obj = None