1 files changed, 14 insertions, 16 deletions

diff --git a/src/event/routes/test/channel.rs b/src/event/routes/test/channel.rs
index ac45bfc..0ab28c4 100644
--- a/src/event/routes/test/channel.rs
+++ b/src/event/routes/test/channel.rs
@@ -33,8 +33,8 @@ async fn creating() {
     // Verify channel created event
 
     let _ = events
-        .filter_map(fixtures::channel::events)
-        .filter_map(fixtures::channel::created)
+        .filter_map(fixtures::event::channel)
+        .filter_map(fixtures::event::channel::created)
         .filter(|event| future::ready(event.channel == channel))
         .next()
         .immediately()
@@ -68,8 +68,8 @@ async fn previously_created() {
     // Verify channel created event
 
     let _ = events
-        .filter_map(fixtures::channel::events)
-        .filter_map(fixtures::channel::created)
+        .filter_map(fixtures::event::channel)
+        .filter_map(fixtures::event::channel::created)
         .filter(|event| future::ready(event.channel == channel))
         .next()
         .immediately()
@@ -101,8 +101,8 @@ async fn expiring() {
 
     // Check for expiry event
     let _ = events
-        .filter_map(fixtures::channel::events)
-        .filter_map(fixtures::channel::deleted)
+        .filter_map(fixtures::event::channel)
+        .filter_map(fixtures::event::channel::deleted)
         .filter(|event| future::ready(event.id == channel.id))
         .next()
         .immediately()
@@ -134,8 +134,8 @@ async fn previously_expired() {
 
     // Check for expiry event
     let _ = events
-        .filter_map(fixtures::channel::events)
-        .filter_map(fixtures::channel::deleted)
+        .filter_map(fixtures::event::channel)
+        .filter_map(fixtures::event::channel::deleted)
         .filter(|event| future::ready(event.id == channel.id))
         .next()
         .immediately()
@@ -167,8 +167,8 @@ async fn deleting() {
 
     // Check for delete event
     let _ = events
-        .filter_map(fixtures::channel::events)
-        .filter_map(fixtures::channel::deleted)
+        .filter_map(fixtures::event::channel)
+        .filter_map(fixtures::event::channel::deleted)
         .filter(|event| future::ready(event.id == channel.id))
         .next()
         .immediately()
@@ -182,8 +182,6 @@ async fn previously_deleted() {
 
     let app = fixtures::scratch_app().await;
     let channel = fixtures::channel::create(&app, &fixtures::now()).await;
-    let sender = fixtures::login::create(&app, &fixtures::now()).await;
-    let message = fixtures::message::send(&app, &channel, &sender, &fixtures::now()).await;
 
     // Delete the channel
 
@@ -202,11 +200,11 @@ async fn previously_deleted() {
 
     // Check for expiry event
     let _ = events
-        .filter_map(fixtures::message::events)
-        .filter_map(fixtures::message::deleted)
-        .filter(|event| future::ready(event.id == message.id))
+        .filter_map(fixtures::event::channel)
+        .filter_map(fixtures::event::channel::deleted)
+        .filter(|event| future::ready(event.id == channel.id))
         .next()
         .immediately()
         .await
-        .expect("a deleted message will be delivered");
+        .expect("a deleted channel event will be delivered");
 }