fix: import and provider issues in test

Author: LeoPatOZ

tests/common/mod.rs

@@ -6,10 +6,10 @@ pub mod setup_scanner;
 pub mod test_counter;
 
 pub(crate) use setup_scanner::{
-    LiveScannerSetup, setup_common, setup_historic_scanner, setup_latest_scanner,
+    LiveScannerSetup, SyncScannerSetup, setup_common, setup_historic_scanner, setup_latest_scanner,
     setup_live_scanner, setup_sync_from_latest_scanner, setup_sync_scanner,
 };
-pub(crate) use test_counter::{TestCounter, TestCounterExt, deploy_counter};
+pub(crate) use test_counter::{TestCounter, deploy_counter};
 
 use alloy::{network::Ethereum, providers::ProviderBuilder};
 use alloy_node_bindings::{Anvil, AnvilInstance};

tests/common/test_counter.rs

@@ -1,5 +1,4 @@
-use alloy::{network::Ethereum, primitives::U256, providers::Provider, sol};
-use event_scanner::test_utils::LogMetadata;
+use alloy::{network::Ethereum, sol};
 
 // Shared test contract used across integration tests
 sol! {
@@ -37,41 +36,3 @@ where
     let contract = TestCounter::deploy(provider).await?;
     Ok(contract)
 }
-
-#[allow(dead_code)]
-pub(crate) trait TestCounterExt {
-    async fn increase_and_get_meta(
-        &self,
-    ) -> anyhow::Result<LogMetadata<TestCounter::CountIncreased>>;
-    async fn decrease_and_get_meta(
-        &self,
-    ) -> anyhow::Result<LogMetadata<TestCounter::CountDecreased>>;
-}
-
-impl<P: Provider + Clone> TestCounterExt for TestCounter::TestCounterInstance<P> {
-    async fn increase_and_get_meta(
-        &self,
-    ) -> anyhow::Result<LogMetadata<TestCounter::CountIncreased>> {
-        let receipt = self.increase().send().await?.get_receipt().await?;
-        let tx_hash = receipt.transaction_hash;
-        let new_count = receipt.decoded_log::<TestCounter::CountIncreased>().unwrap().data.newCount;
-        Ok(LogMetadata {
-            event: TestCounter::CountIncreased { newCount: U256::from(new_count) },
-            address: *self.address(),
-            tx_hash,
-        })
-    }
-
-    async fn decrease_and_get_meta(
-        &self,
-    ) -> anyhow::Result<LogMetadata<TestCounter::CountDecreased>> {
-        let receipt = self.decrease().send().await?.get_receipt().await?;
-        let tx_hash = receipt.transaction_hash;
-        let new_count = receipt.decoded_log::<TestCounter::CountDecreased>().unwrap().data.newCount;
-        Ok(LogMetadata {
-            event: TestCounter::CountDecreased { newCount: U256::from(new_count) },
-            address: *self.address(),
-            tx_hash,
-        })
-    }
-}

tests/latest_events/basic.rs

@@ -1,8 +1,5 @@
 use alloy::{
-    eips::BlockNumberOrTag,
-    primitives::U256,
-    providers::{Provider, ext::AnvilApi},
-    sol_types::SolEvent,
+    eips::BlockNumberOrTag, primitives::U256, providers::ext::AnvilApi, sol_types::SolEvent,
 };
 
 use crate::common::{TestCounter, deploy_counter, setup_common, setup_latest_scanner};
@@ -341,7 +338,7 @@ async fn latest_scanner_large_gaps_and_empty_ranges() -> anyhow::Result<()> {
 
 #[tokio::test]
 async fn latest_scanner_boundary_range_single_block() -> anyhow::Result<()> {
-    let (anvil, _provider, contract, default_filter) = setup_common(None, None).await?;
+    let (_anvil, provider, contract, default_filter) = setup_common(None, None).await?;
 
     contract.increase().send().await?.watch().await?;
     let receipt = contract.increase().send().await?.get_receipt().await?;