feat(blockifier_test_utils): move RunnableCairo1 from blockifier::tes…

…t_utils and update dependencies
starkware-libs · Feb 6, 2025 · 3103892 · 3103892
1 parent 7556abb
commit 3103892
Show file tree

Hide file tree

Showing 46 changed files with 100 additions and 64 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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";