fix: common test utils (#795)

adapt structure

refactor: test organization

.tool-versions

@@ -1,2 +1,2 @@
-scarb 2.5.3
+scarb 2.6.4
 starknet-foundry 0.12.0

crates/contracts/src/kakarot_core/kakarot.cairo

@@ -165,7 +165,7 @@ pub mod KakarotCore {
 
             let origin = Address { evm: origin, starknet: self.compute_starknet_address(origin) };
 
-            let TransactionResult{success, return_data, gas_used, state: _ } = self
+            let TransactionResult { success, return_data, gas_used, state: _ } = self
                 .process_transaction(origin, tx);
 
             (success, return_data, gas_used)
@@ -180,7 +180,7 @@ pub mod KakarotCore {
                 evm: account.get_evm_address(), starknet: starknet_caller_address
             };
 
-            let TransactionResult{success, return_data, gas_used, mut state } = self
+            let TransactionResult { success, return_data, gas_used, mut state } = self
                 .process_transaction(origin, tx);
             starknet_backend::commit(ref state).expect('Committing state failed');
             (success, return_data, gas_used)
@@ -323,7 +323,7 @@ pub mod KakarotCore {
                     loop {
                         match access_list.pop_front() {
                             Option::Some(access_list_item) => {
-                                let AccessListItem{ethereum_address, storage_keys: _ } =
+                                let AccessListItem { ethereum_address, storage_keys: _ } =
                                     *access_list_item;
                                 let storage_keys = access_list_item.to_storage_keys();
 

crates/contracts/src/lib.cairo

@@ -7,8 +7,11 @@ mod errors;
 // Kakarot smart contract
 mod kakarot_core;
 
-#[cfg(test)]
-mod tests;
+#[cfg(target: 'test')]
+mod test_data;
+
+#[cfg(target: 'test')]
+mod test_utils;
 
 // Account transparent proxy
 mod uninitialized_account;

crates/contracts/src/tests/test_utils.cairo → crates/contracts/src/test_utils.cairo

@@ -10,7 +10,7 @@ use core::result::ResultTrait;
 use evm::backend::starknet_backend;
 use evm::model::{Address};
 
-use evm::tests::test_utils::{ca_address, other_starknet_address, chain_id, sequencer_evm_address};
+use evm::test_utils::{ca_address, other_starknet_address, chain_id, sequencer_evm_address};
 use openzeppelin::token::erc20::ERC20;
 use openzeppelin::token::erc20::interface::{IERC20CamelDispatcher, IERC20CamelDispatcherTrait};
 use starknet::{

crates/contracts/src/tests.cairo → crates/contracts/tests/lib.cairo

@@ -1,7 +1,6 @@
 mod test_cairo1_helpers;
 mod test_contract_account;
 
-mod test_data;
 
 mod test_eoa;
 
@@ -10,5 +9,3 @@ mod test_kakarot_core;
 mod test_ownable;
 
 mod test_upgradeable;
-
-mod test_utils;