Move ClassHash into transaction module (#1232)

* Move ClassHash into transaction module

* fmt

Author: fmoletta

bench/internals.rs

@@ -18,8 +18,8 @@ use starknet_in_rust::{
         cached_state::CachedState, contract_class_cache::PermanentContractClassCache,
         in_memory_state_reader::InMemoryStateReader, state_api::State,
     },
+    transaction::ClassHash,
     transaction::{declare::Declare, Address, Deploy, DeployAccount, InvokeFunction},
-    utils::ClassHash,
 };
 use std::{hint::black_box, sync::Arc};
 

bench/yas.rs

@@ -33,7 +33,8 @@ use tracing_subscriber::{EnvFilter, FmtSubscriber};
 #[cfg(feature = "cairo-native")]
 use {
     cairo_native::cache::{AotProgramCache, JitProgramCache, ProgramCache},
-    starknet_in_rust::utils::{get_native_context, ClassHash},
+    starknet_in_rust::transaction::ClassHash,
+    starknet_in_rust::utils::get_native_context,
     std::{cell::RefCell, rc::Rc},
 };
 
@@ -989,7 +990,7 @@ mod utils {
             in_memory_state_reader::InMemoryStateReader, state_api::State,
         },
         transaction::Address,
-        utils::ClassHash,
+        transaction::ClassHash,
         CasmContractClass, ContractClass as SierraContractClass,
     };
     use std::{fs, path::Path, sync::Arc};

examples/lru_cache/main.rs

@@ -12,8 +12,8 @@ use starknet_in_rust::{
         contract_class_cache::{ContractClassCache, PermanentContractClassCache},
         in_memory_state_reader::InMemoryStateReader,
     },
-    transaction::{Address, Declare, Deploy, InvokeFunction},
-    utils::{calculate_sn_keccak, ClassHash},
+    transaction::{Address, ClassHash, Declare, Deploy, InvokeFunction},
+    utils::calculate_sn_keccak,
 };
 use std::{
     num::NonZeroUsize,

fuzzer/src/main.rs

@@ -5,7 +5,7 @@ extern crate honggfuzz;
 
 use cairo_vm::{vm::runners::cairo_runner::ExecutionResources, Felt252};
 use starknet_in_rust::execution::execution_entry_point::ExecutionResult;
-use starknet_in_rust::utils::ClassHash;
+use starknet_in_rust::transaction::ClassHash;
 use starknet_in_rust::EntryPointType;
 use starknet_in_rust::{
     definitions::{block_context::BlockContext, constants::TRANSACTION_VERSION},

rpc_state_reader/src/sir_state_reader.rs

@@ -28,10 +28,9 @@ use starknet_in_rust::{
         BlockInfo,
     },
     transaction::{
-        declare_tx_from_sn_api_transaction, error::TransactionError, Address, DeployAccount,
-        InvokeFunction, L1Handler,
+        declare_tx_from_sn_api_transaction, error::TransactionError, Address, ClassHash,
+        DeployAccount, InvokeFunction, L1Handler,
     },
-    utils::ClassHash,
 };
 
 use crate::{

src/bin/fibonacci.rs

@@ -1,7 +1,7 @@
 use cairo_vm::Felt252;
 use lazy_static::lazy_static;
 
-use starknet_in_rust::utils::ClassHash;
+use starknet_in_rust::transaction::ClassHash;
 use starknet_in_rust::{
     definitions::{block_context::BlockContext, constants::TRANSACTION_VERSION},
     execution::{

src/bin/invoke.rs

@@ -10,8 +10,7 @@ use starknet_in_rust::{
         cached_state::CachedState, contract_class_cache::PermanentContractClassCache,
         in_memory_state_reader::InMemoryStateReader,
     },
-    transaction::{Address, InvokeFunction, Transaction},
-    utils::ClassHash,
+    transaction::{Address, ClassHash, InvokeFunction, Transaction},
 };
 use std::{path::PathBuf, sync::Arc};
 

src/bin/invoke_with_cachedstate.rs

@@ -9,13 +9,11 @@ use starknet_in_rust::{
     services::api::contract_classes::{
         compiled_class::CompiledClass, deprecated_contract_class::ContractClass,
     },
-    state::in_memory_state_reader::InMemoryStateReader,
     state::{
-        cached_state::CachedState, contract_class_cache::PermanentContractClassCache, BlockInfo,
+        cached_state::CachedState, contract_class_cache::PermanentContractClassCache,
+        in_memory_state_reader::InMemoryStateReader, BlockInfo,
     },
-    transaction::Address,
-    transaction::{InvokeFunction, VersionSpecificAccountTxFields},
-    utils::ClassHash,
+    transaction::{Address, ClassHash, InvokeFunction, VersionSpecificAccountTxFields},
 };
 use std::{collections::HashMap, path::PathBuf, sync::Arc};
 

src/bin/native_bench.rs

@@ -32,8 +32,7 @@ use starknet_in_rust::{
     },
     state::cached_state::CachedState,
     state::{in_memory_state_reader::InMemoryStateReader, ExecutionResourcesManager},
-    transaction::Address,
-    utils::ClassHash,
+    transaction::{Address, ClassHash},
 };
 use std::cell::RefCell;
 use std::rc::Rc;

src/core/errors/state_errors.rs

@@ -1,6 +1,7 @@
 use crate::{
-    services::api::contract_class_errors::ContractClassError, state::state_cache::StorageEntry,
-    transaction::Address, utils::ClassHash,
+    services::api::contract_class_errors::ContractClassError,
+    state::state_cache::StorageEntry,
+    transaction::{Address, ClassHash},
 };
 use starknet::core::types::FromByteArrayError;
 use thiserror::Error;