From 310389238a9281ac489c3ceb8240a9ed977a6b43 Mon Sep 17 00:00:00 2001 From: rotem-starkware Date: Sun, 2 Feb 2025 15:15:30 +0200 Subject: [PATCH] feat(blockifier_test_utils): move RunnableCairo1 from blockifier::test_utils and update dependencies --- Cargo.lock | 2 ++ crates/blockifier/Cargo.toml | 6 +++++- crates/blockifier/src/blockifier/block_test.rs | 3 ++- .../src/blockifier/stateful_validator_test.rs | 3 ++- .../src/blockifier/transaction_executor_test.rs | 3 ++- .../blockifier/src/concurrency/fee_utils_test.rs | 3 ++- .../src/concurrency/versioned_state_test.rs | 3 ++- .../src/concurrency/worker_logic_test.rs | 3 ++- .../src/execution/entry_point_execution_test.rs | 2 +- .../blockifier/src/execution/stack_trace_test.rs | 3 ++- .../syscalls/syscall_tests/call_contract.rs | 2 +- .../src/execution/syscalls/syscall_tests/deploy.rs | 8 ++------ .../execution/syscalls/syscall_tests/emit_event.rs | 3 ++- .../syscalls/syscall_tests/get_block_hash.rs | 3 ++- .../syscalls/syscall_tests/get_class_hash_at.rs | 3 ++- .../syscalls/syscall_tests/get_execution_info.rs | 8 ++------ .../src/execution/syscalls/syscall_tests/keccak.rs | 3 ++- .../syscalls/syscall_tests/library_call.rs | 3 ++- .../execution/syscalls/syscall_tests/out_of_gas.rs | 3 ++- .../syscalls/syscall_tests/replace_class.rs | 3 ++- .../src/execution/syscalls/syscall_tests/secp.rs | 3 ++- .../syscalls/syscall_tests/send_message_to_l1.rs | 3 ++- .../src/execution/syscalls/syscall_tests/sha256.rs | 3 ++- .../syscalls/syscall_tests/storage_read_write.rs | 3 ++- crates/blockifier/src/fee/receipt_test.rs | 3 ++- crates/blockifier/src/state/cached_state_test.rs | 3 ++- .../src/state/contract_class_manager_test.rs | 2 +- crates/blockifier/src/test_utils.rs | 14 +------------- crates/blockifier/src/test_utils/contracts.rs | 3 ++- crates/blockifier/src/test_utils/test_templates.rs | 4 +++- .../src/transaction/account_transactions_test.rs | 2 +- .../src/transaction/transactions_test.rs | 2 +- .../tests/feature_contracts_compatibility_test.rs | 3 ++- crates/blockifier_test_utils/Cargo.toml | 3 +++ crates/blockifier_test_utils/src/cairo_versions.rs | 12 ++++++++++++ crates/blockifier_test_utils/src/lib.rs | 1 + .../src/starknet_api_test_utils.rs | 6 ++++-- crates/papyrus_state_reader/Cargo.toml | 1 + .../papyrus_state_reader/src/papyrus_state_test.rs | 5 +++-- crates/starknet_gateway/Cargo.toml | 2 +- crates/starknet_gateway/bench/utils.rs | 3 ++- crates/starknet_gateway/src/gateway_test.rs | 3 ++- .../src/stateful_transaction_validator_test.rs | 3 ++- crates/starknet_integration_tests/Cargo.toml | 1 + .../starknet_integration_tests/src/state_reader.rs | 3 ++- crates/starknet_integration_tests/src/utils.rs | 3 ++- 46 files changed, 100 insertions(+), 64 deletions(-) create mode 100644 crates/blockifier_test_utils/src/cairo_versions.rs diff --git a/Cargo.lock b/Cargo.lock index cdc833ac283..e36bd3b15cc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8046,6 +8046,7 @@ version = "0.0.0" dependencies = [ "assert_matches", "blockifier", + "blockifier_test_utils", "indexmap 2.7.0", "papyrus_storage", "rstest", @@ -11062,6 +11063,7 @@ dependencies = [ "assert_matches", "axum", "blockifier", + "blockifier_test_utils", "cairo-lang-starknet-classes", "futures", "indexmap 2.7.0", diff --git a/crates/blockifier/Cargo.toml b/crates/blockifier/Cargo.toml index 341fdcaddff..ce44454ae46 100644 --- a/crates/blockifier/Cargo.toml +++ b/crates/blockifier/Cargo.toml @@ -10,7 +10,11 @@ description = "The transaction-executing component in the Starknet sequencer." workspace = true [features] -cairo_native = ["dep:cairo-native", "starknet_sierra_multicompile/cairo_native"] +cairo_native = [ + "blockifier_test_utils/cairo_native", + "dep:cairo-native", + "starknet_sierra_multicompile/cairo_native", +] native_blockifier = [] reexecution = ["transaction_serde"] testing = [ diff --git a/crates/blockifier/src/blockifier/block_test.rs b/crates/blockifier/src/blockifier/block_test.rs index 99c80101314..b5684942690 100644 --- a/crates/blockifier/src/blockifier/block_test.rs +++ b/crates/blockifier/src/blockifier/block_test.rs @@ -1,3 +1,4 @@ +use blockifier_test_utils::cairo_versions::RunnableCairo1; use starknet_api::block::{BlockHash, BlockHashAndNumber, BlockNumber}; use starknet_api::felt; use starknet_api::state::StorageKey; @@ -8,7 +9,7 @@ use crate::context::ChainInfo; use crate::state::state_api::StateReader; use crate::test_utils::contracts::FeatureContract; use crate::test_utils::initial_test_state::test_state; -use crate::test_utils::{CairoVersion, RunnableCairo1, BALANCE}; +use crate::test_utils::{CairoVersion, BALANCE}; use crate::versioned_constants::VersionedConstants; #[test] diff --git a/crates/blockifier/src/blockifier/stateful_validator_test.rs b/crates/blockifier/src/blockifier/stateful_validator_test.rs index 6e5b519dead..b394249cad3 100644 --- a/crates/blockifier/src/blockifier/stateful_validator_test.rs +++ b/crates/blockifier/src/blockifier/stateful_validator_test.rs @@ -1,4 +1,5 @@ use assert_matches::assert_matches; +use blockifier_test_utils::cairo_versions::RunnableCairo1; use rstest::rstest; use starknet_api::executable_transaction::AccountTransaction as Transaction; use starknet_api::transaction::fields::ValidResourceBounds; @@ -8,7 +9,7 @@ use crate::blockifier::stateful_validator::StatefulValidator; use crate::context::BlockContext; use crate::test_utils::contracts::FeatureContract; use crate::test_utils::initial_test_state::{fund_account, test_state}; -use crate::test_utils::{CairoVersion, RunnableCairo1, BALANCE}; +use crate::test_utils::{CairoVersion, BALANCE}; use crate::transaction::test_utils::{ block_context, create_account_tx_for_validate_test_nonce_0, diff --git a/crates/blockifier/src/blockifier/transaction_executor_test.rs b/crates/blockifier/src/blockifier/transaction_executor_test.rs index 49264026422..87655715aed 100644 --- a/crates/blockifier/src/blockifier/transaction_executor_test.rs +++ b/crates/blockifier/src/blockifier/transaction_executor_test.rs @@ -1,4 +1,5 @@ use assert_matches::assert_matches; +use blockifier_test_utils::cairo_versions::RunnableCairo1; use blockifier_test_utils::calldata::create_calldata; use pretty_assertions::assert_eq; use rstest::rstest; @@ -24,7 +25,7 @@ use crate::state::state_api::StateReader; use crate::test_utils::contracts::FeatureContract; use crate::test_utils::initial_test_state::test_state; use crate::test_utils::l1_handler::l1handler_tx; -use crate::test_utils::{maybe_dummy_block_hash_and_number, CairoVersion, RunnableCairo1, BALANCE}; +use crate::test_utils::{maybe_dummy_block_hash_and_number, CairoVersion, BALANCE}; use crate::transaction::account_transaction::AccountTransaction; use crate::transaction::errors::TransactionExecutionError; use crate::transaction::test_utils::{ diff --git a/crates/blockifier/src/concurrency/fee_utils_test.rs b/crates/blockifier/src/concurrency/fee_utils_test.rs index eb42601df64..c3cef714352 100644 --- a/crates/blockifier/src/concurrency/fee_utils_test.rs +++ b/crates/blockifier/src/concurrency/fee_utils_test.rs @@ -1,3 +1,4 @@ +use blockifier_test_utils::cairo_versions::RunnableCairo1; use blockifier_test_utils::calldata::create_trivial_calldata; use num_bigint::BigUint; use rstest::rstest; @@ -13,7 +14,7 @@ use crate::fee::fee_utils::get_sequencer_balance_keys; use crate::state::state_api::StateReader; use crate::test_utils::contracts::FeatureContract; use crate::test_utils::initial_test_state::{fund_account, test_state, test_state_inner}; -use crate::test_utils::{CairoVersion, RunnableCairo1, BALANCE}; +use crate::test_utils::{CairoVersion, BALANCE}; use crate::transaction::test_utils::{ block_context, default_all_resource_bounds, diff --git a/crates/blockifier/src/concurrency/versioned_state_test.rs b/crates/blockifier/src/concurrency/versioned_state_test.rs index e0299913050..bc17f65b856 100644 --- a/crates/blockifier/src/concurrency/versioned_state_test.rs +++ b/crates/blockifier/src/concurrency/versioned_state_test.rs @@ -3,6 +3,7 @@ use std::sync::{Arc, Mutex}; use std::thread; use assert_matches::assert_matches; +use blockifier_test_utils::cairo_versions::RunnableCairo1; use rstest::{fixture, rstest}; use starknet_api::abi::abi_utils::{get_fee_token_var_address, get_storage_var_address}; use starknet_api::core::{ClassHash, ContractAddress}; @@ -43,7 +44,7 @@ use crate::state::state_api::{State, StateReader, UpdatableState}; use crate::test_utils::contracts::FeatureContract; use crate::test_utils::dict_state_reader::DictStateReader; use crate::test_utils::initial_test_state::test_state; -use crate::test_utils::{CairoVersion, RunnableCairo1, BALANCE}; +use crate::test_utils::{CairoVersion, BALANCE}; use crate::transaction::account_transaction::AccountTransaction; use crate::transaction::objects::HasRelatedFeeType; use crate::transaction::test_utils::{default_all_resource_bounds, l1_resource_bounds}; diff --git a/crates/blockifier/src/concurrency/worker_logic_test.rs b/crates/blockifier/src/concurrency/worker_logic_test.rs index 86010e358e9..c42504fefa3 100644 --- a/crates/blockifier/src/concurrency/worker_logic_test.rs +++ b/crates/blockifier/src/concurrency/worker_logic_test.rs @@ -1,6 +1,7 @@ use std::collections::HashMap; use std::sync::Mutex; +use blockifier_test_utils::cairo_versions::RunnableCairo1; use blockifier_test_utils::calldata::{create_calldata, create_trivial_calldata}; use rstest::rstest; use starknet_api::abi::abi_utils::get_fee_token_var_address; @@ -26,7 +27,7 @@ use crate::state::cached_state::StateMaps; use crate::state::state_api::StateReader; use crate::test_utils::contracts::FeatureContract; use crate::test_utils::initial_test_state::test_state; -use crate::test_utils::{CairoVersion, RunnableCairo1, BALANCE}; +use crate::test_utils::{CairoVersion, BALANCE}; use crate::transaction::account_transaction::AccountTransaction; use crate::transaction::objects::HasRelatedFeeType; use crate::transaction::test_utils::{ diff --git a/crates/blockifier/src/execution/entry_point_execution_test.rs b/crates/blockifier/src/execution/entry_point_execution_test.rs index 7f0fc4a3226..3f1e504e320 100644 --- a/crates/blockifier/src/execution/entry_point_execution_test.rs +++ b/crates/blockifier/src/execution/entry_point_execution_test.rs @@ -1,5 +1,6 @@ use std::sync::Arc; +use blockifier_test_utils::cairo_versions::RunnableCairo1; use cairo_vm::vm::runners::cairo_runner::ExecutionResources; use rstest::rstest; use starknet_api::abi::abi_utils::selector_from_name; @@ -17,7 +18,6 @@ use crate::test_utils::{ trivial_external_entry_point_new, CairoVersion, CompilerBasedVersion, - RunnableCairo1, BALANCE, }; diff --git a/crates/blockifier/src/execution/stack_trace_test.rs b/crates/blockifier/src/execution/stack_trace_test.rs index a4a22c003ad..7169086b520 100644 --- a/crates/blockifier/src/execution/stack_trace_test.rs +++ b/crates/blockifier/src/execution/stack_trace_test.rs @@ -1,4 +1,5 @@ use assert_matches::assert_matches; +use blockifier_test_utils::cairo_versions::RunnableCairo1; use blockifier_test_utils::calldata::create_calldata; use pretty_assertions::assert_eq; use regex::Regex; @@ -47,7 +48,7 @@ use crate::execution::syscalls::hint_processor::ENTRYPOINT_FAILED_ERROR; use crate::test_utils::contracts::FeatureContract; use crate::test_utils::initial_test_state::{fund_account, test_state}; use crate::test_utils::test_templates::cairo_version; -use crate::test_utils::{CairoVersion, RunnableCairo1, BALANCE}; +use crate::test_utils::{CairoVersion, BALANCE}; use crate::transaction::account_transaction::{AccountTransaction, ExecutionFlags}; use crate::transaction::test_utils::{ block_context, diff --git a/crates/blockifier/src/execution/syscalls/syscall_tests/call_contract.rs b/crates/blockifier/src/execution/syscalls/syscall_tests/call_contract.rs index 5de7097a344..4c0f3e1b4e1 100644 --- a/crates/blockifier/src/execution/syscalls/syscall_tests/call_contract.rs +++ b/crates/blockifier/src/execution/syscalls/syscall_tests/call_contract.rs @@ -1,6 +1,7 @@ use core::panic; use std::sync::Arc; +use blockifier_test_utils::cairo_versions::RunnableCairo1; use blockifier_test_utils::calldata::create_calldata; use itertools::Itertools; use pretty_assertions::assert_eq; @@ -24,7 +25,6 @@ use crate::test_utils::{ trivial_external_entry_point_new, CairoVersion, CompilerBasedVersion, - RunnableCairo1, BALANCE, }; diff --git a/crates/blockifier/src/execution/syscalls/syscall_tests/deploy.rs b/crates/blockifier/src/execution/syscalls/syscall_tests/deploy.rs index 01d06024bf0..15f46aec219 100644 --- a/crates/blockifier/src/execution/syscalls/syscall_tests/deploy.rs +++ b/crates/blockifier/src/execution/syscalls/syscall_tests/deploy.rs @@ -1,3 +1,4 @@ +use blockifier_test_utils::cairo_versions::RunnableCairo1; use pretty_assertions::assert_eq; use starknet_api::abi::abi_utils::selector_from_name; use starknet_api::core::calculate_contract_address; @@ -12,12 +13,7 @@ use crate::retdata; use crate::state::state_api::StateReader; use crate::test_utils::contracts::FeatureContract; use crate::test_utils::initial_test_state::test_state; -use crate::test_utils::{ - calldata_for_deploy_test, - trivial_external_entry_point_new, - CairoVersion, - RunnableCairo1, -}; +use crate::test_utils::{calldata_for_deploy_test, trivial_external_entry_point_new, CairoVersion}; #[test_case(RunnableCairo1::Casm;"VM")] #[cfg_attr(feature = "cairo_native", test_case(RunnableCairo1::Native;"Native"))] diff --git a/crates/blockifier/src/execution/syscalls/syscall_tests/emit_event.rs b/crates/blockifier/src/execution/syscalls/syscall_tests/emit_event.rs index c788994e47a..f4460ec0ccc 100644 --- a/crates/blockifier/src/execution/syscalls/syscall_tests/emit_event.rs +++ b/crates/blockifier/src/execution/syscalls/syscall_tests/emit_event.rs @@ -1,3 +1,4 @@ +use blockifier_test_utils::cairo_versions::RunnableCairo1; use itertools::concat; #[cfg(feature = "cairo_native")] use pretty_assertions::assert_eq; @@ -15,7 +16,7 @@ use crate::execution::errors::EntryPointExecutionError; use crate::execution::syscalls::hint_processor::EmitEventError; use crate::test_utils::contracts::FeatureContract; use crate::test_utils::initial_test_state::test_state; -use crate::test_utils::{trivial_external_entry_point_new, CairoVersion, RunnableCairo1, BALANCE}; +use crate::test_utils::{trivial_external_entry_point_new, CairoVersion, BALANCE}; use crate::versioned_constants::VersionedConstants; const KEYS: [Felt; 2] = [Felt::from_hex_unchecked("0x2019"), Felt::from_hex_unchecked("0x2020")]; diff --git a/crates/blockifier/src/execution/syscalls/syscall_tests/get_block_hash.rs b/crates/blockifier/src/execution/syscalls/syscall_tests/get_block_hash.rs index d6be6f166a4..edbdc50413c 100644 --- a/crates/blockifier/src/execution/syscalls/syscall_tests/get_block_hash.rs +++ b/crates/blockifier/src/execution/syscalls/syscall_tests/get_block_hash.rs @@ -1,3 +1,4 @@ +use blockifier_test_utils::cairo_versions::RunnableCairo1; use pretty_assertions::assert_eq; use starknet_api::abi::abi_utils::selector_from_name; use starknet_api::block::{BlockHash, BlockNumber}; @@ -19,7 +20,7 @@ use crate::state::state_api::State; use crate::test_utils::contracts::FeatureContract; use crate::test_utils::dict_state_reader::DictStateReader; use crate::test_utils::initial_test_state::test_state; -use crate::test_utils::{trivial_external_entry_point_new, CairoVersion, RunnableCairo1, BALANCE}; +use crate::test_utils::{trivial_external_entry_point_new, CairoVersion, BALANCE}; use crate::versioned_constants::VersionedConstants; pub fn initialize_state( diff --git a/crates/blockifier/src/execution/syscalls/syscall_tests/get_class_hash_at.rs b/crates/blockifier/src/execution/syscalls/syscall_tests/get_class_hash_at.rs index 70854355a2d..d2dac30615e 100644 --- a/crates/blockifier/src/execution/syscalls/syscall_tests/get_class_hash_at.rs +++ b/crates/blockifier/src/execution/syscalls/syscall_tests/get_class_hash_at.rs @@ -1,3 +1,4 @@ +use blockifier_test_utils::cairo_versions::RunnableCairo1; use starknet_api::abi::abi_utils::selector_from_name; use starknet_api::{calldata, class_hash, contract_address, felt}; use test_case::test_case; @@ -9,7 +10,7 @@ use crate::execution::syscalls::syscall_tests::constants::REQUIRED_GAS_GET_CLASS use crate::retdata; use crate::test_utils::contracts::FeatureContract; use crate::test_utils::initial_test_state::test_state; -use crate::test_utils::{trivial_external_entry_point_new, CairoVersion, RunnableCairo1, BALANCE}; +use crate::test_utils::{trivial_external_entry_point_new, CairoVersion, BALANCE}; /// Tests the `get_class_hash_at` syscall, ensuring that: /// 1. `accessed_contract_addresses` contains `address` for a valid entry. diff --git a/crates/blockifier/src/execution/syscalls/syscall_tests/get_execution_info.rs b/crates/blockifier/src/execution/syscalls/syscall_tests/get_execution_info.rs index de1cabc8ecb..a89d480bb94 100644 --- a/crates/blockifier/src/execution/syscalls/syscall_tests/get_execution_info.rs +++ b/crates/blockifier/src/execution/syscalls/syscall_tests/get_execution_info.rs @@ -1,3 +1,4 @@ +use blockifier_test_utils::cairo_versions::RunnableCairo1; use starknet_api::abi::abi_utils::selector_from_name; use starknet_api::block::GasPrice; use starknet_api::core::ChainId; @@ -30,12 +31,7 @@ use crate::execution::common_hints::ExecutionMode; use crate::execution::entry_point::CallEntryPoint; use crate::test_utils::contracts::{FeatureContract, FeatureContractData}; use crate::test_utils::initial_test_state::test_state_ex; -use crate::test_utils::{ - trivial_external_entry_point_with_address, - CairoVersion, - RunnableCairo1, - BALANCE, -}; +use crate::test_utils::{trivial_external_entry_point_with_address, CairoVersion, BALANCE}; use crate::transaction::objects::{ CommonAccountFields, CurrentTransactionInfo, diff --git a/crates/blockifier/src/execution/syscalls/syscall_tests/keccak.rs b/crates/blockifier/src/execution/syscalls/syscall_tests/keccak.rs index e5653d902d5..74591144536 100644 --- a/crates/blockifier/src/execution/syscalls/syscall_tests/keccak.rs +++ b/crates/blockifier/src/execution/syscalls/syscall_tests/keccak.rs @@ -1,3 +1,4 @@ +use blockifier_test_utils::cairo_versions::RunnableCairo1; use starknet_api::abi::abi_utils::selector_from_name; use starknet_api::transaction::fields::Calldata; use test_case::test_case; @@ -8,7 +9,7 @@ use crate::execution::entry_point::CallEntryPoint; use crate::retdata; use crate::test_utils::contracts::FeatureContract; use crate::test_utils::initial_test_state::test_state; -use crate::test_utils::{trivial_external_entry_point_new, CairoVersion, RunnableCairo1, BALANCE}; +use crate::test_utils::{trivial_external_entry_point_new, CairoVersion, BALANCE}; #[test_case(RunnableCairo1::Casm; "VM")] #[cfg_attr(feature = "cairo_native", test_case(RunnableCairo1::Native; "Native"))] diff --git a/crates/blockifier/src/execution/syscalls/syscall_tests/library_call.rs b/crates/blockifier/src/execution/syscalls/syscall_tests/library_call.rs index 21966f38fa3..a73a0c19e42 100644 --- a/crates/blockifier/src/execution/syscalls/syscall_tests/library_call.rs +++ b/crates/blockifier/src/execution/syscalls/syscall_tests/library_call.rs @@ -1,5 +1,6 @@ use std::collections::HashSet; +use blockifier_test_utils::cairo_versions::RunnableCairo1; use pretty_assertions::assert_eq; use starknet_api::abi::abi_utils::selector_from_name; use starknet_api::{calldata, felt, storage_key}; @@ -15,7 +16,7 @@ use crate::execution::syscalls::syscall_tests::constants::{ use crate::retdata; use crate::test_utils::contracts::FeatureContract; use crate::test_utils::initial_test_state::test_state; -use crate::test_utils::{trivial_external_entry_point_new, CairoVersion, RunnableCairo1, BALANCE}; +use crate::test_utils::{trivial_external_entry_point_new, CairoVersion, BALANCE}; use crate::versioned_constants::VersionedConstants; #[cfg_attr(feature = "cairo_native", test_case(RunnableCairo1::Native; "Native"))] diff --git a/crates/blockifier/src/execution/syscalls/syscall_tests/out_of_gas.rs b/crates/blockifier/src/execution/syscalls/syscall_tests/out_of_gas.rs index 475f29dbac9..e3810a7ad01 100644 --- a/crates/blockifier/src/execution/syscalls/syscall_tests/out_of_gas.rs +++ b/crates/blockifier/src/execution/syscalls/syscall_tests/out_of_gas.rs @@ -1,3 +1,4 @@ +use blockifier_test_utils::cairo_versions::RunnableCairo1; use starknet_api::abi::abi_utils::selector_from_name; use starknet_api::{calldata, felt}; use test_case::test_case; @@ -10,7 +11,7 @@ use crate::execution::syscalls::syscall_tests::get_block_hash::initialize_state; use crate::execution::syscalls::SyscallSelector; use crate::retdata; use crate::test_utils::contracts::FeatureContract; -use crate::test_utils::{trivial_external_entry_point_new, CairoVersion, RunnableCairo1}; +use crate::test_utils::{trivial_external_entry_point_new, CairoVersion}; use crate::versioned_constants::VersionedConstants; #[cfg_attr(feature = "cairo_native", test_case(RunnableCairo1::Native; "Native"))] diff --git a/crates/blockifier/src/execution/syscalls/syscall_tests/replace_class.rs b/crates/blockifier/src/execution/syscalls/syscall_tests/replace_class.rs index f6359bc952e..2ab3280617b 100644 --- a/crates/blockifier/src/execution/syscalls/syscall_tests/replace_class.rs +++ b/crates/blockifier/src/execution/syscalls/syscall_tests/replace_class.rs @@ -1,3 +1,4 @@ +use blockifier_test_utils::cairo_versions::RunnableCairo1; use pretty_assertions::assert_eq; use starknet_api::abi::abi_utils::selector_from_name; use starknet_api::{calldata, felt}; @@ -9,7 +10,7 @@ use crate::execution::entry_point::CallEntryPoint; use crate::state::state_api::StateReader; use crate::test_utils::contracts::FeatureContract; use crate::test_utils::initial_test_state::test_state; -use crate::test_utils::{trivial_external_entry_point_new, CairoVersion, RunnableCairo1, BALANCE}; +use crate::test_utils::{trivial_external_entry_point_new, CairoVersion, BALANCE}; #[cfg_attr(feature = "cairo_native", test_case(RunnableCairo1::Native; "Native"))] #[test_case(RunnableCairo1::Casm; "VM")] diff --git a/crates/blockifier/src/execution/syscalls/syscall_tests/secp.rs b/crates/blockifier/src/execution/syscalls/syscall_tests/secp.rs index 30dad231b5e..9c18a4aef44 100644 --- a/crates/blockifier/src/execution/syscalls/syscall_tests/secp.rs +++ b/crates/blockifier/src/execution/syscalls/syscall_tests/secp.rs @@ -1,3 +1,4 @@ +use blockifier_test_utils::cairo_versions::RunnableCairo1; use starknet_api::abi::abi_utils::selector_from_name; use starknet_api::transaction::fields::Calldata; use test_case::test_case; @@ -7,7 +8,7 @@ use crate::execution::call_info::CallExecution; use crate::execution::entry_point::CallEntryPoint; use crate::test_utils::contracts::FeatureContract; use crate::test_utils::initial_test_state::test_state; -use crate::test_utils::{trivial_external_entry_point_new, CairoVersion, RunnableCairo1, BALANCE}; +use crate::test_utils::{trivial_external_entry_point_new, CairoVersion, BALANCE}; #[cfg_attr(feature = "cairo_native", test_case(RunnableCairo1::Native; "Native"))] #[test_case(RunnableCairo1::Casm; "VM")] diff --git a/crates/blockifier/src/execution/syscalls/syscall_tests/send_message_to_l1.rs b/crates/blockifier/src/execution/syscalls/syscall_tests/send_message_to_l1.rs index 0235b6ed991..5579ca0e893 100644 --- a/crates/blockifier/src/execution/syscalls/syscall_tests/send_message_to_l1.rs +++ b/crates/blockifier/src/execution/syscalls/syscall_tests/send_message_to_l1.rs @@ -1,3 +1,4 @@ +use blockifier_test_utils::cairo_versions::RunnableCairo1; use itertools::concat; use starknet_api::abi::abi_utils::selector_from_name; use starknet_api::core::EthAddress; @@ -11,7 +12,7 @@ use crate::execution::call_info::{CallExecution, MessageToL1, OrderedL2ToL1Messa use crate::execution::entry_point::CallEntryPoint; use crate::test_utils::contracts::FeatureContract; use crate::test_utils::initial_test_state::test_state; -use crate::test_utils::{trivial_external_entry_point_new, CairoVersion, RunnableCairo1, BALANCE}; +use crate::test_utils::{trivial_external_entry_point_new, CairoVersion, BALANCE}; #[cfg_attr(feature = "cairo_native", test_case(RunnableCairo1::Native; "Native"))] #[test_case(RunnableCairo1::Casm; "VM")] diff --git a/crates/blockifier/src/execution/syscalls/syscall_tests/sha256.rs b/crates/blockifier/src/execution/syscalls/syscall_tests/sha256.rs index 5cdd980568e..ede8ea44d87 100644 --- a/crates/blockifier/src/execution/syscalls/syscall_tests/sha256.rs +++ b/crates/blockifier/src/execution/syscalls/syscall_tests/sha256.rs @@ -1,3 +1,4 @@ +use blockifier_test_utils::cairo_versions::RunnableCairo1; use starknet_api::abi::abi_utils::selector_from_name; use starknet_api::transaction::fields::Calldata; use test_case::test_case; @@ -8,7 +9,7 @@ use crate::execution::entry_point::CallEntryPoint; use crate::retdata; use crate::test_utils::contracts::FeatureContract; use crate::test_utils::initial_test_state::test_state; -use crate::test_utils::{trivial_external_entry_point_new, CairoVersion, RunnableCairo1, BALANCE}; +use crate::test_utils::{trivial_external_entry_point_new, CairoVersion, BALANCE}; #[cfg_attr(feature = "cairo_native", test_case(RunnableCairo1::Native; "Native"))] #[test_case(RunnableCairo1::Casm; "VM")] diff --git a/crates/blockifier/src/execution/syscalls/syscall_tests/storage_read_write.rs b/crates/blockifier/src/execution/syscalls/syscall_tests/storage_read_write.rs index cfc09de5f38..24a49053b97 100644 --- a/crates/blockifier/src/execution/syscalls/syscall_tests/storage_read_write.rs +++ b/crates/blockifier/src/execution/syscalls/syscall_tests/storage_read_write.rs @@ -1,3 +1,4 @@ +use blockifier_test_utils::cairo_versions::RunnableCairo1; use starknet_api::abi::abi_utils::selector_from_name; use starknet_api::state::StorageKey; use starknet_api::{calldata, felt}; @@ -11,7 +12,7 @@ use crate::retdata; use crate::state::state_api::StateReader; use crate::test_utils::contracts::FeatureContract; use crate::test_utils::initial_test_state::test_state; -use crate::test_utils::{trivial_external_entry_point_new, CairoVersion, RunnableCairo1, BALANCE}; +use crate::test_utils::{trivial_external_entry_point_new, CairoVersion, BALANCE}; #[cfg_attr(feature = "cairo_native", test_case(RunnableCairo1::Native; "Native"))] #[test_case(RunnableCairo1::Casm; "VM")] diff --git a/crates/blockifier/src/fee/receipt_test.rs b/crates/blockifier/src/fee/receipt_test.rs index 5fa512a21dd..54f67409f8e 100644 --- a/crates/blockifier/src/fee/receipt_test.rs +++ b/crates/blockifier/src/fee/receipt_test.rs @@ -1,3 +1,4 @@ +use blockifier_test_utils::cairo_versions::RunnableCairo1; use blockifier_test_utils::calldata::{create_calldata, create_trivial_calldata}; use rstest::{fixture, rstest}; use starknet_api::execution_resources::GasVector; @@ -24,7 +25,7 @@ use crate::fee::resources::{StarknetResources, StateResources}; use crate::state::cached_state::StateChangesCount; use crate::test_utils::contracts::FeatureContract; use crate::test_utils::initial_test_state::test_state; -use crate::test_utils::{CairoVersion, RunnableCairo1, BALANCE}; +use crate::test_utils::{CairoVersion, BALANCE}; use crate::transaction::objects::HasRelatedFeeType; use crate::transaction::test_utils::{ calculate_class_info_for_testing, diff --git a/crates/blockifier/src/state/cached_state_test.rs b/crates/blockifier/src/state/cached_state_test.rs index e40300b9159..fd823a7ea6b 100644 --- a/crates/blockifier/src/state/cached_state_test.rs +++ b/crates/blockifier/src/state/cached_state_test.rs @@ -1,6 +1,7 @@ use std::collections::HashMap; use assert_matches::assert_matches; +use blockifier_test_utils::cairo_versions::RunnableCairo1; use blockifier_test_utils::calldata::create_calldata; use indexmap::indexmap; use pretty_assertions::assert_eq; @@ -21,7 +22,7 @@ use crate::state::cached_state::*; use crate::test_utils::contracts::FeatureContract; use crate::test_utils::dict_state_reader::DictStateReader; use crate::test_utils::initial_test_state::test_state; -use crate::test_utils::{CairoVersion, RunnableCairo1, BALANCE}; +use crate::test_utils::{CairoVersion, BALANCE}; use crate::transaction::test_utils::{default_all_resource_bounds, run_invoke_tx, STORAGE_WRITE}; const CONTRACT_ADDRESS: &str = "0x100"; diff --git a/crates/blockifier/src/state/contract_class_manager_test.rs b/crates/blockifier/src/state/contract_class_manager_test.rs index 581cdccf0de..363e8eeac13 100644 --- a/crates/blockifier/src/state/contract_class_manager_test.rs +++ b/crates/blockifier/src/state/contract_class_manager_test.rs @@ -1,6 +1,7 @@ use std::sync::mpsc::sync_channel; use std::sync::Arc; +use blockifier_test_utils::cairo_versions::RunnableCairo1; use rstest::rstest; use crate::blockifier::config::CairoNativeRunConfig; @@ -8,7 +9,6 @@ use crate::execution::contract_class::{CompiledClassV1, RunnableCompiledClass}; use crate::state::contract_class_manager::{CompilationRequest, ContractClassManager}; use crate::state::global_cache::{ContractCaches, GLOBAL_CONTRACT_CACHE_SIZE_FOR_TEST}; use crate::test_utils::contracts::FeatureContract; -use crate::test_utils::{CairoVersion, RunnableCairo1}; const TEST_CHANNEL_SIZE: usize = 10; diff --git a/crates/blockifier/src/test_utils.rs b/crates/blockifier/src/test_utils.rs index 3948a00b8e6..0194ec911cb 100644 --- a/crates/blockifier/src/test_utils.rs +++ b/crates/blockifier/src/test_utils.rs @@ -12,6 +12,7 @@ use std::fs; use std::path::PathBuf; use std::slice::Iter; +use blockifier_test_utils::cairo_versions::RunnableCairo1; use cairo_vm::types::builtin_name::BuiltinName; use cairo_vm::vm::runners::cairo_runner::ExecutionResources; use starknet_api::abi::abi_utils::get_fee_token_var_address; @@ -63,19 +64,6 @@ pub const TEST_ERC20_CONTRACT_CLASS_HASH: &str = "0x1010"; pub const ERC20_CONTRACT_PATH: &str = "./ERC20/ERC20_Cairo0/ERC20_without_some_syscalls/ERC20/\ erc20_contract_without_some_syscalls_compiled.json"; -#[derive(Clone, Hash, PartialEq, Eq, Copy, Debug)] -pub enum RunnableCairo1 { - Casm, - #[cfg(feature = "cairo_native")] - Native, -} - -impl Default for RunnableCairo1 { - fn default() -> Self { - Self::Casm - } -} - // TODO(Aviv, 14/7/2024): Move from test utils module, and use it in ContractClassVersionMismatch // error. #[derive(Clone, Hash, PartialEq, Eq, Copy, Debug)] diff --git a/crates/blockifier/src/test_utils/contracts.rs b/crates/blockifier/src/test_utils/contracts.rs index 970065ef273..5fb49bf8cdf 100644 --- a/crates/blockifier/src/test_utils/contracts.rs +++ b/crates/blockifier/src/test_utils/contracts.rs @@ -1,6 +1,7 @@ use std::collections::HashMap; use blockifier_test_utils::cairo_compile::{cairo0_compile, cairo1_compile, CompilationArtifacts}; +use blockifier_test_utils::cairo_versions::RunnableCairo1; use cairo_lang_starknet_classes::casm_contract_class::CasmContractClass; use cairo_lang_starknet_classes::contract_class::ContractClass as CairoLangContractClass; use itertools::Itertools; @@ -23,7 +24,7 @@ use crate::execution::entry_point::EntryPointTypeAndSelector; #[cfg(feature = "cairo_native")] use crate::execution::native::contract_class::NativeCompiledClassV1; use crate::test_utils::struct_impls::LoadContractFromFile; -use crate::test_utils::{get_raw_contract_class, CairoVersion, RunnableCairo1}; +use crate::test_utils::{get_raw_contract_class, CairoVersion}; pub const CAIRO1_FEATURE_CONTRACTS_DIR: &str = "feature_contracts/cairo1"; pub const SIERRA_CONTRACTS_SUBDIR: &str = "sierra"; diff --git a/crates/blockifier/src/test_utils/test_templates.rs b/crates/blockifier/src/test_utils/test_templates.rs index 65f23fc78ca..78630440e3c 100644 --- a/crates/blockifier/src/test_utils/test_templates.rs +++ b/crates/blockifier/src/test_utils/test_templates.rs @@ -1,8 +1,10 @@ +#[cfg(test)] +use blockifier_test_utils::cairo_versions::RunnableCairo1; use rstest::rstest; use rstest_reuse::{apply, template}; #[cfg(test)] -use crate::test_utils::{CairoVersion, RunnableCairo1}; +use crate::test_utils::CairoVersion; #[cfg(not(feature = "cairo_native"))] #[template] #[rstest] diff --git a/crates/blockifier/src/transaction/account_transactions_test.rs b/crates/blockifier/src/transaction/account_transactions_test.rs index 4a57013e387..295a64ccc9a 100644 --- a/crates/blockifier/src/transaction/account_transactions_test.rs +++ b/crates/blockifier/src/transaction/account_transactions_test.rs @@ -2,6 +2,7 @@ use std::collections::{HashMap, HashSet}; use std::sync::Arc; use assert_matches::assert_matches; +use blockifier_test_utils::cairo_versions::RunnableCairo1; use blockifier_test_utils::calldata::{create_calldata, create_trivial_calldata}; use cairo_vm::types::builtin_name::BuiltinName; use cairo_vm::vm::runners::cairo_runner::ResourceTracker; @@ -88,7 +89,6 @@ use crate::test_utils::{ get_tx_resources, CairoVersion, CompilerBasedVersion, - RunnableCairo1, BALANCE, }; use crate::transaction::account_transaction::{ diff --git a/crates/blockifier/src/transaction/transactions_test.rs b/crates/blockifier/src/transaction/transactions_test.rs index ce60b063c48..5dacaa4f6a4 100644 --- a/crates/blockifier/src/transaction/transactions_test.rs +++ b/crates/blockifier/src/transaction/transactions_test.rs @@ -2,6 +2,7 @@ use std::collections::{HashMap, HashSet}; use std::sync::{Arc, LazyLock}; use assert_matches::assert_matches; +use blockifier_test_utils::cairo_versions::RunnableCairo1; use blockifier_test_utils::calldata::{create_calldata, create_trivial_calldata}; use cairo_vm::types::builtin_name::BuiltinName; use cairo_vm::vm::runners::cairo_runner::ExecutionResources; @@ -123,7 +124,6 @@ use crate::test_utils::{ get_tx_resources, test_erc20_sequencer_balance_key, CairoVersion, - RunnableCairo1, SaltManager, BALANCE, }; diff --git a/crates/blockifier/tests/feature_contracts_compatibility_test.rs b/crates/blockifier/tests/feature_contracts_compatibility_test.rs index 2e56db7a246..c88fd81b5de 100644 --- a/crates/blockifier/tests/feature_contracts_compatibility_test.rs +++ b/crates/blockifier/tests/feature_contracts_compatibility_test.rs @@ -5,8 +5,9 @@ use blockifier::test_utils::contracts::{ CAIRO1_FEATURE_CONTRACTS_DIR, SIERRA_CONTRACTS_SUBDIR, }; -use blockifier::test_utils::{CairoVersion, RunnableCairo1}; +use blockifier::test_utils::CairoVersion; use blockifier_test_utils::cairo_compile::{prepare_group_tag_compiler_deps, CompilationArtifacts}; +use blockifier_test_utils::cairo_versions::RunnableCairo1; use pretty_assertions::assert_eq; use rstest::rstest; use tracing::info; diff --git a/crates/blockifier_test_utils/Cargo.toml b/crates/blockifier_test_utils/Cargo.toml index 9cf4851cf23..9cb7c68901e 100644 --- a/crates/blockifier_test_utils/Cargo.toml +++ b/crates/blockifier_test_utils/Cargo.toml @@ -6,6 +6,9 @@ repository.workspace = true license-file.workspace = true description = "Test utilities for the blockifier." +[features] +cairo_native = [] + [dependencies] cached.workspace = true serde = { workspace = true, features = ["derive"] } diff --git a/crates/blockifier_test_utils/src/cairo_versions.rs b/crates/blockifier_test_utils/src/cairo_versions.rs new file mode 100644 index 00000000000..182e0d0e5f4 --- /dev/null +++ b/crates/blockifier_test_utils/src/cairo_versions.rs @@ -0,0 +1,12 @@ +#[derive(Clone, Hash, PartialEq, Eq, Copy, Debug)] +pub enum RunnableCairo1 { + Casm, + #[cfg(feature = "cairo_native")] + Native, +} + +impl Default for RunnableCairo1 { + fn default() -> Self { + Self::Casm + } +} diff --git a/crates/blockifier_test_utils/src/lib.rs b/crates/blockifier_test_utils/src/lib.rs index 3af827f7d81..8c73f2b168c 100644 --- a/crates/blockifier_test_utils/src/lib.rs +++ b/crates/blockifier_test_utils/src/lib.rs @@ -1,4 +1,5 @@ pub mod cairo_compile; +pub mod cairo_versions; pub mod calldata; pub mod contracts; pub mod types; diff --git a/crates/mempool_test_utils/src/starknet_api_test_utils.rs b/crates/mempool_test_utils/src/starknet_api_test_utils.rs index cb00827b1d1..a9f71b3e5a0 100644 --- a/crates/mempool_test_utils/src/starknet_api_test_utils.rs +++ b/crates/mempool_test_utils/src/starknet_api_test_utils.rs @@ -7,7 +7,8 @@ use std::sync::LazyLock; use assert_matches::assert_matches; use blockifier::test_utils::contracts::FeatureContract; -use blockifier::test_utils::{CairoVersion, RunnableCairo1}; +use blockifier::test_utils::CairoVersion; +use blockifier_test_utils::cairo_versions::RunnableCairo1; use blockifier_test_utils::calldata::create_trivial_calldata; use starknet_api::abi::abi_utils::selector_from_name; use starknet_api::block::GasPrice; @@ -169,7 +170,8 @@ type SharedNonceManager = Rc>; /// /// ``` /// use blockifier::test_utils::contracts::FeatureContract; -/// use blockifier::test_utils::{CairoVersion, RunnableCairo1}; +/// use blockifier::test_utils::CairoVersion; +/// use blockifier_test_utils::cairo_versions::RunnableCairo1; /// use mempool_test_utils::starknet_api_test_utils::MultiAccountTransactionGenerator; /// use starknet_api::transaction::fields::ContractAddressSalt; /// diff --git a/crates/papyrus_state_reader/Cargo.toml b/crates/papyrus_state_reader/Cargo.toml index ec39ffb16e9..1f467ae9a04 100644 --- a/crates/papyrus_state_reader/Cargo.toml +++ b/crates/papyrus_state_reader/Cargo.toml @@ -21,6 +21,7 @@ starknet_class_manager_types.workspace = true [dev-dependencies] assert_matches.workspace = true blockifier = { path = "../blockifier", features = ["testing"] } +blockifier_test_utils = { path = "../blockifier_test_utils" } indexmap.workspace = true papyrus_storage = { path = "../papyrus_storage", features = ["testing"] } rstest.workspace = true diff --git a/crates/papyrus_state_reader/src/papyrus_state_test.rs b/crates/papyrus_state_reader/src/papyrus_state_test.rs index d1e94af1545..c50f032d20a 100644 --- a/crates/papyrus_state_reader/src/papyrus_state_test.rs +++ b/crates/papyrus_state_reader/src/papyrus_state_test.rs @@ -10,7 +10,8 @@ use blockifier::state::cached_state::CachedState; use blockifier::state::contract_class_manager::ContractClassManager; use blockifier::state::state_api::StateReader; use blockifier::test_utils::contracts::FeatureContract; -use blockifier::test_utils::{trivial_external_entry_point_new, CairoVersion, RunnableCairo1}; +use blockifier::test_utils::{trivial_external_entry_point_new, CairoVersion}; +use blockifier_test_utils::cairo_versions::RunnableCairo1; use indexmap::IndexMap; use papyrus_storage::class::ClassStorageWriter; use papyrus_storage::compiled_class::CasmStorageWriter; @@ -169,7 +170,7 @@ fn test_get_compiled_class_without_native_in_cache( let compiled_class = papyrus_reader.get_compiled_class(test_class_hash).unwrap(); if cached_with_sierra { - // TODO: Test that a compilation request was sent. + // TODO(Meshi): Test that a compilation request was sent. if wait_on_native_compilation { #[cfg(feature = "cairo_native")] assert_matches!( diff --git a/crates/starknet_gateway/Cargo.toml b/crates/starknet_gateway/Cargo.toml index 1048eaf3b65..7b0c43e17e7 100644 --- a/crates/starknet_gateway/Cargo.toml +++ b/crates/starknet_gateway/Cargo.toml @@ -15,7 +15,6 @@ testing = [] async-trait.workspace = true axum.workspace = true blockifier = { workspace = true, features = ["testing"] } -blockifier_test_utils.workspace = true cairo-lang-starknet-classes.workspace = true futures.workspace = true mempool_test_utils.workspace = true @@ -40,6 +39,7 @@ validator.workspace = true [dev-dependencies] assert_matches.workspace = true +blockifier_test_utils.path = "../blockifier_test_utils" cairo-lang-sierra-to-casm.workspace = true criterion = { workspace = true, features = ["async_tokio"] } mockall.workspace = true diff --git a/crates/starknet_gateway/bench/utils.rs b/crates/starknet_gateway/bench/utils.rs index 964144997aa..bca81623026 100644 --- a/crates/starknet_gateway/bench/utils.rs +++ b/crates/starknet_gateway/bench/utils.rs @@ -2,7 +2,8 @@ use std::sync::Arc; use blockifier::context::ChainInfo; use blockifier::test_utils::contracts::FeatureContract; -use blockifier::test_utils::{CairoVersion, RunnableCairo1}; +use blockifier::test_utils::CairoVersion; +use blockifier_test_utils::cairo_versions::RunnableCairo1; use blockifier_test_utils::calldata::create_trivial_calldata; use mempool_test_utils::starknet_api_test_utils::test_valid_resource_bounds; use starknet_api::core::ContractAddress; diff --git a/crates/starknet_gateway/src/gateway_test.rs b/crates/starknet_gateway/src/gateway_test.rs index f765712cd6c..3a5897e42d3 100644 --- a/crates/starknet_gateway/src/gateway_test.rs +++ b/crates/starknet_gateway/src/gateway_test.rs @@ -2,7 +2,8 @@ use std::sync::Arc; use assert_matches::assert_matches; use blockifier::context::ChainInfo; -use blockifier::test_utils::{CairoVersion, RunnableCairo1}; +use blockifier::test_utils::CairoVersion; +use blockifier_test_utils::cairo_versions::RunnableCairo1; use mempool_test_utils::starknet_api_test_utils::{declare_tx, invoke_tx}; use mockall::predicate::eq; use papyrus_network_types::network_types::BroadcastedMessageMetadata; diff --git a/crates/starknet_gateway/src/stateful_transaction_validator_test.rs b/crates/starknet_gateway/src/stateful_transaction_validator_test.rs index be63a0486e2..a36946cba56 100644 --- a/crates/starknet_gateway/src/stateful_transaction_validator_test.rs +++ b/crates/starknet_gateway/src/stateful_transaction_validator_test.rs @@ -5,8 +5,9 @@ use blockifier::blockifier::stateful_validator::{ StatefulValidatorResult as BlockifierStatefulValidatorResult, }; use blockifier::context::ChainInfo; -use blockifier::test_utils::{CairoVersion, RunnableCairo1}; +use blockifier::test_utils::CairoVersion; use blockifier::transaction::errors::{TransactionFeeError, TransactionPreValidationError}; +use blockifier_test_utils::cairo_versions::RunnableCairo1; use mempool_test_utils::starknet_api_test_utils::{ executable_invoke_tx as create_executable_invoke_tx, VALID_L1_GAS_MAX_AMOUNT, diff --git a/crates/starknet_integration_tests/Cargo.toml b/crates/starknet_integration_tests/Cargo.toml index 889a5bbb2ce..4a0449b6827 100644 --- a/crates/starknet_integration_tests/Cargo.toml +++ b/crates/starknet_integration_tests/Cargo.toml @@ -12,6 +12,7 @@ workspace = true assert_matches.workspace = true axum.workspace = true blockifier.workspace = true +blockifier_test_utils.workspace = true cairo-lang-starknet-classes.workspace = true futures.workspace = true indexmap.workspace = true diff --git a/crates/starknet_integration_tests/src/state_reader.rs b/crates/starknet_integration_tests/src/state_reader.rs index 32e67b4b4eb..dbceaa34fef 100644 --- a/crates/starknet_integration_tests/src/state_reader.rs +++ b/crates/starknet_integration_tests/src/state_reader.rs @@ -3,8 +3,9 @@ use std::collections::HashMap; use assert_matches::assert_matches; use blockifier::context::ChainInfo; use blockifier::test_utils::contracts::FeatureContract; -use blockifier::test_utils::{CairoVersion, RunnableCairo1, BALANCE}; +use blockifier::test_utils::{CairoVersion, BALANCE}; use blockifier::versioned_constants::VersionedConstants; +use blockifier_test_utils::cairo_versions::RunnableCairo1; use cairo_lang_starknet_classes::casm_contract_class::CasmContractClass; use indexmap::IndexMap; use itertools::Itertools; diff --git a/crates/starknet_integration_tests/src/utils.rs b/crates/starknet_integration_tests/src/utils.rs index 84bc1731465..9bf2c3d1200 100644 --- a/crates/starknet_integration_tests/src/utils.rs +++ b/crates/starknet_integration_tests/src/utils.rs @@ -8,7 +8,8 @@ use axum::Router; use blockifier::bouncer::{BouncerConfig, BouncerWeights}; use blockifier::context::ChainInfo; use blockifier::test_utils::contracts::FeatureContract; -use blockifier::test_utils::{CairoVersion, RunnableCairo1}; +use blockifier::test_utils::CairoVersion; +use blockifier_test_utils::cairo_versions::RunnableCairo1; use mempool_test_utils::starknet_api_test_utils::{ AccountId, AccountTransactionGenerator,