feat(starknet_infra_utils): rename crate from infra_utils (starkware-…

…libs#3129)

Signed-off-by: Dori Medini <[email protected]>

Cargo.toml

@@ -7,7 +7,6 @@ members = [
   "crates/blockifier",
   "crates/blockifier_reexecution",
   "crates/committer_cli",
-  "crates/infra_utils",
   "crates/mempool_test_utils",
   "crates/native_blockifier",
   "crates/papyrus_base_layer",
@@ -39,6 +38,7 @@ members = [
   "crates/starknet_gateway",
   "crates/starknet_gateway_types",
   "crates/starknet_http_server",
+  "crates/starknet_infra_utils",
   "crates/starknet_integration_tests",
   "crates/starknet_l1_provider",
   "crates/starknet_l1_provider_types",
@@ -134,7 +134,6 @@ http-body = "0.4.5"
 human_bytes = "0.4.3"
 hyper = "0.14"
 indexmap = "2.1.0"
-infra_utils = { path = "crates/infra_utils", version = "0.0.0" }
 insta = "1.29.0"
 integer-encoding = "3.0.4"
 itertools = "0.12.1"
@@ -227,6 +226,7 @@ starknet_consensus_manager = { path = "crates/starknet_consensus_manager", versi
 starknet_gateway = { path = "crates/starknet_gateway", version = "0.0.0" }
 starknet_gateway_types = { path = "crates/starknet_gateway_types", version = "0.0.0" }
 starknet_http_server = { path = "crates/starknet_http_server", version = "0.0.0" }
+starknet_infra_utils = { path = "crates/starknet_infra_utils", version = "0.0.0" }
 starknet_l1_provider = { path = "crates/starknet_l1_provider", version = "0.0.0" }
 starknet_l1_provider_types = { path = "crates/starknet_l1_provider_types", version = "0.0.0" }
 starknet_mempool = { path = "crates/starknet_mempool", version = "0.0.0" }

commitlint.config.js

@@ -28,7 +28,6 @@ const Configuration = {
             'consensus',
             'deployment',
             'helm',
-            'infra_utils',
             'mempool_test_utils',
             'native_blockifier',
             'papyrus_base_layer',
@@ -60,6 +59,7 @@ const Configuration = {
             'starknet_gateway',
             'starknet_gateway_types',
             'starknet_http_server',
+            'starknet_infra_utils',
             'starknet_integration_tests',
             'starknet_l1_provider',
             'starknet_l1_provider_types',

crates/blockifier/Cargo.toml

@@ -33,7 +33,6 @@ cairo-native = { workspace = true, optional = true }
 cairo-vm.workspace = true
 derive_more.workspace = true
 indexmap.workspace = true
-infra_utils.workspace = true
 itertools.workspace = true
 keccak.workspace = true
 log.workspace = true
@@ -54,6 +53,7 @@ sha2.workspace = true
 stacker = { workspace = true, optional = true }
 starknet-types-core.workspace = true
 starknet_api.workspace = true
+starknet_infra_utils.workspace = true
 starknet_sierra_compile.workspace = true
 strum.workspace = true
 strum_macros.workspace = true
@@ -76,7 +76,7 @@ starknet_api = { workspace = true, features = ["testing"] }
 test-case.workspace = true
 
 [build-dependencies]
-infra_utils.workspace = true
+starknet_infra_utils.workspace = true
 
 [[bench]]
 harness = false

crates/blockifier/build.rs

@@ -3,8 +3,8 @@ fn compile_cairo_native_aot_runtime() {
     use std::path::PathBuf;
     use std::process::Command;
 
-    use infra_utils::compile_time_cargo_manifest_dir;
-    use infra_utils::path::current_dir;
+    use starknet_infra_utils::compile_time_cargo_manifest_dir;
+    use starknet_infra_utils::path::current_dir;
 
     let cairo_native_dir =
         PathBuf::from(compile_time_cargo_manifest_dir!()).join(PathBuf::from("cairo_native"));

crates/blockifier/src/test_utils.rs

@@ -16,7 +16,6 @@ use std::slice::Iter;
 
 use cairo_vm::types::builtin_name::BuiltinName;
 use cairo_vm::vm::runners::cairo_runner::ExecutionResources;
-use infra_utils::compile_time_cargo_manifest_dir;
 use starknet_api::abi::abi_utils::{get_fee_token_var_address, selector_from_name};
 use starknet_api::block::{BlockHash, BlockHashAndNumber, BlockNumber};
 use starknet_api::core::{ClassHash, ContractAddress};
@@ -41,6 +40,7 @@ use starknet_api::transaction::fields::{
 };
 use starknet_api::transaction::TransactionVersion;
 use starknet_api::{contract_address, felt};
+use starknet_infra_utils::compile_time_cargo_manifest_dir;
 use starknet_types_core::felt::Felt;
 use strum::EnumCount;
 use strum_macros::EnumCount as EnumCountMacro;

crates/blockifier/src/test_utils/cairo_compile.rs

@@ -4,8 +4,8 @@ use std::process::{Command, Output};
 use std::{env, fs};
 
 use cached::proc_macro::cached;
-use infra_utils::compile_time_cargo_manifest_dir;
 use serde::{Deserialize, Serialize};
+use starknet_infra_utils::compile_time_cargo_manifest_dir;
 use tempfile::NamedTempFile;
 
 use crate::test_utils::contracts::TagAndToolchain;

crates/blockifier/src/versioned_constants.rs

@@ -6,7 +6,6 @@ use std::{fs, io};
 use cairo_vm::types::builtin_name::BuiltinName;
 use cairo_vm::vm::runners::cairo_runner::ExecutionResources;
 use indexmap::{IndexMap, IndexSet};
-use infra_utils::compile_time_cargo_manifest_dir;
 use num_rational::Ratio;
 use num_traits::Inv;
 use papyrus_config::dumping::{ser_param, SerializeConfig};
@@ -21,6 +20,7 @@ use starknet_api::contract_class::SierraVersion;
 use starknet_api::core::ContractAddress;
 use starknet_api::execution_resources::{GasAmount, GasVector};
 use starknet_api::transaction::fields::GasVectorComputationMode;
+use starknet_infra_utils::compile_time_cargo_manifest_dir;
 use strum::IntoEnumIterator;
 use thiserror::Error;
 

crates/mempool_test_utils/Cargo.toml

@@ -11,8 +11,8 @@ workspace = true
 [dependencies]
 assert_matches.workspace = true
 blockifier = { workspace = true, features = ["testing"] }
-infra_utils.workspace = true
 pretty_assertions.workspace = true
 serde_json.workspace = true
 starknet-types-core.workspace = true
 starknet_api.workspace = true
+starknet_infra_utils.workspace = true

crates/mempool_test_utils/src/starknet_api_test_utils.rs

@@ -8,7 +8,6 @@ use std::sync::LazyLock;
 use assert_matches::assert_matches;
 use blockifier::test_utils::contracts::FeatureContract;
 use blockifier::test_utils::{create_trivial_calldata, CairoVersion, RunnableCairo1};
-use infra_utils::path::resolve_project_relative_path;
 use pretty_assertions::assert_ne;
 use starknet_api::block::GasPrice;
 use starknet_api::core::{ClassHash, CompiledClassHash, ContractAddress, Nonce};
@@ -29,6 +28,7 @@ use starknet_api::transaction::fields::{
     ValidResourceBounds,
 };
 use starknet_api::{declare_tx_args, deploy_account_tx_args, felt, invoke_tx_args, nonce};
+use starknet_infra_utils::path::resolve_project_relative_path;
 use starknet_types_core::felt::Felt;
 
 use crate::{COMPILED_CLASS_HASH_OF_CONTRACT_CLASS, CONTRACT_CLASS_FILE, TEST_FILES_FOLDER};