upgrade sdk-harness test to use fuels-rs v0.61

test/src/sdk-harness/Cargo.toml

@@ -17,10 +17,7 @@ fuel-core-client = { version = "0.26.0", default-features = false }
 fuel-vm = { version = "0.49.0", features = ["random"] }
 
 # Dependencies from the `fuels-rs` repository:
-# Need to point to master until encoding v1 is default everywhere
-fuels = { git = "https://github.com/FuelLabs/fuels-rs", tag = "v0.60.0", features = [
-    "fuel-core-lib",
-] }
+fuels = { version = "0.61.0", features = ["fuel-core-lib"] }
 
 hex = "0.4.3"
 paste = "1.0.14"

test/src/sdk-harness/test_projects/low_level_call/mod.rs

@@ -11,11 +11,11 @@ use fuels::{
 macro_rules! fn_selector {
     ( $fn_name: ident ( $($fn_arg: ty),* )  ) => {
         encode_fn_selector(stringify!($fn_name)).to_vec()
-    }
+    };
 }
 macro_rules! calldata {
     ( $($arg: expr),* ) => {
-        ABIEncoder::new(EncoderConfig::default()).encode(&[$(::fuels::core::traits::Tokenizable::into_token($arg)),*]).unwrap().resolve(0)
+        ABIEncoder::new(EncoderConfig::default()).encode(&[$(::fuels::core::traits::Tokenizable::into_token($arg)),*]).unwrap()
     }
 }
 

test/src/sdk-harness/test_projects/predicate_data_simple/mod.rs

@@ -5,10 +5,7 @@ use fuels::{
     accounts::wallet::{Wallet, WalletUnlocked},
     core::codec::{ABIEncoder, EncoderConfig},
     prelude::*,
-    types::{
-        input::Input, transaction_builders::ScriptTransactionBuilder,
-        unresolved_bytes::UnresolvedBytes, Token,
-    },
+    types::{input::Input, transaction_builders::ScriptTransactionBuilder, Token},
 };
 use std::str::FromStr;
 
@@ -63,7 +60,7 @@ async fn submit_to_predicate(
     amount_to_predicate: u64,
     asset_id: AssetId,
     receiver_address: Address,
-    predicate_data: UnresolvedBytes,
+    predicate_data: Vec<u8>,
 ) -> Result<()> {
     let filter = ResourceFilter {
         from: predicate_address.into(),

test/src/sdk-harness/test_projects/predicate_data_struct/mod.rs

@@ -5,10 +5,7 @@ use fuels::{
     accounts::wallet::{Wallet, WalletUnlocked},
     core::codec::{ABIEncoder, EncoderConfig},
     prelude::*,
-    types::{
-        input::Input, transaction_builders::ScriptTransactionBuilder,
-        unresolved_bytes::UnresolvedBytes, Token,
-    },
+    types::{input::Input, transaction_builders::ScriptTransactionBuilder, Token},
 };
 use std::str::FromStr;
 
@@ -61,7 +58,7 @@ async fn submit_to_predicate(
     amount_to_predicate: u64,
     asset_id: AssetId,
     receiver_address: Address,
-    predicate_data: UnresolvedBytes,
+    predicate_data: Vec<u8>,
 ) {
     let filter = ResourceFilter {
         from: predicate_address.into(),
@@ -114,7 +111,7 @@ struct Validation {
     total_complete: u64,
 }
 
-fn encode_struct(predicate_struct: Validation) -> UnresolvedBytes {
+fn encode_struct(predicate_struct: Validation) -> Vec<u8> {
     let has_account = Token::Bool(predicate_struct.has_account);
     let total_complete = Token::U64(predicate_struct.total_complete);
     let token_struct: Vec<Token> = vec![has_account, total_complete];

test/src/sdk-harness/test_projects/tx_fields/mod.rs

@@ -93,7 +93,7 @@ async fn generate_predicate_inputs(
         .unwrap()
         .with_provider(provider.clone());
 
-    let predicate_code = predicate.code().clone();
+    let predicate_code = predicate.code().to_vec();
 
     let predicate_root = predicate.address();