Merge branch 'main' into wip/path-routing-for-channels

3 files changed, 12 insertions, 11 deletions

diff --git a/src/test/fixtures/event.rs b/src/test/fixtures/event.rs
index 09f0490..7fe2bf3 100644
--- a/src/test/fixtures/event.rs
+++ b/src/test/fixtures/event.rs
@@ -1,11 +1,11 @@
 use crate::{
-    event::{Event, Kind},
-    message::Message,
+    event::Event,
+    message::{Event::Sent, Message},
 };
 
 pub fn message_sent(event: &Event, message: &Message) -> bool {
     matches!(
-        &event.kind,
-        Kind::MessageSent(event) if message == &event.into()
+        &event,
+        Event::Message(Sent(event)) if message == &event.into()
     )
 }
diff --git a/src/test/fixtures/filter.rs b/src/test/fixtures/filter.rs
index 6e62aea..84d27b0 100644
--- a/src/test/fixtures/filter.rs
+++ b/src/test/fixtures/filter.rs
@@ -1,11 +1,11 @@
 use futures::future;
 
-use crate::event::{Event, Kind};
+use crate::{channel::Event::Created, event::Event, message::Event::Sent};
 
 pub fn messages() -> impl FnMut(&Event) -> future::Ready<bool> {
-    |event| future::ready(matches!(event.kind, Kind::MessageSent(_)))
+    |event| future::ready(matches!(event, Event::Message(Sent(_))))
 }
 
 pub fn created() -> impl FnMut(&Event) -> future::Ready<bool> {
-    |event| future::ready(matches!(event.kind, Kind::ChannelCreated(_)))
+    |event| future::ready(matches!(event, Event::Channel(Created(_))))
 }
diff --git a/src/test/fixtures/login.rs b/src/test/fixtures/login.rs
index 00c2789..e5ac716 100644
--- a/src/test/fixtures/login.rs
+++ b/src/test/fixtures/login.rs
@@ -3,23 +3,24 @@ use uuid::Uuid;
 
 use crate::{
     app::App,
+    clock::RequestedAt,
     login::{self, Login, Password},
 };
 
-pub async fn create_with_password(app: &App) -> (String, Password) {
+pub async fn create_with_password(app: &App, created_at: &RequestedAt) -> (String, Password) {
     let (name, password) = propose();
     app.logins()
-        .create(&name, &password)
+        .create(&name, &password, created_at)
         .await
         .expect("should always succeed if the login is actually new");
 
     (name, password)
 }
 
-pub async fn create(app: &App) -> Login {
+pub async fn create(app: &App, created_at: &RequestedAt) -> Login {
     let (name, password) = propose();
     app.logins()
-        .create(&name, &password)
+        .create(&name, &password, created_at)
         .await
         .expect("should always succeed if the login is actually new")
 }