Merge branch 'wip/event-vocabulary'

1 files changed, 8 insertions, 8 deletions

diff --git a/src/channel/routes/test/on_send.rs b/src/channel/routes/test/on_send.rs
index 3297093..3fe3d1e 100644
--- a/src/channel/routes/test/on_send.rs
+++ b/src/channel/routes/test/on_send.rs
@@ -4,8 +4,8 @@ use futures::stream::StreamExt;
 use crate::{
     channel,
     channel::routes,
-    event,
-    message::app::SendError,
+    event::{self, Sequenced},
+    message::{self, app::SendError},
     test::fixtures::{self, future::Immediately as _},
 };
 
@@ -14,7 +14,7 @@ async fn messages_in_order() {
     // Set up the environment
 
     let app = fixtures::scratch_app().await;
-    let sender = fixtures::login::create(&app).await;
+    let sender = fixtures::login::create(&app, &fixtures::now()).await;
     let channel = fixtures::channel::create(&app, &fixtures::now()).await;
 
     // Call the endpoint (twice)
@@ -53,11 +53,11 @@ async fn messages_in_order() {
     let events = events.collect::<Vec<_>>().immediately().await;
 
     for ((sent_at, message), event) in requests.into_iter().zip(events) {
-        assert_eq!(*sent_at, event.instant.at);
+        assert_eq!(*sent_at, event.at());
         assert!(matches!(
-            event.kind,
-            event::Kind::MessageSent(event)
-                if event.message.sender == sender
+            event,
+            event::Event::Message(message::Event::Sent(event))
+                if event.message.sender == sender.id
                     && event.message.body == message
         ));
     }
@@ -68,7 +68,7 @@ async fn nonexistent_channel() {
     // Set up the environment
 
     let app = fixtures::scratch_app().await;
-    let login = fixtures::login::create(&app).await;
+    let login = fixtures::login::create(&app, &fixtures::now()).await;
 
     // Call the endpoint