test: Add back testing mod file + refactors (#158)

Co-authored-by: Nenad <[email protected]>

Author: LeoPatOZ

src/test_utils/mod.rs

@@ -1,4 +1 @@
 pub mod macros;
-pub mod types;
-
-pub use types::LogMetadata;

src/test_utils/types.rs

@@ -5,15 +5,14 @@
 use alloy::{
     eips::BlockNumberOrTag,
     network::Ethereum,
-    primitives::U256,
     providers::{Provider, ProviderBuilder, RootProvider},
     sol,
     sol_types::SolEvent,
 };
 use alloy_node_bindings::{Anvil, AnvilInstance};
 use event_scanner::{
     EventFilter, EventScanner, EventScannerBuilder, Historic, LatestEvents, Live, Message,
-    SyncFromBlock, SyncFromLatestEvents, test_utils::LogMetadata,
+    SyncFromBlock, SyncFromLatestEvents,
 };
 use tokio_stream::wrappers::ReceiverStream;
 
@@ -197,41 +196,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/common.rs

@@ -1,7 +1,7 @@
-use alloy::eips::BlockNumberOrTag;
+use alloy::{eips::BlockNumberOrTag, primitives::U256};
 use event_scanner::{assert_closed, assert_next};
 
-use crate::common::{TestCounterExt, setup_historic_scanner};
+use crate::common::{TestCounter, setup_historic_scanner};
 
 #[tokio::test]
 async fn processes_events_within_specified_historical_range() -> anyhow::Result<()> {
@@ -16,17 +16,24 @@ async fn processes_events_within_specified_historical_range() -> anyhow::Result<
     let scanner = setup.scanner;
     let mut stream = setup.stream;
 
-    let expected = &[
-        contract.increase_and_get_meta().await?,
-        contract.increase_and_get_meta().await?,
-        contract.increase_and_get_meta().await?,
-        contract.increase_and_get_meta().await?,
-        contract.increase_and_get_meta().await?,
-    ];
+    contract.increase().send().await?.watch().await?;
+    contract.increase().send().await?.watch().await?;
+    contract.increase().send().await?.watch().await?;
+    contract.increase().send().await?.watch().await?;
+    contract.increase().send().await?.watch().await?;
 
     scanner.start().await?;
 
-    assert_next!(stream, expected);
+    assert_next!(
+        stream,
+        &[
+            TestCounter::CountIncreased { newCount: U256::from(1) },
+            TestCounter::CountIncreased { newCount: U256::from(2) },
+            TestCounter::CountIncreased { newCount: U256::from(3) },
+            TestCounter::CountIncreased { newCount: U256::from(4) },
+            TestCounter::CountIncreased { newCount: U256::from(5) },
+        ]
+    );
     assert_closed!(stream);
 
     Ok(())