4 files changed, 24 insertions, 12 deletions
diff --git a/src/channel/handlers/create/test.rs b/src/channel/handlers/create/test.rs
index 3c770cf..31bb778 100644
--- a/src/channel/handlers/create/test.rs
+++ b/src/channel/handlers/create/test.rs
@@ -2,6 +2,7 @@ use std::future;
 
 use axum::extract::{Json, State};
 use futures::stream::StreamExt as _;
+use itertools::Itertools;
 
 use crate::{
     channel::app,
@@ -33,7 +34,14 @@ async fn new_channel() {
     // Verify the semantics
 
     let snapshot = app.boot().snapshot().await.expect("boot always succeeds");
-    assert!(snapshot.channels.iter().any(|channel| channel == &response));
+    let created = snapshot
+        .events
+        .into_iter()
+        .filter_map(fixtures::event::channel)
+        .filter_map(fixtures::event::channel::created)
+        .exactly_one()
+        .expect("only one channel has been created");
+    assert_eq!(response, created.channel);
 
     let channel = app
         .channels()
@@ -47,8 +55,8 @@ async fn new_channel() {
         .subscribe(resume_point)
         .await
         .expect("subscribing never fails")
-        .filter_map(fixtures::event::channel)
-        .filter_map(fixtures::event::channel::created)
+        .filter_map(fixtures::event::stream::channel)
+        .filter_map(fixtures::event::stream::channel::created)
         .filter(|event| future::ready(event.channel == response));
 
     let event = events.next().expect_some("creation event published").await;
diff --git a/src/channel/handlers/delete/test.rs b/src/channel/handlers/delete/test.rs
index b1e42ea..99c19db 100644
--- a/src/channel/handlers/delete/test.rs
+++ b/src/channel/handlers/delete/test.rs
@@ -1,4 +1,5 @@
 use axum::extract::{Path, State};
+use itertools::Itertools;
 
 use crate::{channel::app, test::fixtures};
 
@@ -28,7 +29,16 @@ pub async fn valid_channel() {
     // Verify the semantics
 
     let snapshot = app.boot().snapshot().await.expect("boot always succeeds");
-    assert!(!snapshot.channels.contains(&channel));
+    let created = snapshot
+        .events
+        .into_iter()
+        .filter_map(fixtures::event::channel)
+        .filter_map(fixtures::event::channel::created)
+        .exactly_one()
+        .expect("only one channel has been created");
+    // We don't expect `channel` to match the event exactly, as the name will have been
+    // tombstoned and the channel given a `deleted_at` date.
+    assert_eq!(channel.id, created.channel.id);
 }
 
 #[tokio::test]
diff --git a/src/channel/handlers/send/test.rs b/src/channel/handlers/send/test.rs
index f43f901..7204ca4 100644
--- a/src/channel/handlers/send/test.rs
+++ b/src/channel/handlers/send/test.rs
@@ -45,8 +45,8 @@ async fn messages_in_order() {
         .subscribe(resume_point)
         .await
         .expect("subscribing to a valid channel succeeds")
-        .filter_map(fixtures::event::message)
-        .filter_map(fixtures::event::message::sent)
+        .filter_map(fixtures::event::stream::message)
+        .filter_map(fixtures::event::stream::message::sent)
         .zip(stream::iter(requests));
 
     while let Some((event, (sent_at, body))) = events
diff --git a/src/channel/history.rs b/src/channel/history.rs
index faf6a0e..7f18e45 100644
--- a/src/channel/history.rs
+++ b/src/channel/history.rs
@@ -27,12 +27,6 @@ impl History {
         self.channel.clone()
     }
 
-    pub fn as_of(&self, resume_point: Sequence) -> Option<Channel> {
-        self.events()
-            .filter(Sequence::up_to(resume_point))
-            .collect()
-    }
-
     // Snapshot of this channel as of all events recorded in this history.
     pub fn as_snapshot(&self) -> Option<Channel> {
         self.events().collect()