dev: refactor hive-utils crate and kakarot-rpc::test_utils to test_ut…

…ils crate

crates/eth-rpc/Cargo.toml

@@ -43,9 +43,9 @@ tracing-subscriber = { version = "0.3.3", features = ["env-filter"] }
 # for cross-compiling
 openssl = { version = "0.10", features = ["vendored"] }
 
-kakarot-test-utils = { path = "../test-utils" }
 
 [dev-dependencies]
 cargo-husky = { workspace = true }
 ethers = { workspace = true }
 rstest = { workspace = true }
+kakarot-test-utils = { path = "../test-utils" }

crates/eth-rpc/src/lib.rs

@@ -7,7 +7,6 @@ pub mod api;
 pub mod config;
 pub mod rpc;
 pub mod servers;
-pub mod test_utils;
 
 use eyre::Result;
 use jsonrpsee::server::{ServerBuilder, ServerHandle};

crates/eth-rpc/tests/integration.rs

@@ -4,9 +4,9 @@ mod integration_tests {
 
     use dotenv::dotenv;
     use ethers::prelude::{Block as EthersBlock, Http as EthersHttp, H256 as EthersH256};
-    use kakarot_rpc::test_utils::start_kakarot_rpc_server;
     use kakarot_test_utils::deploy_helpers::KakarotTestEnvironmentContext;
     use kakarot_test_utils::fixtures::kakarot_test_env_ctx;
+    use kakarot_test_utils::rpc_helpers::start_kakarot_rpc_server;
     use reth_primitives::U64;
     use rstest::*;
 

crates/test-utils/Cargo.toml

@@ -13,6 +13,10 @@ license.workspace = true
 
 [dependencies]
 kakarot-rpc-core={ path = "../core" }
+kakarot-rpc= { path = "../eth-rpc" }
+
+# rpc
+jsonrpsee = { workspace = true }
 
 dojo-test-utils = { workspace = true }
 eyre = { workspace = true }

crates/test-utils/src/lib.rs

@@ -3,3 +3,4 @@ pub mod deploy_helpers;
 pub mod execution_helpers;
 pub mod fixtures;
 pub mod hive_utils;
+pub mod rpc_helpers;

crates/eth-rpc/src/test_utils.rs → crates/test-utils/src/rpc_helpers.rs

@@ -2,16 +2,16 @@ use std::net::SocketAddr;
 use std::sync::Arc;
 
 use jsonrpsee::server::ServerHandle;
+use kakarot_rpc::config::RPCConfig;
+use kakarot_rpc::rpc::KakarotRpcModuleBuilder;
+use kakarot_rpc::run_server;
 use kakarot_rpc_core::client::api::KakarotStarknetApi;
 use kakarot_rpc_core::client::config::{Network, StarknetConfig};
 use kakarot_rpc_core::client::KakarotClient;
-use kakarot_test_utils::deploy_helpers::KakarotTestEnvironmentContext;
 use starknet::providers::jsonrpc::HttpTransport;
 use starknet::providers::JsonRpcClient;
 
-use crate::config::RPCConfig;
-use crate::rpc::KakarotRpcModuleBuilder;
-use crate::run_server;
+use crate::deploy_helpers::KakarotTestEnvironmentContext;
 
 /// Sets up the environment for Kakarot RPC integration tests by deploying the Kakarot contracts
 /// and starting the Kakarot RPC server.