From 634155e9a92e231a8d5aa152b363d15b9a873f46 Mon Sep 17 00:00:00 2001
From: hal3e <hal3e.git@gmail.com>
Date: Fri, 7 Jul 2023 18:58:43 +0200
Subject: [PATCH] chore: use `fuel-asm` instead of `fuel-vm`

---
 packages/fuels-programs/Cargo.toml        |  2 +-
 packages/fuels-programs/src/call_utils.rs |  2 +-
 packages/fuels-test-helpers/Cargo.toml    |  1 -
 packages/fuels-test-helpers/src/node.rs   | 12 +++++++-----
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/packages/fuels-programs/Cargo.toml b/packages/fuels-programs/Cargo.toml
index 8265d887b..b47f9f183 100644
--- a/packages/fuels-programs/Cargo.toml
+++ b/packages/fuels-programs/Cargo.toml
@@ -15,7 +15,7 @@ bytes = { workspace = true, features = ["serde"] }
 fuel-abi-types = { workspace = true }
 fuel-tx = { workspace = true }
 fuel-types = { workspace = true, features = ["default"] }
-fuel-vm = { workspace = true }
+fuel-asm = { workspace = true }
 fuels-accounts = { workspace = true }
 fuels-core = { workspace = true }
 hex = { workspace = true, default-features = false, features = ["std"] }
diff --git a/packages/fuels-programs/src/call_utils.rs b/packages/fuels-programs/src/call_utils.rs
index 80bef0055..0eb9ca43c 100644
--- a/packages/fuels-programs/src/call_utils.rs
+++ b/packages/fuels-programs/src/call_utils.rs
@@ -1,9 +1,9 @@
 use std::{collections::HashSet, iter, vec};
 
 use fuel_abi_types::error_codes::FAILED_TRANSFER_TO_ADDRESS_SIGNAL;
+use fuel_asm::{op, RegId};
 use fuel_tx::{AssetId, Bytes32, ContractId, Output, PanicReason, Receipt, TxPointer, UtxoId};
 use fuel_types::{Address, Word};
-use fuel_vm::fuel_asm::{op, RegId};
 use fuels_accounts::Account;
 use fuels_core::{
     constants::WORD_SIZE,
diff --git a/packages/fuels-test-helpers/Cargo.toml b/packages/fuels-test-helpers/Cargo.toml
index 8f32777ca..c0637ceff 100644
--- a/packages/fuels-test-helpers/Cargo.toml
+++ b/packages/fuels-test-helpers/Cargo.toml
@@ -16,7 +16,6 @@ fuel-core-client = { workspace = true }
 fuel-core-types = { workspace = true }
 fuel-tx = { workspace = true }
 fuel-types = { workspace = true, features = ["random"] }
-fuel-vm = { workspace = true }
 fuels-accounts = { workspace = true, optional = true }
 fuels-core = { workspace = true }
 futures = { workspace = true }
diff --git a/packages/fuels-test-helpers/src/node.rs b/packages/fuels-test-helpers/src/node.rs
index c76627523..6dc5ae319 100644
--- a/packages/fuels-test-helpers/src/node.rs
+++ b/packages/fuels-test-helpers/src/node.rs
@@ -11,11 +11,13 @@ use fuel_core_chain_config::StateConfig;
 use fuel_core_client::client::FuelClient;
 use fuel_types::BlockHeight;
 use fuel_types::Word;
-use fuel_vm::consts::WORD_SIZE;
-use fuels_core::types::{
-    coin::Coin,
-    errors::{error, Error},
-    message::Message,
+use fuels_core::{
+    constants::WORD_SIZE,
+    types::{
+        coin::Coin,
+        errors::{error, Error},
+        message::Message,
+    },
 };
 use portpicker::{is_free, pick_unused_port};
 use serde::{de::Error as SerdeError, Deserializer, Serializer};