3 files changed, 22 insertions, 21 deletions
diff --git a/src/channel/routes/test/list.rs b/src/channel/routes/test/list.rs
index bc94024..f15a53c 100644
--- a/src/channel/routes/test/list.rs
+++ b/src/channel/routes/test/list.rs
@@ -1,4 +1,5 @@
 use axum::extract::State;
+use axum_extra::extract::Query;
 
 use crate::{channel::routes, test::fixtures};
 
@@ -11,7 +12,7 @@ async fn empty_list() {
 
     // Call the endpoint
 
-    let routes::Channels(channels) = routes::list(State(app), viewer)
+    let routes::Channels(channels) = routes::list(State(app), viewer, Query::default())
         .await
         .expect("always succeeds");
 
@@ -30,7 +31,7 @@ async fn one_channel() {
 
     // Call the endpoint
 
-    let routes::Channels(channels) = routes::list(State(app), viewer)
+    let routes::Channels(channels) = routes::list(State(app), viewer, Query::default())
         .await
         .expect("always succeeds");
 
@@ -52,7 +53,7 @@ async fn multiple_channels() {
 
     // Call the endpoint
 
-    let routes::Channels(response_channels) = routes::list(State(app), viewer)
+    let routes::Channels(response_channels) = routes::list(State(app), viewer, Query::default())
         .await
         .expect("always succeeds");
 
diff --git a/src/channel/routes/test/on_create.rs b/src/channel/routes/test/on_create.rs
index e2610a5..5733c9e 100644
--- a/src/channel/routes/test/on_create.rs
+++ b/src/channel/routes/test/on_create.rs
@@ -3,7 +3,7 @@ use futures::stream::StreamExt as _;
 
 use crate::{
     channel::{app, routes},
-    events::types,
+    event,
     test::fixtures::{self, future::Immediately as _},
 };
 
@@ -33,26 +33,25 @@ async fn new_channel() {
 
     // Verify the semantics
 
-    let channels = app.channels().all().await.expect("always succeeds");
+    let channels = app.channels().all(None).await.expect("always succeeds");
     assert!(channels.contains(&response_channel));
 
     let mut events = app
         .events()
-        .subscribe(types::ResumePoint::default())
+        .subscribe(None)
         .await
         .expect("subscribing never fails")
         .filter(fixtures::filter::created());
 
-    let types::ResumableEvent(_, event) = events
+    let event = events
         .next()
         .immediately()
         .await
         .expect("creation event published");
 
-    assert_eq!(types::Sequence::default(), event.sequence);
     assert!(matches!(
-        event.data,
-        types::ChannelEventData::Created(event)
+        event.kind,
+        event::Kind::ChannelCreated(event)
             if event.channel == response_channel
     ));
 }
diff --git a/src/channel/routes/test/on_send.rs b/src/channel/routes/test/on_send.rs
index 233518b..3297093 100644
--- a/src/channel/routes/test/on_send.rs
+++ b/src/channel/routes/test/on_send.rs
@@ -2,9 +2,10 @@ use axum::extract::{Json, Path, State};
 use futures::stream::StreamExt;
 
 use crate::{
+    channel,
     channel::routes,
-    events::{app, types},
-    repo::channel,
+    event,
+    message::app::SendError,
     test::fixtures::{self, future::Immediately as _},
 };
 
@@ -43,7 +44,7 @@ async fn messages_in_order() {
 
     let events = app
         .events()
-        .subscribe(types::ResumePoint::default())
+        .subscribe(None)
         .await
         .expect("subscribing to a valid channel")
         .filter(fixtures::filter::messages())
@@ -51,13 +52,13 @@ async fn messages_in_order() {
 
     let events = events.collect::<Vec<_>>().immediately().await;
 
-    for ((sent_at, message), types::ResumableEvent(_, event)) in requests.into_iter().zip(events) {
-        assert_eq!(*sent_at, event.at);
+    for ((sent_at, message), event) in requests.into_iter().zip(events) {
+        assert_eq!(*sent_at, event.instant.at);
         assert!(matches!(
-            event.data,
-            types::ChannelEventData::Message(event_message)
-                if event_message.sender == sender
-                    && event_message.message.body == message
+            event.kind,
+            event::Kind::MessageSent(event)
+                if event.message.sender == sender
+                    && event.message.body == message
         ));
     }
 }
@@ -76,7 +77,7 @@ async fn nonexistent_channel() {
     let request = routes::SendRequest {
         message: fixtures::message::propose(),
     };
-    let routes::ErrorResponse(error) = routes::on_send(
+    let routes::SendErrorResponse(error) = routes::on_send(
         State(app),
         Path(channel.clone()),
         sent_at,
@@ -90,6 +91,6 @@ async fn nonexistent_channel() {
 
     assert!(matches!(
         error,
-        app::EventsError::ChannelNotFound(error_channel) if channel == error_channel
+        SendError::ChannelNotFound(error_channel) if channel == error_channel
     ));
 }