Use resolved types.

FuelLabs · Jul 15, 2024 · 8308dea · 8308dea
1 parent 40e7971
commit 8308dea
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 16 deletions.
diff --git a/sway-core/src/abi_generation/abi_str.rs b/sway-core/src/abi_generation/abi_str.rs
@@ -35,7 +35,7 @@ impl TypeId {
                 }
                 (TypeInfo::Tuple(fields), TypeInfo::Tuple(resolved_fields)) => {
                     assert_eq!(fields.len(), resolved_fields.len());
-                    let field_strs = fields
+                    let field_strs = resolved_fields
                         .iter()
                         .map(|f| {
                             if ctx.abi_with_fully_specified_types {
@@ -47,7 +47,7 @@ impl TypeId {
                         .collect::<Vec<String>>();
                     format!("({})", field_strs.join(", "))
                 }
-                (TypeInfo::Array(type_arg, count), TypeInfo::Array(_, resolved_count)) => {
+                (TypeInfo::Array(_, count), TypeInfo::Array(type_arg, resolved_count)) => {
                     assert_eq!(count.val(), resolved_count.val());
                     let inner_type = if ctx.abi_with_fully_specified_types {
                         type_engine.get(type_arg.type_id).abi_str(ctx, engines)

diff --git a/sway-core/src/abi_generation/fuel_abi.rs b/sway-core/src/abi_generation/fuel_abi.rs
@@ -788,22 +788,16 @@ impl TypeId {
 
                 type_arguments
                     .iter()
-                    .map(|arg| {
+                    .zip(resolved_params.iter())
+                    .map(|(arg, p)| {
                         Ok(program_abi::TypeApplication {
                             name: "".to_string(),
-                            type_id: arg.initial_type_id.get_abi_type_id(
-                                handler,
-                                ctx,
-                                engines,
-                                arg.type_id,
-                            )?,
-                            type_arguments: arg.initial_type_id.get_abi_type_arguments(
-                                handler,
-                                ctx,
-                                engines,
-                                types,
-                                arg.type_id,
-                            )?,
+                            type_id: arg
+                                .initial_type_id
+                                .get_abi_type_id(handler, ctx, engines, p.type_id)?,
+                            type_arguments: arg
+                                .initial_type_id
+                                .get_abi_type_arguments(handler, ctx, engines, types, p.type_id)?,
                         })
                     })
                     .collect::<Result<Vec<_>, _>>()?