From eae0edb57e9ade7c73affb78baf2ae267b6290b8 Mon Sep 17 00:00:00 2001
From: Owen Jacobson <owen@grimoire.ca>
Date: Thu, 24 Oct 2024 22:50:23 -0400
Subject: Consolidate test helper event functions

---
 src/event/routes/test/resume.rs | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/event/routes/test/resume.rs')

diff --git a/src/event/routes/test/resume.rs b/src/event/routes/test/resume.rs
index c393d38..e4751bb 100644
--- a/src/event/routes/test/resume.rs
+++ b/src/event/routes/test/resume.rs
@@ -40,8 +40,8 @@ async fn resume() {
         .expect("subscribe never fails");
 
         let event = events
-            .filter_map(fixtures::message::events)
-            .filter_map(fixtures::message::sent)
+            .filter_map(fixtures::event::message)
+            .filter_map(fixtures::event::message::sent)
             .filter(|event| future::ready(event.message == initial_message))
             .next()
             .immediately()
@@ -64,8 +64,8 @@ async fn resume() {
     // Verify final events
 
     let mut events = resumed
-        .filter_map(fixtures::message::events)
-        .filter_map(fixtures::message::sent)
+        .filter_map(fixtures::event::message)
+        .filter_map(fixtures::event::message::sent)
         .zip(stream::iter(later_messages));
 
     while let Some((event, message)) = events.next().immediately().await {
@@ -124,8 +124,8 @@ async fn serial_resume() {
         // Check for expected events
 
         let events = events
-            .filter_map(fixtures::message::events)
-            .filter_map(fixtures::message::sent)
+            .filter_map(fixtures::event::message)
+            .filter_map(fixtures::event::message::sent)
             .zip(stream::iter(initial_messages))
             .collect::<Vec<_>>()
             .immediately()
@@ -165,8 +165,8 @@ async fn serial_resume() {
         // Check for expected events
 
         let events = events
-            .filter_map(fixtures::message::events)
-            .filter_map(fixtures::message::sent)
+            .filter_map(fixtures::event::message)
+            .filter_map(fixtures::event::message::sent)
             .zip(stream::iter(resume_messages))
             .collect::<Vec<_>>()
             .immediately()
@@ -206,8 +206,8 @@ async fn serial_resume() {
         // Check for expected events
 
         let events = events
-            .filter_map(fixtures::message::events)
-            .filter_map(fixtures::message::sent)
+            .filter_map(fixtures::event::message)
+            .filter_map(fixtures::event::message::sent)
             .zip(stream::iter(final_messages))
             .collect::<Vec<_>>()
             .immediately()
-- 
cgit v1.2.3