From 5785daf607e41943d021780d073e1e58f765ba03 Mon Sep 17 00:00:00 2001
From: varun-doshi <doshivarun202@gmail.com>
Date: Tue, 4 Mar 2025 01:03:09 +0530
Subject: [PATCH] apply suggestions

---
 crates/miden-lib/src/note/utils.rs                 | 10 +++++++---
 crates/miden-lib/src/transaction/errors.rs         |  4 +---
 crates/miden-lib/src/transaction/inputs.rs         | 11 ++++-------
 crates/miden-lib/src/transaction/outputs.rs        |  9 ++++-----
 crates/miden-lib/src/transaction/procedures/mod.rs |  3 +--
 5 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/crates/miden-lib/src/note/utils.rs b/crates/miden-lib/src/note/utils.rs
index 3e0f4df01..8e074efdc 100644
--- a/crates/miden-lib/src/note/utils.rs
+++ b/crates/miden-lib/src/note/utils.rs
@@ -1,8 +1,12 @@
-use crate::note::{
-    scripts, AccountId, Asset, NoteError, NoteExecutionMode, NoteInputs, NoteRecipient, NoteTag,
-    NoteType, Word,
+use miden_objects::{
+    account::AccountId,
+    asset::Asset,
+    note::{NoteExecutionMode, NoteInputs, NoteRecipient, NoteTag, NoteType},
+    NoteError, Word,
 };
 
+use crate::note::scripts;
+
 /// Creates a [NoteRecipient] for the P2ID note.
 ///
 /// Notes created with this recipient will be P2ID notes consumable by the specified target
diff --git a/crates/miden-lib/src/transaction/errors.rs b/crates/miden-lib/src/transaction/errors.rs
index a853a6b15..b76f9cc07 100644
--- a/crates/miden-lib/src/transaction/errors.rs
+++ b/crates/miden-lib/src/transaction/errors.rs
@@ -1,11 +1,9 @@
 use alloc::{boxed::Box, vec::Vec};
 use core::error::Error;
 
-use miden_objects::{note::NoteMetadata, AccountDeltaError, AssetError, NoteError};
+use miden_objects::{note::NoteMetadata, AccountDeltaError, AssetError, Digest, Felt, NoteError};
 use thiserror::Error;
 
-use crate::transaction::{Digest, Felt};
-
 // TRANSACTION KERNEL ERROR
 // ================================================================================================
 
diff --git a/crates/miden-lib/src/transaction/inputs.rs b/crates/miden-lib/src/transaction/inputs.rs
index 81a9514ed..f1252d7ef 100644
--- a/crates/miden-lib/src/transaction/inputs.rs
+++ b/crates/miden-lib/src/transaction/inputs.rs
@@ -1,14 +1,11 @@
 use alloc::vec::Vec;
 
+use super::TransactionKernel;
 use miden_objects::{
     account::{Account, StorageSlot},
-    transaction::{ChainMmr, InputNote, TransactionScript},
-    FieldElement, Word, WORD_SIZE,
-};
-
-use super::TransactionKernel;
-use crate::transaction::{
-    AdviceInputs, Digest, Felt, TransactionArgs, TransactionInputs, EMPTY_WORD, ZERO,
+    transaction::{ChainMmr, InputNote, TransactionArgs, TransactionInputs, TransactionScript},
+    vm::AdviceInputs,
+    Digest, Felt, FieldElement, Word, EMPTY_WORD, WORD_SIZE, ZERO,
 };
 
 // ADVICE INPUTS
diff --git a/crates/miden-lib/src/transaction/outputs.rs b/crates/miden-lib/src/transaction/outputs.rs
index 41489df55..7d16f2005 100644
--- a/crates/miden-lib/src/transaction/outputs.rs
+++ b/crates/miden-lib/src/transaction/outputs.rs
@@ -1,12 +1,11 @@
-use miden_objects::{AccountError, Word, WORD_SIZE};
-
 use super::memory::{
     MemoryOffset, ACCT_CODE_COMMITMENT_OFFSET, ACCT_DATA_MEM_SIZE, ACCT_ID_AND_NONCE_OFFSET,
     ACCT_NONCE_IDX, ACCT_STORAGE_COMMITMENT_OFFSET, ACCT_VAULT_ROOT_OFFSET,
 };
-use crate::transaction::{
-    memory::{ACCT_ID_PREFIX_IDX, ACCT_ID_SUFFIX_IDX},
-    AccountHeader, AccountId, Felt,
+use crate::transaction::memory::{ACCT_ID_PREFIX_IDX, ACCT_ID_SUFFIX_IDX};
+use miden_objects::{
+    account::{AccountHeader, AccountId},
+    AccountError, Felt, Word, WORD_SIZE,
 };
 
 // STACK OUTPUTS
diff --git a/crates/miden-lib/src/transaction/procedures/mod.rs b/crates/miden-lib/src/transaction/procedures/mod.rs
index 7a89c4edb..d4edbb379 100644
--- a/crates/miden-lib/src/transaction/procedures/mod.rs
+++ b/crates/miden-lib/src/transaction/procedures/mod.rs
@@ -1,10 +1,9 @@
 use alloc::vec::Vec;
 
 use kernel_v0::KERNEL0_PROCEDURES;
-use miden_objects::Hasher;
+use miden_objects::{Digest, Felt, Hasher};
 
 use super::TransactionKernel;
-use crate::transaction::{Digest, Felt};
 
 // Include kernel v0 procedure hashes generated in build.rs
 #[rustfmt::skip]