apollo_gateway: set gateway for benchmark as type (#11479)

Author: ArniStarkware

crates/apollo_gateway/src/gateway.rs

@@ -101,7 +101,7 @@ impl Gateway {
 }
 
 #[derive(Clone)]
-pub(crate) struct GenericGateway<
+pub struct GenericGateway<
     TStatelessValidator: StatelessTransactionValidatorTrait,
     TTransactionConverter: TransactionConverterTrait,
     TStatefulValidatorFactory: StatefulTransactionValidatorFactoryTrait,
@@ -157,7 +157,7 @@ impl<
 > GenericGateway<TStatelessValidator, TTransactionConverter, TStatefulValidatorFactory>
 {
     #[sequencer_latency_histogram(GATEWAY_ADD_TX_LATENCY, true)]
-    pub(crate) async fn add_tx(
+    pub async fn add_tx(
         &self,
         tx: RpcTransaction,
         p2p_message_metadata: Option<BroadcastedMessageMetadata>,

crates/apollo_gateway/src/test_utils.rs

@@ -3,9 +3,7 @@ use std::sync::Arc;
 use apollo_class_manager_types::MockClassManagerClient;
 use apollo_gateway_config::compiler_version::VersionId;
 use apollo_gateway_config::config::GatewayConfig;
-use apollo_gateway_types::gateway_types::GatewayOutput;
 use apollo_mempool_types::communication::MockMempoolClient;
-use apollo_network_types::network_types::BroadcastedMessageMetadata;
 use apollo_proof_manager_types::MockProofManagerClient;
 use apollo_transaction_converter::TransactionConverter;
 use blockifier_test_utils::cairo_versions::{CairoVersion, RunnableCairo1};
@@ -32,7 +30,6 @@ use starknet_api::transaction::fields::{
 use starknet_api::{declare_tx_args, deploy_account_tx_args, felt, invoke_tx_args};
 use starknet_types_core::felt::Felt;
 
-use crate::errors::GatewayResult;
 use crate::gateway::GenericGateway;
 use crate::proof_archive_writer::MockProofArchiveWriterTrait;
 use crate::state_reader_test_utils::{local_test_state_reader_factory, TestStateReaderFactory};
@@ -163,23 +160,11 @@ pub fn rpc_tx_for_testing(
     }
 }
 
-pub struct GatewayForBenchmark(
-    GenericGateway<
-        StatelessTransactionValidator,
-        TransactionConverter,
-        StatefulTransactionValidatorFactory<TestStateReaderFactory>,
-    >,
-);
-
-impl GatewayForBenchmark {
-    pub async fn add_tx(
-        &self,
-        tx: RpcTransaction,
-        p2p_message_metadata: Option<BroadcastedMessageMetadata>,
-    ) -> GatewayResult<GatewayOutput> {
-        self.0.add_tx(tx, p2p_message_metadata).await
-    }
-}
+pub type GatewayForBenchmark = GenericGateway<
+    StatelessTransactionValidator,
+    TransactionConverter,
+    StatefulTransactionValidatorFactory<TestStateReaderFactory>,
+>;
 
 pub fn gateway_for_benchmark(gateway_config: GatewayConfig) -> GatewayForBenchmark {
     let cairo_version = CairoVersion::Cairo1(RunnableCairo1::Casm);
@@ -201,12 +186,12 @@ pub fn gateway_for_benchmark(gateway_config: GatewayConfig) -> GatewayForBenchma
     mempool_client.expect_validate_tx().returning(|_| Ok(()));
     mempool_client.expect_account_tx_in_pool_or_recent_block().returning(|_| Ok(false));
 
-    GatewayForBenchmark(GenericGateway::new(
+    GenericGateway::new(
         gateway_config,
         Arc::new(state_reader_factory),
         Arc::new(mempool_client),
         Arc::new(transaction_converter),
         stateless_tx_validator,
         proof_archive_writer,
-    ))
+    )
 }