apollo_integration_tests: use AnvilBaseLayer (#7785) (#9711)

TODO: will soon make `send_message_to_l2` a method on `AnvilBaseLayer`,
as it interacts directly with L1, thus it will no longer be necessary to
interact with the internal starknet contract via
`anvil.ethereum_base_layer_contract.contract`.

Co-authored-by: giladchase <[email protected]>
Co-authored-by: Gilad Chase <[email protected]>

Author: 3 people

crates/apollo_integration_tests/src/flow_test_setup.rs

@@ -2,7 +2,6 @@ use std::collections::HashMap;
 use std::net::SocketAddr;
 use std::sync::Arc;
 
-use alloy::node_bindings::AnvilInstance;
 use apollo_consensus_manager_config::config::ConsensusManagerConfig;
 use apollo_http_server::test_utils::HttpTestClient;
 use apollo_http_server_config::config::HttpServerConfig;
@@ -31,18 +30,17 @@ use mempool_test_utils::starknet_api_test_utils::{
     AccountTransactionGenerator,
     MultiAccountTransactionGenerator,
 };
+use papyrus_base_layer::anvil_base_layer::AnvilBaseLayer;
 use papyrus_base_layer::ethereum_base_layer_contract::{
     EthereumBaseLayerConfig,
     L1ToL2MessageArgs,
-    StarknetL1Contract,
 };
 use papyrus_base_layer::test_utils::{
-    ethereum_base_layer_config_for_anvil,
     make_block_history_on_anvil,
-    spawn_anvil_and_deploy_starknet_l1_contract,
     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;
 use starknet_api::core::{ChainId, ContractAddress};
@@ -78,10 +76,9 @@ pub struct FlowTestSetup {
     pub sequencer_0: FlowSequencerSetup,
     pub sequencer_1: FlowSequencerSetup,
 
-    // Handle for L1 server: the server is dropped when handle is dropped.
-    #[allow(dead_code)]
-    l1_handle: AnvilInstance,
-    starknet_l1_contract: StarknetL1Contract,
+    // Ethereum base layer coupled with an Anvil server instance, the server is dropped when the
+    // instance is dropped.
+    pub anvil_base_layer: AnvilBaseLayer,
 
     // The transactions that were streamed in the consensus proposals, used for asserting the right
     // transactions are batched.
@@ -122,10 +119,9 @@ impl FlowTestSetup {
             .try_into()
             .unwrap();
 
-        let (base_layer_config, base_layer_url) =
-            ethereum_base_layer_config_for_anvil(Some(available_ports.get_next_port()));
-        let (anvil, starknet_l1_contract) =
-            spawn_anvil_and_deploy_starknet_l1_contract(&base_layer_config, &base_layer_url).await;
+        let anvil_base_layer = AnvilBaseLayer::new().await;
+        let base_layer_url = anvil_base_layer.get_url().await.unwrap();
+        let base_layer_config = anvil_base_layer.ethereum_base_layer.config.clone();
 
         // Send some transactions to L1 so it has a history of blocks to scrape gas prices from.
         let sender_address = ARBITRARY_ANVIL_L1_ACCOUNT_ADDRESS;
@@ -181,7 +177,7 @@ impl FlowTestSetup {
         )
         .await;
 
-        Self { sequencer_0, sequencer_1, l1_handle: anvil, starknet_l1_contract, accumulated_txs }
+        Self { sequencer_0, sequencer_1, anvil_base_layer, accumulated_txs }
     }
 
     pub fn chain_id(&self) -> &ChainId {
@@ -199,7 +195,11 @@ impl FlowTestSetup {
 
     pub async fn send_messages_to_l2(&self, l1_to_l2_messages_args: &[L1ToL2MessageArgs]) {
         for l1_to_l2_message_args in l1_to_l2_messages_args {
-            self.starknet_l1_contract.send_message_to_l2(l1_to_l2_message_args).await;
+            self.anvil_base_layer
+                .ethereum_base_layer
+                .contract
+                .send_message_to_l2(l1_to_l2_message_args)
+                .await;
         }
     }
 }