7 files changed, 26 insertions, 26 deletions

diff --git a/src/test/fixtures/cookie.rs b/src/test/fixtures/cookie.rs
index fcb379f..bba53b8 100644
--- a/src/test/fixtures/cookie.rs
+++ b/src/test/fixtures/cookie.rs
@@ -3,9 +3,9 @@ use uuid::Uuid;
 use crate::{
     app::App,
     clock::RequestedAt,
-    login::Password,
     name::Name,
     token::{Secret, extract::IdentityCookie},
+    user::Password,
 };
 
 pub fn not_logged_in() -> IdentityCookie {
diff --git a/src/test/fixtures/event.rs b/src/test/fixtures/event.rs
index e11f6ee..a30bb4b 100644
--- a/src/test/fixtures/event.rs
+++ b/src/test/fixtures/event.rs
@@ -16,9 +16,9 @@ pub fn message(event: Event) -> Ready<Option<message::Event>> {
     })
 }
 
-pub fn login(event: Event) -> Ready<Option<login::Event>> {
+pub fn user(event: Event) -> Ready<Option<user::Event>> {
     future::ready(match event {
-        Event::Login(event) => Some(event),
+        Event::User(event) => Some(event),
         _ => None,
     })
 }
@@ -65,11 +65,11 @@ pub mod message {
     }
 }
 
-pub mod login {
+pub mod user {
     use std::future::{self, Ready};
 
-    pub use crate::login::Event;
-    use crate::login::event;
+    pub use crate::user::Event;
+    use crate::user::event;
 
     pub fn created(event: Event) -> Ready<Option<event::Created>> {
         future::ready(match event {
diff --git a/src/test/fixtures/identity.rs b/src/test/fixtures/identity.rs
index ffc44c6..cb325d8 100644
--- a/src/test/fixtures/identity.rs
+++ b/src/test/fixtures/identity.rs
@@ -1,17 +1,17 @@
 use crate::{
     app::App,
     clock::RequestedAt,
-    login::Password,
     name::Name,
     test::fixtures,
     token::{
         self,
         extract::{Identity, IdentityCookie},
     },
+    user::Password,
 };
 
 pub async fn create(app: &App, created_at: &RequestedAt) -> Identity {
-    let credentials = fixtures::login::create_with_password(app, created_at).await;
+    let credentials = fixtures::user::create_with_password(app, created_at).await;
     logged_in(app, &credentials, created_at).await
 }
 
@@ -21,13 +21,13 @@ pub async fn from_cookie(
     validated_at: &RequestedAt,
 ) -> Identity {
     let secret = cookie.secret().expect("identity token has a secret");
-    let (token, login) = app
+    let (token, user) = app
         .tokens()
         .validate(&secret, validated_at)
         .await
         .expect("always validates newly-issued secret");
 
-    Identity { token, login }
+    Identity { token, user }
 }
 
 pub async fn logged_in(
@@ -41,7 +41,7 @@ pub async fn logged_in(
 
 pub fn fictitious() -> Identity {
     let token = token::Id::generate();
-    let login = fixtures::login::fictitious();
+    let user = fixtures::user::fictitious();
 
-    Identity { token, login }
+    Identity { token, user }
 }
diff --git a/src/test/fixtures/invite.rs b/src/test/fixtures/invite.rs
index 654d1b4..7a41eb6 100644
--- a/src/test/fixtures/invite.rs
+++ b/src/test/fixtures/invite.rs
@@ -2,10 +2,10 @@ use crate::{
     app::App,
     clock::DateTime,
     invite::{self, Invite},
-    login::Login,
+    user::User,
 };
 
-pub async fn issue(app: &App, issuer: &Login, issued_at: &DateTime) -> Invite {
+pub async fn issue(app: &App, issuer: &User, issued_at: &DateTime) -> Invite {
     app.invites()
         .issue(issuer, issued_at)
         .await
diff --git a/src/test/fixtures/message.rs b/src/test/fixtures/message.rs
index d3b4719..2254915 100644
--- a/src/test/fixtures/message.rs
+++ b/src/test/fixtures/message.rs
@@ -4,11 +4,11 @@ use crate::{
     app::App,
     channel::Channel,
     clock::RequestedAt,
-    login::Login,
     message::{self, Body, Message},
+    user::User,
 };
 
-pub async fn send(app: &App, channel: &Channel, sender: &Login, sent_at: &RequestedAt) -> Message {
+pub async fn send(app: &App, channel: &Channel, sender: &User, sent_at: &RequestedAt) -> Message {
     let body = propose();
 
     app.messages()
diff --git a/src/test/fixtures/mod.rs b/src/test/fixtures/mod.rs
index 57eee30..418bdb5 100644
--- a/src/test/fixtures/mod.rs
+++ b/src/test/fixtures/mod.rs
@@ -9,8 +9,8 @@ pub mod event;
 pub mod future;
 pub mod identity;
 pub mod invite;
-pub mod login;
 pub mod message;
+pub mod user;
 
 pub async fn scratch_app() -> App {
     let pool = db::prepare("sqlite::memory:", "sqlite::memory:")
diff --git a/src/test/fixtures/login.rs b/src/test/fixtures/user.rs
index 86e3e39..6448f64 100644
--- a/src/test/fixtures/login.rs
+++ b/src/test/fixtures/user.rs
@@ -4,32 +4,32 @@ use uuid::Uuid;
 use crate::{
     app::App,
     clock::RequestedAt,
-    login::{self, Login, Password},
     name::Name,
+    user::{self, Password, User},
 };
 
 pub async fn create_with_password(app: &App, created_at: &RequestedAt) -> (Name, Password) {
     let (name, password) = propose();
-    let login = app
-        .logins()
+    let user = app
+        .users()
         .create(&name, &password, created_at)
         .await
         .expect("should always succeed if the login is actually new");
 
-    (login.name, password)
+    (user.name, password)
 }
 
-pub async fn create(app: &App, created_at: &RequestedAt) -> Login {
+pub async fn create(app: &App, created_at: &RequestedAt) -> User {
     let (name, password) = propose();
-    app.logins()
+    app.users()
         .create(&name, &password, created_at)
         .await
         .expect("should always succeed if the login is actually new")
 }
 
-pub fn fictitious() -> Login {
-    Login {
-        id: login::Id::generate(),
+pub fn fictitious() -> User {
+    User {
+        id: user::Id::generate(),
         name: propose_name(),
     }
 }