Skip to content

Commit a401baf

Browse files
LeoPatOZLeoPatOZ
committed
update tests
1 parent af1eb15 commit a401baf

File tree

10 files changed

+153
-184
lines changed

10 files changed

+153
-184
lines changed

‎examples/historical_scanning/main.rs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ use alloy::{
44
eips::BlockNumberOrTag, network::Ethereum, providers::ProviderBuilder, sol, sol_types::SolEvent,
55
};
66
use alloy_node_bindings::Anvil;
7-
use event_scanner::{EventFilter, event_scanner::{EventScanner, EventScannerMessage}};
7+
use event_scanner::{
8+
EventFilter,
9+
event_scanner::{EventScanner, EventScannerMessage},
10+
};
811

912
use tokio::time::sleep;
1013
use tokio_stream::StreamExt;
@@ -63,7 +66,7 @@ async fn main() -> anyhow::Result<()> {
6366

6467
while let Some(message) = stream.next().await {
6568
match message {
66-
EventScannerMessage::Logs(logs) => {
69+
EventScannerMessage::Message(logs) => {
6770
for log in logs {
6871
info!("Callback successfully executed with event {:?}", log.inner.data);
6972
}

‎examples/simple_counter/main.rs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ use alloy::{
44
eips::BlockNumberOrTag, network::Ethereum, providers::ProviderBuilder, sol, sol_types::SolEvent,
55
};
66
use alloy_node_bindings::Anvil;
7-
use event_scanner::{EventFilter, event_scanner::{EventScanner, EventScannerMessage}};
7+
use event_scanner::{
8+
EventFilter,
9+
event_scanner::{EventScanner, EventScannerMessage},
10+
};
811

912
use tokio::time::sleep;
1013
use tokio_stream::StreamExt;
@@ -76,7 +79,7 @@ async fn main() -> anyhow::Result<()> {
7679

7780
while let Some(message) = stream.next().await {
7881
match message {
79-
EventScannerMessage::Logs(logs) => {
82+
EventScannerMessage::Message(logs) => {
8083
for log in logs {
8184
info!("Callback successfully executed with event {:?}", log.inner.data);
8285
}

‎tests/historic_mode/basic.rs‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@ use std::{
77
};
88

99
use alloy::{eips::BlockNumberOrTag, network::Ethereum, sol_types::SolEvent};
10-
use event_scanner::{event_filter::EventFilter, event_scanner::{EventScanner, EventScannerMessage}};
10+
use event_scanner::{
11+
event_filter::EventFilter,
12+
event_scanner::{EventScanner, EventScannerMessage},
13+
};
1114
use tokio::time::timeout;
1215
use tokio_stream::StreamExt;
1316

@@ -54,17 +57,18 @@ async fn processes_events_within_specified_historical_range() -> anyhow::Result<
5457
let mut expected_new_count = 1;
5558
while let Some(message) = stream.next().await {
5659
match message {
57-
EventScannerMessage::Logs(logs) => {
60+
EventScannerMessage::Message(logs) => {
5861
event_count_clone.fetch_add(logs.len(), Ordering::SeqCst);
5962

6063
for log in logs {
61-
let TestCounter::CountIncreased { newCount } = log.log_decode().unwrap().inner.data;
64+
let TestCounter::CountIncreased { newCount } =
65+
log.log_decode().unwrap().inner.data;
6266
assert_eq!(newCount, expected_new_count);
6367
expected_new_count += 1;
6468
}
6569
}
6670
EventScannerMessage::Error(e) => {
67-
panic!("Received error: {}", e);
71+
panic!("panicked with error: {e}");
6872
}
6973
EventScannerMessage::Info(_) => {
7074
// Handle info if needed

‎tests/historic_to_live/basic.rs‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ use std::sync::{
44
};
55

66
use alloy::{eips::BlockNumberOrTag, network::Ethereum, sol_types::SolEvent};
7-
use event_scanner::{event_filter::EventFilter, event_scanner::{EventScanner, EventScannerMessage}};
7+
use event_scanner::{
8+
event_filter::EventFilter,
9+
event_scanner::{EventScanner, EventScannerMessage},
10+
};
811
use tokio::time::{Duration, sleep, timeout};
912
use tokio_stream::StreamExt;
1013

@@ -53,17 +56,18 @@ async fn replays_historical_then_switches_to_live() -> anyhow::Result<()> {
5356
let mut expected_new_count = 1;
5457
while let Some(message) = stream.next().await {
5558
match message {
56-
EventScannerMessage::Logs(logs) => {
59+
EventScannerMessage::Message(logs) => {
5760
event_count_clone.fetch_add(logs.len(), Ordering::SeqCst);
5861

5962
for log in logs {
60-
let TestCounter::CountIncreased { newCount } = log.log_decode().unwrap().inner.data;
63+
let TestCounter::CountIncreased { newCount } =
64+
log.log_decode().unwrap().inner.data;
6165
assert_eq!(newCount, expected_new_count);
6266
expected_new_count += 1;
6367
}
6468
}
6569
EventScannerMessage::Error(e) => {
66-
panic!("Received error: {}", e);
70+
panic!("panicked with error: {e}");
6771
}
6872
EventScannerMessage::Info(_) => {
6973
// Handle info if needed

‎tests/live_mode/basic.rs‎

Lines changed: 43 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ use std::{
77
};
88

99
use crate::common::{TestCounter, build_provider, deploy_counter, spawn_anvil};
10-
use alloy::{eips::BlockNumberOrTag, network::Ethereum, rpc::types::Log, sol_types::SolEvent};
10+
use alloy::{eips::BlockNumberOrTag, network::Ethereum, sol_types::SolEvent};
1111
use event_scanner::{
1212
event_filter::EventFilter,
13-
event_scanner::{EventScanner, EventScannerError, EventScannerMessage},
13+
event_scanner::{EventScanner, EventScannerMessage},
1414
};
1515
use tokio::time::timeout;
1616
use tokio_stream::{StreamExt, wrappers::ReceiverStream};
@@ -44,17 +44,18 @@ async fn basic_single_event_scanning() -> anyhow::Result<()> {
4444
let mut expected_new_count = 1;
4545
while let Some(message) = stream.next().await {
4646
match message {
47-
EventScannerMessage::Logs(logs) => {
47+
EventScannerMessage::Message(logs) => {
4848
event_count_clone.fetch_add(logs.len(), Ordering::SeqCst);
4949

5050
for log in logs {
51-
let TestCounter::CountIncreased { newCount } = log.log_decode().unwrap().inner.data;
51+
let TestCounter::CountIncreased { newCount } =
52+
log.log_decode().unwrap().inner.data;
5253
assert_eq!(newCount, expected_new_count);
5354
expected_new_count += 1;
5455
}
5556
}
5657
EventScannerMessage::Error(e) => {
57-
panic!("Received error: {}", e);
58+
panic!("panicked with error: {e}");
5859
}
5960
EventScannerMessage::Info(_) => {
6061
// Handle info if needed
@@ -103,42 +104,40 @@ async fn multiple_contracts_same_event_isolate_callbacks() -> anyhow::Result<()>
103104
b.increase().send().await?.watch().await?;
104105
}
105106

106-
let make_assertion =
107-
async |stream: ReceiverStream<EventScannerMessage>,
108-
expected_events| {
109-
let mut stream = stream.take(expected_events);
110-
111-
let count = Arc::new(AtomicUsize::new(0));
112-
let count_clone = Arc::clone(&count);
113-
114-
let event_counting = async move {
115-
let mut expected_new_count = 1;
116-
while let Some(message) = stream.next().await {
117-
match message {
118-
EventScannerMessage::Logs(logs) => {
119-
count_clone.fetch_add(logs.len(), Ordering::SeqCst);
120-
121-
for log in logs {
122-
let TestCounter::CountIncreased { newCount } =
123-
log.log_decode().unwrap().inner.data;
124-
assert_eq!(newCount, expected_new_count);
125-
expected_new_count += 1;
126-
}
127-
}
128-
EventScannerMessage::Error(e) => {
129-
panic!("Received error: {}", e);
130-
}
131-
EventScannerMessage::Info(_) => {
132-
// Handle info if needed
107+
let make_assertion = async |stream: ReceiverStream<EventScannerMessage>, expected_events| {
108+
let mut stream = stream.take(expected_events);
109+
110+
let count = Arc::new(AtomicUsize::new(0));
111+
let count_clone = Arc::clone(&count);
112+
113+
let event_counting = async move {
114+
let mut expected_new_count = 1;
115+
while let Some(message) = stream.next().await {
116+
match message {
117+
EventScannerMessage::Message(logs) => {
118+
count_clone.fetch_add(logs.len(), Ordering::SeqCst);
119+
120+
for log in logs {
121+
let TestCounter::CountIncreased { newCount } =
122+
log.log_decode().unwrap().inner.data;
123+
assert_eq!(newCount, expected_new_count);
124+
expected_new_count += 1;
133125
}
134126
}
127+
EventScannerMessage::Error(e) => {
128+
panic!("panicked with error: {e}");
129+
}
130+
EventScannerMessage::Info(_) => {
131+
// Handle info if needed
132+
}
135133
}
136-
};
137-
138-
_ = timeout(Duration::from_secs(1), event_counting).await;
139-
assert_eq!(count.load(Ordering::SeqCst), expected_events);
134+
}
140135
};
141136

137+
_ = timeout(Duration::from_secs(1), event_counting).await;
138+
assert_eq!(count.load(Ordering::SeqCst), expected_events);
139+
};
140+
142141
make_assertion(a_stream, expected_events_a).await;
143142
make_assertion(b_stream, expected_events_b).await;
144143

@@ -189,17 +188,18 @@ async fn multiple_events_same_contract() -> anyhow::Result<()> {
189188
// process CountIncreased
190189
while let Some(message) = incr_stream.next().await {
191190
match message {
192-
EventScannerMessage::Logs(logs) => {
191+
EventScannerMessage::Message(logs) => {
193192
incr_count_clone.fetch_add(logs.len(), Ordering::SeqCst);
194193

195194
for log in logs {
196195
expected_new_count += 1;
197-
let TestCounter::CountIncreased { newCount } = log.log_decode().unwrap().inner.data;
196+
let TestCounter::CountIncreased { newCount } =
197+
log.log_decode().unwrap().inner.data;
198198
assert_eq!(newCount, expected_new_count);
199199
}
200200
}
201201
EventScannerMessage::Error(e) => {
202-
panic!("Received error: {}", e);
202+
panic!("panicked with error {e}");
203203
}
204204
EventScannerMessage::Info(_) => {
205205
// Handle info if needed
@@ -212,17 +212,18 @@ async fn multiple_events_same_contract() -> anyhow::Result<()> {
212212
// process CountDecreased
213213
while let Some(message) = decr_stream.next().await {
214214
match message {
215-
EventScannerMessage::Logs(logs) => {
215+
EventScannerMessage::Message(logs) => {
216216
decr_count_clone.fetch_add(logs.len(), Ordering::SeqCst);
217217

218218
for log in logs {
219-
let TestCounter::CountDecreased { newCount } = log.log_decode().unwrap().inner.data;
219+
let TestCounter::CountDecreased { newCount } =
220+
log.log_decode().unwrap().inner.data;
220221
assert_eq!(newCount, expected_new_count);
221222
expected_new_count -= 1;
222223
}
223224
}
224225
EventScannerMessage::Error(e) => {
225-
panic!("Received error: {}", e);
226+
panic!("panicked with error {e}");
226227
}
227228
EventScannerMessage::Info(_) => {
228229
// Handle info if needed

‎tests/live_mode/error_propagation.rs‎

Lines changed: 0 additions & 76 deletions
This file was deleted.

‎tests/live_mode/mod.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
pub mod basic;
2-
pub mod error_propagation;
32
pub mod optional_fields;
43
pub mod performance;
54
pub mod reorg;

0 commit comments

Comments
 (0)