Add swift type normalization as a method

Author: arik-so

src/conversion_helper.py

@@ -10,6 +10,13 @@ class ConversionHelper:
 	freeable_types = set()
 	nullable_inner_types = {'LDKOutPoint'}
 
+	@classmethod
+	def normalize_swift_type(cls, swift_type: str):
+		if swift_type == 'Type':
+			return 'BindingsType'
+
+		return swift_type
+
 	@classmethod
 	def is_instance_type(cls, swift_type: str, raw_rust_type: str, include_options_and_results: bool = True):
 		if raw_rust_type == 'LDK' + swift_type:

src/generators/trait_generator.py

@@ -21,9 +21,7 @@ def generate_trait(self, struct_name, struct_details):
 		# native_method_names = ['ChannelHandler_openChannel', 'ChannelHandler_closeChannel']
 
 		# swift_struct_name = struct_name[3:] + 'Trait'
-		swift_struct_name = struct_name[3:]
-		if swift_struct_name == 'Type':
-			swift_struct_name = 'BindingsType'
+		swift_struct_name = ConversionHelper.normalize_swift_type(struct_name[3:])
 
 		native_callback_template_regex = re.compile("(\/\* NATIVE_CALLBACKS_START \*\/\n)(.*)(\n[\t ]*\/\* NATIVE_CALLBACKS_END \*\/)", flags=re.MULTILINE | re.DOTALL)
 		native_callback_template = native_callback_template_regex.search(self.template).group(2)

src/swift_type_mapper.py

@@ -1,5 +1,6 @@
 from src.binding_types import TypeInfo
 from src.type_parsing_regeces import TypeParsingRegeces
+from src.conversion_helper import ConversionHelper
 
 var_is_arr_regex = TypeParsingRegeces.IS_VARIABLE_AN_ARRAY_REGEX
 var_ty_regex = TypeParsingRegeces.VARIABLE_TYPE_REGEX
@@ -291,8 +292,7 @@ def map_types_to_swift(fn_arg, ret_arr_len, java_c_types_none_allowed, tuple_typ
 
 	# TODO: remove java_hu_type vs java_type duality artifact
 
-	if swift_type == 'Type':
-		swift_type = 'BindingsType'
+	swift_type = ConversionHelper.normalize_swift_type(swift_type)
 
 	var_is_arr = var_is_arr_regex.match(fn_arg)
 	if var_is_arr is not None or ret_arr_len is not None:

xcode/compile_dependency_binaries.sh

@@ -12,7 +12,7 @@ usage() {
 	exit 1
 }
 
-[ "${LDK_DIRECTORY}" = "" ] && echo "Usage: ./docker_shell.sh /path/to/ldk-c-bindings" && exit 1;
+[ "${LDK_DIRECTORY}" = "" ] && echo "Usage: ./compile_dependency_binaries.sh /path/to/ldk-c-bindings" && exit 1;
 [ ! -d "${LDK_DIRECTORY}" ] && echo "Provided directory does not exist" && exit 1;
 
 
@@ -28,7 +28,8 @@ cp "${LDK_DIRECTORY}/ldk-net/ldk_net."{c,h} $DIRECT_BINDINGS_PROJECT_DIRECTORY
 
 # build for Catalyst
 pushd $C_BINDINGS_SOURCE_DIRECTORY
-export RUSTFLAGS=""
+#export RUSTFLAGS=""
+export RUSTFLAGS="--cfg=c_bindings"
 
 rustup override set nightly
 cargo clean