From 98109faebbb4686c178e5feca696c72d028a70d4 Mon Sep 17 00:00:00 2001
From: Marcos Henrich <marcoshenrich@gmail.com>
Date: Fri, 19 Jul 2024 12:02:46 +0100
Subject: [PATCH] Fixes.

---
 sway-core/src/abi_generation/fuel_abi.rs | 8 ++++----
 test/src/sdk-harness/Cargo.toml          | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/sway-core/src/abi_generation/fuel_abi.rs b/sway-core/src/abi_generation/fuel_abi.rs
index ede4a47a0cf..0e9e1968969 100644
--- a/sway-core/src/abi_generation/fuel_abi.rs
+++ b/sway-core/src/abi_generation/fuel_abi.rs
@@ -54,7 +54,7 @@ impl TypeId {
                     .read(engines, |m| m.name.clone().map(|v| v.as_str().to_string())),
                 abi_with_callpaths: true,
                 abi_with_fully_specified_types: true,
-                abi_root_type_without_generic_type_parameters: true,
+                abi_root_type_without_generic_type_parameters: false,
             },
             engines,
             resolved_type_id,
@@ -631,7 +631,7 @@ impl TypeId {
         types_metadata: &mut Vec<program_abi::TypeMetadataDeclaration>,
         concrete_types: &mut Vec<program_abi::TypeConcreteDeclaration>,
         resolved_type_id: TypeId,
-        mut types_metadata_to_add: &mut Vec<program_abi::TypeMetadataDeclaration>,
+        types_metadata_to_add: &mut Vec<program_abi::TypeMetadataDeclaration>,
     ) -> Result<Option<Vec<program_abi::TypeApplication>>, ErrorEmitted> {
         let type_engine = engines.te();
         let decl_engine = engines.de();
@@ -903,7 +903,7 @@ impl TypeId {
         types_metadata: &mut Vec<program_abi::TypeMetadataDeclaration>,
         concrete_types: &mut Vec<program_abi::TypeConcreteDeclaration>,
         resolved_type_id: TypeId,
-        mut types_metadata_to_add: &mut Vec<program_abi::TypeMetadataDeclaration>,
+        types_metadata_to_add: &mut Vec<program_abi::TypeMetadataDeclaration>,
     ) -> Result<Option<Vec<program_abi::TypeApplication>>, ErrorEmitted> {
         let type_engine = engines.te();
         let decl_engine = engines.de();
@@ -1202,7 +1202,7 @@ impl TypeParameter {
         engines: &Engines,
         types_metadata: &mut Vec<program_abi::TypeMetadataDeclaration>,
         concrete_types: &mut Vec<program_abi::TypeConcreteDeclaration>,
-        mut types_metadata_to_add: &mut Vec<program_abi::TypeMetadataDeclaration>,
+        types_metadata_to_add: &mut Vec<program_abi::TypeMetadataDeclaration>,
     ) -> Result<MetadataTypeId, ErrorEmitted> {
         let type_id = MetadataTypeId(self.initial_type_id.index());
         let type_parameter = program_abi::TypeMetadataDeclaration {
diff --git a/test/src/sdk-harness/Cargo.toml b/test/src/sdk-harness/Cargo.toml
index ddc25e72acd..65b870fb467 100644
--- a/test/src/sdk-harness/Cargo.toml
+++ b/test/src/sdk-harness/Cargo.toml
@@ -14,10 +14,11 @@ fuel-core = { version = "0.31.0", default-features = false }
 fuel-core-client = { version = "0.31.0", default-features = false }
 
 # Dependencies from the `fuel-vm` repository:
-fuel-vm = { version = "0.52.0", features = ["random"] }
+fuel-vm = { version = "0.55.0", features = ["random"] }
 
 # Dependencies from the `fuels-rs` repository:
-fuels = { version = "0.64.0", features = ["fuel-core-lib"] }
+fuels = { git = "https://github.com/FuelLabs/fuels-rs", branch = "esdrubal/abi_changes2", features = ["fuel-core-lib"]}
+#fuels = { version = "0.64.0", features = ["fuel-core-lib"] }
 
 hex = "0.4.3"
 paste = "1.0.14"