Skip to content
Merged
7 changes: 0 additions & 7 deletions crates/starknet_gateway/bench/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,10 @@ use starknet_api::test_utils::invoke::rpc_invoke_tx;
use starknet_api::test_utils::NonceManager;
use starknet_class_manager_types::transaction_converter::TransactionConverter;
use starknet_class_manager_types::EmptyClassManagerClient;
use starknet_gateway::compilation::GatewayCompiler;
use starknet_gateway::config::GatewayConfig;
use starknet_gateway::gateway::Gateway;
use starknet_gateway::state_reader_test_utils::local_test_state_reader_factory;
use starknet_mempool_types::communication::MockMempoolClient;
use starknet_sierra_multicompile::config::SierraCompilationConfig;

const N_TXS: usize = 100;

Expand Down Expand Up @@ -50,7 +48,6 @@ impl TransactionGenerator {
pub struct BenchTestSetupConfig {
pub n_txs: usize,
pub gateway_config: GatewayConfig,
pub compiler_config: SierraCompilationConfig,
}

impl Default for BenchTestSetupConfig {
Expand All @@ -61,7 +58,6 @@ impl Default for BenchTestSetupConfig {
chain_info: ChainInfo::create_for_testing(),
..Default::default()
},
compiler_config: SierraCompilationConfig::default(),
}
}
}
Expand All @@ -84,8 +80,6 @@ impl BenchTestSetup {
}

let state_reader_factory = local_test_state_reader_factory(cairo_version, false);
let gateway_compiler =
GatewayCompiler::new_command_line_compiler(config.compiler_config.clone());
let mut mempool_client = MockMempoolClient::new();
// TODO(noamsp): use MockTransactionConverter
let class_manager_client = Arc::new(EmptyClassManagerClient);
Expand All @@ -98,7 +92,6 @@ impl BenchTestSetup {
let gateway_business_logic = Gateway::new(
config.gateway_config,
Arc::new(state_reader_factory),
gateway_compiler,
Arc::new(mempool_client),
transaction_converter,
);
Expand Down
76 changes: 0 additions & 76 deletions crates/starknet_gateway/src/compilation.rs

This file was deleted.

86 changes: 0 additions & 86 deletions crates/starknet_gateway/src/compilation_test.rs

This file was deleted.

20 changes: 2 additions & 18 deletions crates/starknet_gateway/src/gateway.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,9 @@ use starknet_gateway_types::errors::GatewaySpecError;
use starknet_mempool_types::communication::{AddTransactionArgsWrapper, SharedMempoolClient};
use starknet_mempool_types::mempool_types::{AccountState, AddTransactionArgs};
use starknet_sequencer_infra::component_definitions::ComponentStarter;
use starknet_sierra_multicompile::config::SierraCompilationConfig;
use starknet_state_sync_types::communication::SharedStateSyncClient;
use tracing::{debug, error, instrument, Span};

use crate::compilation::GatewayCompiler;
use crate::config::GatewayConfig;
use crate::errors::{mempool_client_result_to_gw_spec_result, GatewayResult};
use crate::state_reader::StateReaderFactory;
Expand All @@ -36,7 +34,6 @@ pub struct Gateway {
pub stateless_tx_validator: Arc<StatelessTransactionValidator>,
pub stateful_tx_validator: Arc<StatefulTransactionValidator>,
pub state_reader_factory: Arc<dyn StateReaderFactory>,
pub gateway_compiler: Arc<GatewayCompiler>,
pub mempool_client: SharedMempoolClient,
pub transaction_converter: TransactionConverter,
pub chain_info: ChainInfo,
Expand All @@ -46,7 +43,6 @@ impl Gateway {
pub fn new(
config: GatewayConfig,
state_reader_factory: Arc<dyn StateReaderFactory>,
gateway_compiler: GatewayCompiler,
mempool_client: SharedMempoolClient,
transaction_converter: TransactionConverter,
) -> Self {
Expand All @@ -59,7 +55,6 @@ impl Gateway {
config: config.stateful_tx_validator_config.clone(),
}),
state_reader_factory,
gateway_compiler: Arc::new(gateway_compiler),
mempool_client,
chain_info: config.chain_info.clone(),
transaction_converter,
Expand Down Expand Up @@ -100,9 +95,6 @@ struct ProcessTxBlockingTask {
stateless_tx_validator: Arc<StatelessTransactionValidator>,
stateful_tx_validator: Arc<StatefulTransactionValidator>,
state_reader_factory: Arc<dyn StateReaderFactory>,
// TODO(noamsp): remove gatewayCompiler from here and erase it
#[allow(dead_code)]
gateway_compiler: Arc<GatewayCompiler>,
mempool_client: SharedMempoolClient,
chain_info: ChainInfo,
tx: RpcTransaction,
Expand All @@ -115,7 +107,6 @@ impl ProcessTxBlockingTask {
stateless_tx_validator: gateway.stateless_tx_validator.clone(),
stateful_tx_validator: gateway.stateful_tx_validator.clone(),
state_reader_factory: gateway.state_reader_factory.clone(),
gateway_compiler: gateway.gateway_compiler.clone(),
mempool_client: gateway.mempool_client.clone(),
chain_info: gateway.chain_info.clone(),
tx,
Expand Down Expand Up @@ -178,22 +169,15 @@ impl ProcessTxBlockingTask {
pub fn create_gateway(
config: GatewayConfig,
shared_state_sync_client: SharedStateSyncClient,
compiler_config: SierraCompilationConfig,
mempool_client: SharedMempoolClient,
class_manager_client: SharedClassManagerClient,
) -> Gateway {
let state_reader_factory = Arc::new(SyncStateReaderFactory { shared_state_sync_client });
let gateway_compiler = GatewayCompiler::new_command_line_compiler(compiler_config);

let transaction_converter =
TransactionConverter::new(class_manager_client, config.chain_info.chain_id.clone());

Gateway::new(
config,
state_reader_factory,
gateway_compiler,
mempool_client,
transaction_converter,
)
Gateway::new(config, state_reader_factory, mempool_client, transaction_converter)
}

impl ComponentStarter for Gateway {}
18 changes: 1 addition & 17 deletions crates/starknet_gateway/src/gateway_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@ use starknet_mempool_types::communication::{
};
use starknet_mempool_types::errors::MempoolError;
use starknet_mempool_types::mempool_types::{AccountState, AddTransactionArgs};
use starknet_sierra_multicompile::config::SierraCompilationConfig;

use crate::compilation::GatewayCompiler;
use crate::config::{
GatewayConfig,
StatefulTransactionValidatorConfig,
Expand All @@ -43,11 +41,6 @@ fn config() -> GatewayConfig {
}
}

#[fixture]
fn compiler() -> GatewayCompiler {
GatewayCompiler::new_command_line_compiler(SierraCompilationConfig::default())
}

#[fixture]
fn state_reader_factory() -> TestStateReaderFactory {
local_test_state_reader_factory(CairoVersion::Cairo1(RunnableCairo1::Casm), false)
Expand All @@ -56,24 +49,16 @@ fn state_reader_factory() -> TestStateReaderFactory {
#[fixture]
fn mock_dependencies(
config: GatewayConfig,
compiler: GatewayCompiler,
state_reader_factory: TestStateReaderFactory,
) -> MockDependencies {
let mock_mempool_client = MockMempoolClient::new();
// TODO(noamsp): use MockTransactionConverter
let class_manager_client = Arc::new(EmptyClassManagerClient);
MockDependencies {
config,
compiler,
state_reader_factory,
mock_mempool_client,
class_manager_client,
}
MockDependencies { config, state_reader_factory, mock_mempool_client, class_manager_client }
}

struct MockDependencies {
config: GatewayConfig,
compiler: GatewayCompiler,
state_reader_factory: TestStateReaderFactory,
mock_mempool_client: MockMempoolClient,
class_manager_client: SharedClassManagerClient,
Expand All @@ -84,7 +69,6 @@ impl MockDependencies {
Gateway::new(
self.config.clone(),
Arc::new(self.state_reader_factory),
self.compiler,
Arc::new(self.mock_mempool_client),
TransactionConverter::new(self.class_manager_client, self.config.chain_info.chain_id),
)
Expand Down
2 changes: 0 additions & 2 deletions crates/starknet_gateway/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
pub mod communication;
pub mod compilation;
mod compiler_version;
pub mod config;
pub mod errors;
Expand All @@ -18,4 +17,3 @@ mod sync_state_reader;
mod sync_state_reader_test;
#[cfg(test)]
mod test_utils;
mod utils;
Loading
Loading