Move test utils to testing module

Cargo.toml

@@ -115,12 +115,14 @@ with-mem-tracing = []
 with-libfunc-profiling = []
 with-segfault-catcher = []
 with-trace-dump = ["dep:sierra-emu"]
-testing = ["dep:cairo-lang-compiler"]
+testing = ["dep:cairo-lang-compiler", "dep:cairo-lang-starknet", "dep:cairo-lang-filesystem"]
 
 [dependencies]
 aquamarine.workspace = true
 bumpalo.workspace = true
 cairo-lang-compiler = { workspace = true, optional = true }
+cairo-lang-filesystem = { workspace = true, optional = true }
+cairo-lang-starknet = { workspace = true, optional = true }
 cairo-lang-runner.workspace = true
 cairo-lang-sierra.workspace = true
 cairo-lang-utils.workspace = true

src/cache/aot.rs

@@ -87,7 +87,7 @@ where
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{utils::test::load_cairo, values::Value};
+    use crate::{load_cairo, values::Value};
     use starknet_types_core::felt::Felt;
 
     #[test]

src/cache/jit.rs

@@ -70,7 +70,7 @@ where
 #[cfg(test)]
 mod test {
     use super::*;
-    use crate::utils::test::load_cairo;
+    use crate::load_cairo;
     use std::time::Instant;
 
     #[test]

src/executor.rs

@@ -686,8 +686,8 @@ fn parse_result(
 mod tests {
     use super::*;
     use crate::{
-        context::NativeContext, starknet_stub::StubSyscallHandler, utils::test::load_cairo,
-        utils::test::load_starknet, OptLevel,
+        context::NativeContext, load_cairo, load_starknet, starknet_stub::StubSyscallHandler,
+        OptLevel,
     };
     use cairo_lang_sierra::program::Program;
     use rstest::*;

src/executor/aot.rs

@@ -208,7 +208,7 @@ mod tests {
     use crate::{
         context::NativeContext,
         starknet_stub::StubSyscallHandler,
-        utils::test::{load_cairo, load_starknet},
+        {load_cairo, load_starknet},
     };
     use cairo_lang_sierra::program::Program;
     use rstest::*;

src/executor/contract.rs

@@ -814,7 +814,7 @@ impl Drop for LockFile {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{starknet_stub::StubSyscallHandler, utils::test::load_starknet_contract};
+    use crate::{load_starknet_contract, starknet_stub::StubSyscallHandler};
     use cairo_lang_starknet_classes::contract_class::{
         version_id_from_serialized_sierra_program, ContractClass,
     };

src/libfuncs/array.rs

@@ -1303,10 +1303,8 @@ fn is_shared<'ctx, 'this>(
 #[cfg(test)]
 mod test {
     use crate::{
-        utils::{
-            felt252_str,
-            test::{jit_enum, jit_panic, jit_struct, load_cairo, run_program},
-        },
+        jit_enum, jit_panic, jit_struct, load_cairo,
+        utils::{felt252_str, testing::run_program},
         values::Value,
     };
     use pretty_assertions_sorted::assert_eq;

src/libfuncs/bool.rs

@@ -207,10 +207,7 @@ pub fn build_bool_to_felt252<'ctx, 'this>(
 
 #[cfg(test)]
 mod test {
-    use crate::{
-        utils::test::{jit_enum, jit_struct, load_cairo, run_program},
-        values::Value,
-    };
+    use crate::{jit_enum, jit_struct, load_cairo, utils::testing::run_program, values::Value};
 
     #[test]
     fn run_not() {

src/libfuncs/bounded_int.rs

@@ -855,7 +855,7 @@ mod test {
 
     use crate::{
         context::NativeContext, execution_result::ExecutionResult, executor::JitNativeExecutor,
-        utils::test::load_cairo, OptLevel, Value,
+        load_cairo, OptLevel, Value,
     };
 
     #[test]

src/libfuncs/box.rs

@@ -151,10 +151,7 @@ pub fn build_unbox<'ctx, 'this>(
 
 #[cfg(test)]
 mod test {
-    use crate::{
-        utils::test::{load_cairo, run_program_assert_output},
-        values::Value,
-    };
+    use crate::{load_cairo, utils::testing::run_program_assert_output, values::Value};
 
     #[test]
     fn run_box_unbox() {

src/libfuncs/bytes31.rs

@@ -161,8 +161,8 @@ pub fn build_from_felt252<'ctx, 'this>(
 
 #[cfg(test)]
 mod test {
-    use crate::utils::test::{
-        jit_enum, jit_panic, jit_struct, load_cairo, run_program_assert_output,
+    use crate::{
+        jit_enum, jit_panic, jit_struct, load_cairo, utils::testing::run_program_assert_output,
     };
     use cairo_lang_sierra::program::Program;
     use lazy_static::lazy_static;

src/libfuncs/cast.rs

@@ -439,8 +439,7 @@ pub fn build_upcast<'ctx, 'this>(
 #[cfg(test)]
 mod test {
     use crate::{
-        utils::test::{jit_enum, jit_struct, load_cairo, run_program_assert_output},
-        values::Value,
+        jit_enum, jit_struct, load_cairo, utils::testing::run_program_assert_output, values::Value,
     };
     use cairo_lang_sierra::program::Program;
     use lazy_static::lazy_static;

src/libfuncs/circuit.rs

@@ -1167,12 +1167,9 @@ fn build_u96_guarantee_verify<'ctx, 'this>(
 
 #[cfg(test)]
 mod test {
-
     use crate::{
-        utils::{
-            felt252_str,
-            test::{jit_enum, jit_panic, jit_struct, load_cairo, run_program_assert_output},
-        },
+        jit_enum, jit_panic, jit_struct, load_cairo,
+        utils::{felt252_str, testing::run_program_assert_output},
         values::Value,
     };
     use cairo_lang_sierra::extensions::utils::Range;

src/libfuncs/const.rs

@@ -306,10 +306,7 @@ pub fn build_const_type_value<'ctx, 'this>(
 
 #[cfg(test)]
 pub mod test {
-    use crate::{
-        utils::test::{jit_struct, load_cairo, run_program},
-        values::Value,
-    };
+    use crate::{jit_struct, load_cairo, utils::testing::run_program, values::Value};
 
     #[test]
     fn run_const_as_box() {

src/libfuncs/ec.rs

@@ -507,7 +507,8 @@ pub fn build_zero<'ctx, 'this>(
 #[cfg(test)]
 mod test {
     use crate::{
-        utils::test::{jit_enum, jit_struct, load_cairo, run_program, run_program_assert_output},
+        jit_enum, jit_struct, load_cairo,
+        utils::testing::{run_program, run_program_assert_output},
         values::Value,
     };
     use cairo_lang_sierra::program::Program;

src/libfuncs/enum.rs

@@ -544,8 +544,8 @@ pub fn build_snapshot_match<'ctx, 'this>(
 #[cfg(test)]
 mod test {
     use crate::{
-        context::NativeContext,
-        utils::test::{jit_enum, jit_struct, load_cairo, run_program_assert_output},
+        context::NativeContext, jit_enum, jit_struct, load_cairo,
+        utils::testing::run_program_assert_output,
     };
     use cairo_lang_sierra::program::Program;
     use lazy_static::lazy_static;

src/libfuncs/felt252.rs

@@ -328,10 +328,7 @@ pub fn build_is_zero<'ctx, 'this>(
 
 #[cfg(test)]
 pub mod test {
-    use crate::{
-        utils::test::{load_cairo, run_program},
-        values::Value,
-    };
+    use crate::{load_cairo, utils::testing::run_program, values::Value};
     use cairo_lang_sierra::program::Program;
     use lazy_static::lazy_static;
     use starknet_types_core::felt::Felt;

src/libfuncs/felt252_dict.rs

@@ -183,9 +183,8 @@ pub fn build_squash<'ctx, 'this>(
 #[cfg(test)]
 mod test {
     use crate::{
-        utils::test::{
-            jit_dict, jit_enum, jit_struct, load_cairo, run_program, run_program_assert_output,
-        },
+        jit_dict, jit_enum, jit_struct, load_cairo,
+        utils::testing::{run_program, run_program_assert_output},
         values::Value,
     };
 

src/libfuncs/felt252_dict_entry.rs

@@ -193,7 +193,10 @@ pub fn build_finalize<'ctx, 'this>(
 
 #[cfg(test)]
 mod test {
-    use crate::utils::test::{jit_dict, load_cairo, run_program, run_program_assert_output};
+    use crate::{
+        jit_dict, load_cairo,
+        utils::testing::{run_program, run_program_assert_output},
+    };
 
     #[test]
     fn run_dict_insert() {

src/libfuncs/gas.rs

@@ -283,7 +283,7 @@ pub fn build_calculate_gas_cost<'c, 'b>(
 
 #[cfg(test)]
 mod test {
-    use crate::utils::test::{load_cairo, run_program};
+    use crate::{load_cairo, utils::testing::run_program};
 
     #[test]
     fn run_withdraw_gas() {

src/libfuncs/int_range.rs

@@ -141,8 +141,7 @@ pub fn build_int_range_pop_front<'ctx, 'this>(
 #[cfg(test)]
 mod test {
     use crate::{
-        utils::test::{jit_enum, jit_struct, load_cairo, run_program_assert_output},
-        values::Value,
+        jit_enum, jit_struct, load_cairo, utils::testing::run_program_assert_output, values::Value,
     };
     use cairo_lang_sierra::program::Program;
     use lazy_static::lazy_static;

src/libfuncs/nullable.rs

@@ -118,8 +118,7 @@ fn build_match_nullable<'ctx, 'this>(
 #[cfg(test)]
 mod test {
     use crate::{
-        utils::test::{jit_enum, jit_struct, load_cairo, run_program_assert_output},
-        values::Value,
+        jit_enum, jit_struct, load_cairo, utils::testing::run_program_assert_output, values::Value,
     };
 
     #[test]

src/libfuncs/pedersen.rs

@@ -105,7 +105,7 @@ pub fn build_pedersen<'ctx>(
 
 #[cfg(test)]
 mod test {
-    use crate::utils::test::{load_cairo, run_program_assert_output};
+    use crate::{load_cairo, utils::testing::run_program_assert_output};
 
     use starknet_types_core::felt::Felt;
 

src/libfuncs/poseidon.rs

@@ -118,7 +118,7 @@ pub fn build_hades_permutation<'ctx>(
 
 #[cfg(test)]
 mod test {
-    use crate::utils::test::{jit_struct, load_cairo, run_program_assert_output};
+    use crate::{jit_struct, load_cairo, utils::testing::run_program_assert_output};
 
     use starknet_types_core::felt::Felt;
 

src/libfuncs/starknet.rs

@@ -3015,7 +3015,7 @@ pub fn build_get_class_hash_at<'ctx, 'this>(
 
 #[cfg(test)]
 mod test {
-    use crate::utils::test::{jit_enum, jit_struct, load_cairo, run_program_assert_output};
+    use crate::{jit_enum, jit_struct, load_cairo, utils::testing::run_program_assert_output};
     use cairo_lang_sierra::program::Program;
     use lazy_static::lazy_static;
     use starknet_types_core::felt::Felt;

src/libfuncs/uint256.rs

@@ -968,7 +968,7 @@ pub fn build_u256_guarantee_inv_mod_n<'ctx, 'this>(
 #[cfg(test)]
 mod test {
     use crate::{
-        utils::test::{jit_enum, jit_panic, jit_struct, load_cairo, run_program_assert_output},
+        jit_enum, jit_panic, jit_struct, load_cairo, utils::testing::run_program_assert_output,
         values::Value,
     };
     use cairo_lang_sierra::program::Program;

src/libfuncs/uint512.rs

@@ -159,10 +159,7 @@ pub fn build_divmod_u256<'ctx, 'this>(
 
 #[cfg(test)]
 mod test {
-    use crate::{
-        utils::test::{jit_struct, load_cairo, run_program_assert_output},
-        values::Value,
-    };
+    use crate::{jit_struct, load_cairo, utils::testing::run_program_assert_output, values::Value};
     use cairo_lang_sierra::program::Program;
     use lazy_static::lazy_static;
     use num_bigint::BigUint;

src/types.rs

@@ -1007,7 +1007,7 @@ impl<T> Deref for WithSelf<'_, T> {
 #[cfg(test)]
 mod test {
     use super::TypeBuilder;
-    use crate::utils::test::load_cairo;
+    use crate::load_cairo;
     use cairo_lang_sierra::{
         extensions::core::{CoreLibfunc, CoreType},
         program_registry::ProgramRegistry,

src/types/array.rs

@@ -419,10 +419,7 @@ pub fn calc_data_prefix_offset(layout: Layout) -> usize {
 
 #[cfg(test)]
 mod test {
-    use crate::{
-        utils::test::{load_cairo, run_program},
-        values::Value,
-    };
+    use crate::{load_cairo, utils::testing::run_program, values::Value};
     use pretty_assertions_sorted::assert_eq;
 
     #[test]

src/types/enum.rs

@@ -795,7 +795,7 @@ pub fn get_type_for_variants<'ctx>(
 
 #[cfg(test)]
 mod test {
-    use crate::{metadata::MetadataStorage, types::TypeBuilder, utils::test::load_cairo};
+    use crate::{load_cairo, metadata::MetadataStorage, types::TypeBuilder};
     use cairo_lang_sierra::{
         extensions::core::{CoreLibfunc, CoreType},
         program_registry::ProgramRegistry,

src/types/felt252_dict.rs

@@ -137,10 +137,7 @@ fn build_drop<'ctx>(
 
 #[cfg(test)]
 mod test {
-    use crate::{
-        utils::test::{jit_dict, load_cairo, run_program},
-        values::Value,
-    };
+    use crate::{jit_dict, load_cairo, utils::testing::run_program, values::Value};
     use pretty_assertions_sorted::assert_eq;
     use starknet_types_core::felt::Felt;
     use std::collections::HashMap;

src/types/nullable.rs

@@ -241,10 +241,7 @@ fn build_drop<'ctx>(
 
 #[cfg(test)]
 mod test {
-    use crate::{
-        utils::test::{jit_enum, jit_struct, load_cairo, run_program},
-        values::Value,
-    };
+    use crate::{jit_enum, jit_struct, load_cairo, utils::testing::run_program, values::Value};
     use pretty_assertions_sorted::assert_eq;
 
     #[test]