split array accessors known a priori into fixed and variable length ones

Author: arik-so

src/conversion_helper.py

@@ -11,7 +11,7 @@ def __init__(self, key: str, size: int = -1, length_key = None):
 		self.length_key: str = length_key
 
 
-array_accessor_types: dict[str, ArrayAccessorType] = {
+array_accessor_types_fixed_length: dict[str, ArrayAccessorType] = {
 	"LDKThirtyTwoBytes": ArrayAccessorType(size=32, key='data'),
 	"LDKPaymentPreimage": ArrayAccessorType(size=32, key='data'),
 	"LDKPublicKey": ArrayAccessorType(size=33, key='compressed_form'),
@@ -23,11 +23,20 @@ def __init__(self, key: str, size: int = -1, length_key = None):
 	"LDKTwelveBytes": ArrayAccessorType(size=12, key='data'),
 	"LDKSixteenBytes": ArrayAccessorType(size=16, key='data'),
 	"LDKTwentyBytes": ArrayAccessorType(size=20, key='data'),
-	"LDKRecoverableSignature": ArrayAccessorType(size=68, key='serialized_form'),
+	"LDKRecoverableSignature": ArrayAccessorType(size=68, key='serialized_form')
+}
+
+array_accessor_types_variable_length: dict[str, ArrayAccessorType] = {
+	"LDKu5slice": ArrayAccessorType(length_key='datalen', key='data'),
 	"LDKu8slice": ArrayAccessorType(length_key='datalen', key='data'),
 	"LDKCVec_u8Z": ArrayAccessorType(length_key='datalen', key='data'),
 	"LDKCVec_u5Z": ArrayAccessorType(length_key='datalen', key='data'),
-	"LDKTransaction": ArrayAccessorType(length_key='datalen', key='data'),
+	"LDKTransaction": ArrayAccessorType(length_key='datalen', key='data')
+}
+
+array_accessor_types: dict[str, ArrayAccessorType] = {
+	**array_accessor_types_fixed_length,
+	**array_accessor_types_variable_length
 }
 
 class ConversionHelper:
@@ -348,17 +357,6 @@ def prepare_native_to_swift_callback_arguments(cls, argument_types, array_unwrap
 				elif received_raw_type is not None and received_raw_type.startswith('LDK'):
 					swift_local_conversion_prefix = f'Bindings.{received_raw_type}_to_array(nativeType: '
 					swift_local_conversion_suffix = ')'
-				elif received_raw_type == 'LDKTransaction':
-					swift_local_conversion_prefix = f'Bindings.LDKTransaction_to_array(nativeType: '
-					swift_local_conversion_suffix = ')'
-					published_swift_type = '[UInt8]'
-				elif received_raw_type == 'LDKu8slice':
-					swift_local_conversion_prefix = f'Bindings.LDKu8slice_to_array(nativeType: '
-					swift_local_conversion_suffix = ')'
-					published_swift_type = '[UInt8]'
-				elif received_raw_type == 'LDKCVec_PaymentPreimageZ':
-					swift_local_conversion_prefix = f'Bindings.LDKCVec_PaymentPreimageZ_to_array(nativeType: '
-					swift_local_conversion_suffix = ')'
 			elif received_raw_type is not None and received_raw_type.startswith('LDK'):
 				if cls.is_instance_type(published_swift_type, received_raw_type):
 					swift_local_conversion_prefix = f'{published_swift_type}(pointer: '

src/lightning_header_parser.py

@@ -219,7 +219,7 @@ def populate_type_details(self):
 						vec_ty_match = line_indicates_vec_regex.match(struct_line)
 						if vec_ty_match is not None and struct_name.startswith("LDKCVec_"):
 							iterated_type = vec_ty_match.group(2)
-						elif struct_name in ['LDKTransaction', 'LDKCVec_u8Z', 'LDKu8slice', 'LDKu5slice', 'LDKCVec_u5Z']:
+						elif struct_name in src.conversion_helper.array_accessor_types_variable_length.keys():
 							iterated_type = 'uint8_t'
 						elif struct_name.startswith("LDKC2Tuple_") or struct_name.startswith("LDKC3Tuple_"):
 							# this check should only be run once, it can be moved out of the loop