From aa556d6aa2dd365dc94ec35a9522c6aa910aedd9 Mon Sep 17 00:00:00 2001 From: Guy Nir Date: Tue, 18 Nov 2025 17:21:08 +0200 Subject: [PATCH] apollo_base_layer_tests: move test_utils from papyrus_base_layer --- Cargo.lock | 3 ++- crates/apollo_base_layer_tests/Cargo.toml | 1 + crates/apollo_base_layer_tests/src/lib.rs | 1 + .../src/test_utils.rs | 9 ++++----- .../src/bin/sequencer_simulator.rs | 8 ++++---- crates/apollo_integration_tests/src/flow_test_setup.rs | 10 +++++----- .../src/integration_test_manager.rs | 2 +- .../tests/l1_events_scraper_end_to_end.rs | 2 +- crates/apollo_l1_provider/tests/utils/mod.rs | 2 +- crates/mempool_test_utils/Cargo.toml | 2 +- .../mempool_test_utils/src/starknet_api_test_utils.rs | 2 +- crates/papyrus_base_layer/src/lib.rs | 3 --- 12 files changed, 22 insertions(+), 23 deletions(-) rename crates/{papyrus_base_layer => apollo_base_layer_tests}/src/test_utils.rs (98%) diff --git a/Cargo.lock b/Cargo.lock index 1c46aac288b..cda0074fd82 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -826,6 +826,7 @@ dependencies = [ "colored 3.0.0", "papyrus_base_layer", "starknet_api", + "tracing", "url", ] @@ -8872,10 +8873,10 @@ dependencies = [ name = "mempool_test_utils" version = "0.16.0-rc.1" dependencies = [ + "apollo_base_layer_tests", "apollo_infra_utils", "assert_matches", "blockifier_test_utils", - "papyrus_base_layer", "serde_json", "starknet-types-core", "starknet_api", diff --git a/crates/apollo_base_layer_tests/Cargo.toml b/crates/apollo_base_layer_tests/Cargo.toml index 861bd268e10..934b0387d99 100644 --- a/crates/apollo_base_layer_tests/Cargo.toml +++ b/crates/apollo_base_layer_tests/Cargo.toml @@ -16,6 +16,7 @@ async-trait.workspace = true colored.workspace = true papyrus_base_layer = { workspace = true, features = ["testing"] } starknet_api.workspace = true +tracing.workspace = true url.workspace = true [dev-dependencies] diff --git a/crates/apollo_base_layer_tests/src/lib.rs b/crates/apollo_base_layer_tests/src/lib.rs index f36f6f4d5e0..aaf997f4354 100644 --- a/crates/apollo_base_layer_tests/src/lib.rs +++ b/crates/apollo_base_layer_tests/src/lib.rs @@ -1 +1,2 @@ pub mod anvil_base_layer; +pub mod test_utils; diff --git a/crates/papyrus_base_layer/src/test_utils.rs b/crates/apollo_base_layer_tests/src/test_utils.rs similarity index 98% rename from crates/papyrus_base_layer/src/test_utils.rs rename to crates/apollo_base_layer_tests/src/test_utils.rs index 771e70eb280..aaa9ba97b92 100644 --- a/crates/papyrus_base_layer/src/test_utils.rs +++ b/crates/apollo_base_layer_tests/src/test_utils.rs @@ -2,15 +2,14 @@ use alloy::network::TransactionBuilder; use alloy::primitives::{address as ethereum_address, U256}; use alloy::providers::Provider; use alloy::rpc::types::TransactionRequest; -use starknet_api::hash::StarkHash; -use tracing::debug; -use url::Url; - -use crate::ethereum_base_layer_contract::{ +use papyrus_base_layer::ethereum_base_layer_contract::{ EthereumBaseLayerConfig, EthereumBaseLayerContract, EthereumContractAddress, }; +use starknet_api::hash::StarkHash; +use tracing::debug; +use url::Url; // This address is commonly used as the L1 address of the Starknet core contract. // TODO(Arni): Replace with constant with use of `AnvilInstance::address(&self)`. diff --git a/crates/apollo_integration_tests/src/bin/sequencer_simulator.rs b/crates/apollo_integration_tests/src/bin/sequencer_simulator.rs index da432f06b32..3df0da590ef 100644 --- a/crates/apollo_integration_tests/src/bin/sequencer_simulator.rs +++ b/crates/apollo_integration_tests/src/bin/sequencer_simulator.rs @@ -1,6 +1,10 @@ use std::fs::read_to_string; use alloy::primitives::{Address as EthereumContractAddress, Address}; +use apollo_base_layer_tests::test_utils::{ + make_block_history_on_anvil, + DEFAULT_ANVIL_L1_DEPLOYED_ADDRESS, +}; use apollo_infra::trace_util::configure_tracing; use apollo_integration_tests::integration_test_manager::{HTTP_PORT_ARG, MONITORING_PORT_ARG}; use apollo_integration_tests::sequencer_simulator_utils::SequencerSimulator; @@ -18,10 +22,6 @@ use papyrus_base_layer::ethereum_base_layer_contract::{ EthereumBaseLayerContract, Starknet, }; -use papyrus_base_layer::test_utils::{ - make_block_history_on_anvil, - DEFAULT_ANVIL_L1_DEPLOYED_ADDRESS, -}; use serde_json::Value; use tokio::time::{sleep, Duration}; use tracing::info; diff --git a/crates/apollo_integration_tests/src/flow_test_setup.rs b/crates/apollo_integration_tests/src/flow_test_setup.rs index 51536f24bf2..5cf4ba8bf7f 100644 --- a/crates/apollo_integration_tests/src/flow_test_setup.rs +++ b/crates/apollo_integration_tests/src/flow_test_setup.rs @@ -3,6 +3,11 @@ use std::net::SocketAddr; use std::sync::Arc; use apollo_base_layer_tests::anvil_base_layer::AnvilBaseLayer; +use apollo_base_layer_tests::test_utils::{ + make_block_history_on_anvil, + ARBITRARY_ANVIL_L1_ACCOUNT_ADDRESS, + OTHER_ARBITRARY_ANVIL_L1_ACCOUNT_ADDRESS, +}; use apollo_consensus_manager_config::config::ConsensusManagerConfig; use apollo_http_server::test_utils::HttpTestClient; use apollo_http_server_config::config::HttpServerConfig; @@ -32,11 +37,6 @@ use mempool_test_utils::starknet_api_test_utils::{ MultiAccountTransactionGenerator, }; use papyrus_base_layer::ethereum_base_layer_contract::EthereumBaseLayerConfig; -use papyrus_base_layer::test_utils::{ - make_block_history_on_anvil, - ARBITRARY_ANVIL_L1_ACCOUNT_ADDRESS, - OTHER_ARBITRARY_ANVIL_L1_ACCOUNT_ADDRESS, -}; use papyrus_base_layer::BaseLayerContract; use starknet_api::block::BlockNumber; use starknet_api::consensus_transaction::ConsensusTransaction; diff --git a/crates/apollo_integration_tests/src/integration_test_manager.rs b/crates/apollo_integration_tests/src/integration_test_manager.rs index 81c477adf88..a495cd50944 100644 --- a/crates/apollo_integration_tests/src/integration_test_manager.rs +++ b/crates/apollo_integration_tests/src/integration_test_manager.rs @@ -6,6 +6,7 @@ use std::path::PathBuf; use std::time::Duration; use apollo_base_layer_tests::anvil_base_layer::AnvilBaseLayer; +use apollo_base_layer_tests::test_utils::anvil_mine_blocks; use apollo_deployments::deployment_definitions::ComponentConfigInService; use apollo_http_server::test_utils::HttpTestClient; use apollo_http_server_config::config::HttpServerConfig; @@ -32,7 +33,6 @@ use mempool_test_utils::starknet_api_test_utils::{ AccountId, MultiAccountTransactionGenerator, }; -use papyrus_base_layer::test_utils::anvil_mine_blocks; use papyrus_base_layer::BaseLayerContract; use starknet_api::block::BlockNumber; use starknet_api::core::{ChainId, Nonce}; diff --git a/crates/apollo_integration_tests/tests/l1_events_scraper_end_to_end.rs b/crates/apollo_integration_tests/tests/l1_events_scraper_end_to_end.rs index a0bec85d5d2..ad6bd2ae357 100644 --- a/crates/apollo_integration_tests/tests/l1_events_scraper_end_to_end.rs +++ b/crates/apollo_integration_tests/tests/l1_events_scraper_end_to_end.rs @@ -3,13 +3,13 @@ use std::time::Duration; use alloy::primitives::U256; use apollo_base_layer_tests::anvil_base_layer::AnvilBaseLayer; +use apollo_base_layer_tests::test_utils::DEFAULT_ANVIL_L1_ACCOUNT_ADDRESS; use apollo_l1_provider::event_identifiers_to_track; use apollo_l1_provider::l1_scraper::L1Scraper; use apollo_l1_provider_types::{Event, MockL1ProviderClient}; use apollo_l1_scraper_config::config::L1ScraperConfig; use mockall::predicate::eq; use mockall::Sequence; -use papyrus_base_layer::test_utils::DEFAULT_ANVIL_L1_ACCOUNT_ADDRESS; use papyrus_base_layer::BaseLayerContract; use starknet_api::block::BlockTimestamp; use starknet_api::contract_address; diff --git a/crates/apollo_l1_provider/tests/utils/mod.rs b/crates/apollo_l1_provider/tests/utils/mod.rs index aeb8cac9b44..3fb2517fd6f 100644 --- a/crates/apollo_l1_provider/tests/utils/mod.rs +++ b/crates/apollo_l1_provider/tests/utils/mod.rs @@ -8,6 +8,7 @@ use std::time::Duration; use alloy::primitives::{Uint, U256}; use apollo_base_layer_tests::anvil_base_layer::AnvilBaseLayer; +use apollo_base_layer_tests::test_utils::anvil_mine_blocks; use apollo_batcher_types::communication::MockBatcherClient; use apollo_infra::component_client::LocalComponentClient; use apollo_infra::component_definitions::{ComponentStarter, RequestWrapper}; @@ -34,7 +35,6 @@ use apollo_time::time::Clock; use chrono::{DateTime, Duration as ChronoDur, Utc}; use futures::{poll, FutureExt}; use papyrus_base_layer::ethereum_base_layer_contract::Starknet::LogMessageToL2; -use papyrus_base_layer::test_utils::anvil_mine_blocks; use papyrus_base_layer::{BaseLayerContract, L1BlockHash, L1BlockNumber, L1BlockReference}; use starknet_api::block::{BlockNumber, BlockTimestamp}; use starknet_api::core::ChainId; diff --git a/crates/mempool_test_utils/Cargo.toml b/crates/mempool_test_utils/Cargo.toml index 41af2bb8e69..32fc23d9ed4 100644 --- a/crates/mempool_test_utils/Cargo.toml +++ b/crates/mempool_test_utils/Cargo.toml @@ -9,10 +9,10 @@ license.workspace = true workspace = true [dependencies] +apollo_base_layer_tests.workspace = true apollo_infra_utils.workspace = true assert_matches.workspace = true blockifier_test_utils.workspace = true -papyrus_base_layer = { workspace = true, features = ["testing"] } serde_json.workspace = true starknet-types-core.workspace = true starknet_api.workspace = true diff --git a/crates/mempool_test_utils/src/starknet_api_test_utils.rs b/crates/mempool_test_utils/src/starknet_api_test_utils.rs index 926346ad06a..bb878c08ed3 100644 --- a/crates/mempool_test_utils/src/starknet_api_test_utils.rs +++ b/crates/mempool_test_utils/src/starknet_api_test_utils.rs @@ -3,12 +3,12 @@ use std::fs::File; use std::rc::Rc; use std::sync::LazyLock; +use apollo_base_layer_tests::test_utils::DEFAULT_ANVIL_L1_ACCOUNT_ADDRESS; use apollo_infra_utils::path::resolve_project_relative_path; use assert_matches::assert_matches; use blockifier_test_utils::cairo_versions::{CairoVersion, RunnableCairo1}; use blockifier_test_utils::calldata::{create_calldata, create_trivial_calldata}; use blockifier_test_utils::contracts::FeatureContract; -use papyrus_base_layer::test_utils::DEFAULT_ANVIL_L1_ACCOUNT_ADDRESS; use starknet_api::abi::abi_utils::selector_from_name; use starknet_api::block::GasPrice; use starknet_api::core::{ClassHash, CompiledClassHash, ContractAddress, Nonce}; diff --git a/crates/papyrus_base_layer/src/lib.rs b/crates/papyrus_base_layer/src/lib.rs index c5c13560f7c..263ef711a28 100644 --- a/crates/papyrus_base_layer/src/lib.rs +++ b/crates/papyrus_base_layer/src/lib.rs @@ -20,9 +20,6 @@ pub mod monitored_base_layer; pub(crate) mod eth_events; -#[cfg(any(feature = "testing", test))] -pub mod test_utils; - #[cfg(test)] mod base_layer_test;