7 files changed, 33 insertions, 33 deletions
diff --git a/src/test/fixtures/channel.rs b/src/test/fixtures/channel.rs
index 8744470..b678717 100644
--- a/src/test/fixtures/channel.rs
+++ b/src/test/fixtures/channel.rs
@@ -4,7 +4,7 @@ use faker_rand::{
 };
 use rand;
 
-use crate::{app::App, clock::RequestedAt, repo::channel::Channel};
+use crate::{app::App, channel::Channel, clock::RequestedAt};
 
 pub async fn create(app: &App, created_at: &RequestedAt) -> Channel {
     let name = propose();
diff --git a/src/test/fixtures/event.rs b/src/test/fixtures/event.rs
new file mode 100644
index 0000000..09f0490
--- /dev/null
+++ b/src/test/fixtures/event.rs
@@ -0,0 +1,11 @@
+use crate::{
+    event::{Event, Kind},
+    message::Message,
+};
+
+pub fn message_sent(event: &Event, message: &Message) -> bool {
+    matches!(
+        &event.kind,
+        Kind::MessageSent(event) if message == &event.into()
+    )
+}
diff --git a/src/test/fixtures/filter.rs b/src/test/fixtures/filter.rs
index fbebced..6e62aea 100644
--- a/src/test/fixtures/filter.rs
+++ b/src/test/fixtures/filter.rs
@@ -1,15 +1,11 @@
 use futures::future;
 
-use crate::events::types;
+use crate::event::{Event, Kind};
 
-pub fn messages() -> impl FnMut(&types::ResumableEvent) -> future::Ready<bool> {
-    |types::ResumableEvent(_, event)| {
-        future::ready(matches!(event.data, types::ChannelEventData::Message(_)))
-    }
+pub fn messages() -> impl FnMut(&Event) -> future::Ready<bool> {
+    |event| future::ready(matches!(event.kind, Kind::MessageSent(_)))
 }
 
-pub fn created() -> impl FnMut(&types::ResumableEvent) -> future::Ready<bool> {
-    |types::ResumableEvent(_, event)| {
-        future::ready(matches!(event.data, types::ChannelEventData::Created(_)))
-    }
+pub fn created() -> impl FnMut(&Event) -> future::Ready<bool> {
+    |event| future::ready(matches!(event.kind, Kind::ChannelCreated(_)))
 }
diff --git a/src/test/fixtures/identity.rs b/src/test/fixtures/identity.rs
index 633fb8a..56b4ffa 100644
--- a/src/test/fixtures/identity.rs
+++ b/src/test/fixtures/identity.rs
@@ -3,8 +3,11 @@ use uuid::Uuid;
 use crate::{
     app::App,
     clock::RequestedAt,
-    login::extract::{Identity, IdentitySecret, IdentityToken},
-    password::Password,
+    login::Password,
+    token::{
+        extract::{Identity, IdentityToken},
+        Secret,
+    },
 };
 
 pub fn not_logged_in() -> IdentityToken {
@@ -14,7 +17,7 @@ pub fn not_logged_in() -> IdentityToken {
 pub async fn logged_in(app: &App, login: &(String, Password), now: &RequestedAt) -> IdentityToken {
     let (name, password) = login;
     let token = app
-        .logins()
+        .tokens()
         .login(name, password, now)
         .await
         .expect("should succeed given known-valid credentials");
@@ -25,7 +28,7 @@ pub async fn logged_in(app: &App, login: &(String, Password), now: &RequestedAt)
 pub async fn from_token(app: &App, token: &IdentityToken, issued_at: &RequestedAt) -> Identity {
     let secret = token.secret().expect("identity token has a secret");
     let (token, login) = app
-        .logins()
+        .tokens()
         .validate(&secret, issued_at)
         .await
         .expect("always validates newly-issued secret");
@@ -38,7 +41,7 @@ pub async fn identity(app: &App, login: &(String, Password), issued_at: &Request
     from_token(app, &secret, issued_at).await
 }
 
-pub fn secret(identity: &IdentityToken) -> IdentitySecret {
+pub fn secret(identity: &IdentityToken) -> Secret {
     identity.secret().expect("identity contained a secret")
 }
 
diff --git a/src/test/fixtures/login.rs b/src/test/fixtures/login.rs
index d6a321b..00c2789 100644
--- a/src/test/fixtures/login.rs
+++ b/src/test/fixtures/login.rs
@@ -3,8 +3,7 @@ use uuid::Uuid;
 
 use crate::{
     app::App,
-    password::Password,
-    repo::login::{self, Login},
+    login::{self, Login, Password},
 };
 
 pub async fn create_with_password(app: &App) -> (String, Password) {
diff --git a/src/test/fixtures/message.rs b/src/test/fixtures/message.rs
index bfca8cd..381b10b 100644
--- a/src/test/fixtures/message.rs
+++ b/src/test/fixtures/message.rs
@@ -1,22 +1,12 @@
 use faker_rand::lorem::Paragraphs;
 
-use crate::{
-    app::App,
-    clock::RequestedAt,
-    events::types,
-    repo::{channel::Channel, login::Login},
-};
+use crate::{app::App, channel::Channel, clock::RequestedAt, login::Login, message::Message};
 
-pub async fn send(
-    app: &App,
-    login: &Login,
-    channel: &Channel,
-    sent_at: &RequestedAt,
-) -> types::ChannelEvent {
+pub async fn send(app: &App, channel: &Channel, login: &Login, sent_at: &RequestedAt) -> Message {
     let body = propose();
 
-    app.events()
-        .send(login, &channel.id, &body, sent_at)
+    app.messages()
+        .send(&channel.id, login, sent_at, &body)
         .await
         .expect("should succeed if the channel exists")
 }
diff --git a/src/test/fixtures/mod.rs b/src/test/fixtures/mod.rs
index d1dd0c3..c5efa9b 100644
--- a/src/test/fixtures/mod.rs
+++ b/src/test/fixtures/mod.rs
@@ -1,8 +1,9 @@
 use chrono::{TimeDelta, Utc};
 
-use crate::{app::App, clock::RequestedAt, repo::pool};
+use crate::{app::App, clock::RequestedAt, db};
 
 pub mod channel;
+pub mod event;
 pub mod filter;
 pub mod future;
 pub mod identity;
@@ -10,7 +11,7 @@ pub mod login;
 pub mod message;
 
 pub async fn scratch_app() -> App {
-    let pool = pool::prepare("sqlite::memory:")
+    let pool = db::prepare("sqlite::memory:")
         .await
         .expect("setting up in-memory sqlite database");
     App::from(pool)