papyrus_base_layer: test util for creating an ethereum base layer using a mock provider

Author: guy-starkware

crates/papyrus_base_layer/src/base_layer_test.rs

@@ -5,12 +5,7 @@ use alloy::providers::{Provider, ProviderBuilder};
 use alloy::rpc::types::{Block, BlockTransactions, Header as AlloyRpcHeader};
 use pretty_assertions::assert_eq;
 
-use crate::ethereum_base_layer_contract::{
-    CircularUrlIterator,
-    EthereumBaseLayerConfig,
-    EthereumBaseLayerContract,
-    Starknet,
-};
+use crate::ethereum_base_layer_contract::{EthereumBaseLayerConfig, EthereumBaseLayerContract};
 use crate::BaseLayerContract;
 
 // TODO(Gilad): Use everywhere instead of relying on the confusing `#[ignore]` api to mark slow
@@ -24,10 +19,8 @@ fn base_layer_with_mocked_provider() -> (EthereumBaseLayerContract, Asserter) {
     let asserter = Asserter::new();
 
     let provider = ProviderBuilder::new().connect_mocked_client(asserter.clone()).root().clone();
-    let contract = Starknet::new(Default::default(), provider);
     let config = EthereumBaseLayerConfig::default();
-    let url_iterator = CircularUrlIterator::new(config.ordered_l1_endpoint_urls.clone());
-    let base_layer = EthereumBaseLayerContract { contract, config, url_iterator };
+    let base_layer = EthereumBaseLayerContract::new_with_provider(config, provider);
 
     (base_layer, asserter)
 }

crates/papyrus_base_layer/src/ethereum_base_layer_contract.rs

@@ -110,6 +110,13 @@ impl EthereumBaseLayerContract {
         );
         Self { url_iterator, contract, config }
     }
+    #[cfg(any(test, feature = "testing"))]
+    pub fn new_with_provider(config: EthereumBaseLayerConfig, provider: RootProvider) -> Self {
+        let url_iterator = CircularUrlIterator::new(config.ordered_l1_endpoint_urls.clone());
+        let starknet_contract_address = config.starknet_contract_address;
+        let contract = Starknet::new(starknet_contract_address, provider);
+        Self { url_iterator, contract, config }
+    }
 }
 
 #[async_trait]