5 files changed, 27 insertions, 22 deletions

diff --git a/src/test/fixtures/channel.rs b/src/test/fixtures/conversation.rs
index 98048f2..fb2f58d 100644
--- a/src/test/fixtures/channel.rs
+++ b/src/test/fixtures/conversation.rs
@@ -7,17 +7,17 @@ use rand;
 
 use crate::{
     app::App,
-    channel::{self, Channel},
     clock::RequestedAt,
+    conversation::{self, Conversation},
     name::Name,
 };
 
-pub async fn create(app: &App, created_at: &RequestedAt) -> Channel {
+pub async fn create(app: &App, created_at: &RequestedAt) -> Conversation {
     let name = propose();
-    app.channels()
+    app.conversations()
         .create(&name, created_at)
         .await
-        .expect("should always succeed if the channel is actually new")
+        .expect("should always succeed if the conversation is actually new")
 }
 
 pub fn propose() -> Name {
@@ -33,6 +33,6 @@ faker_impl_from_templates! {
     NameTemplate; "{} {}", CityName, FullName;
 }
 
-pub fn fictitious() -> channel::Id {
-    channel::Id::generate()
+pub fn fictitious() -> conversation::Id {
+    conversation::Id::generate()
 }
diff --git a/src/test/fixtures/event/mod.rs b/src/test/fixtures/event/mod.rs
index 691cdeb..08b17e7 100644
--- a/src/test/fixtures/event/mod.rs
+++ b/src/test/fixtures/event/mod.rs
@@ -2,9 +2,9 @@ use crate::event::Event;
 
 pub mod stream;
 
-pub fn channel(event: Event) -> Option<crate::channel::Event> {
+pub fn conversation(event: Event) -> Option<crate::conversation::Event> {
     match event {
-        Event::Channel(channel) => Some(channel),
+        Event::Conversation(conversation) => Some(conversation),
         _ => None,
     }
 }
@@ -23,8 +23,8 @@ pub fn user(event: Event) -> Option<crate::user::Event> {
     }
 }
 
-pub mod channel {
-    use crate::channel::{Event, event};
+pub mod conversation {
+    use crate::conversation::{Event, event};
 
     pub fn created(event: Event) -> Option<event::Created> {
         match event {
diff --git a/src/test/fixtures/event/stream.rs b/src/test/fixtures/event/stream.rs
index 6c2a1bf..5b3621d 100644
--- a/src/test/fixtures/event/stream.rs
+++ b/src/test/fixtures/event/stream.rs
@@ -2,8 +2,8 @@ use std::future::{self, Ready};
 
 use crate::{event::Event, test::fixtures::event};
 
-pub fn channel(event: Event) -> Ready<Option<crate::channel::Event>> {
-    future::ready(event::channel(event))
+pub fn conversation(event: Event) -> Ready<Option<crate::conversation::Event>> {
+    future::ready(event::conversation(event))
 }
 
 pub fn message(event: Event) -> Ready<Option<crate::message::Event>> {
@@ -14,20 +14,20 @@ pub fn user(event: Event) -> Ready<Option<crate::user::Event>> {
     future::ready(event::user(event))
 }
 
-pub mod channel {
+pub mod conversation {
     use std::future::{self, Ready};
 
     use crate::{
-        channel::{Event, event},
-        test::fixtures::event::channel,
+        conversation::{Event, event},
+        test::fixtures::event::conversation,
     };
 
     pub fn created(event: Event) -> Ready<Option<event::Created>> {
-        future::ready(channel::created(event))
+        future::ready(conversation::created(event))
     }
 
     pub fn deleted(event: Event) -> Ready<Option<event::Deleted>> {
-        future::ready(channel::deleted(event))
+        future::ready(conversation::deleted(event))
     }
 }
 
diff --git a/src/test/fixtures/message.rs b/src/test/fixtures/message.rs
index 2254915..03f8072 100644
--- a/src/test/fixtures/message.rs
+++ b/src/test/fixtures/message.rs
@@ -2,19 +2,24 @@ use faker_rand::lorem::Paragraphs;
 
 use crate::{
     app::App,
-    channel::Channel,
     clock::RequestedAt,
+    conversation::Conversation,
     message::{self, Body, Message},
     user::User,
 };
 
-pub async fn send(app: &App, channel: &Channel, sender: &User, sent_at: &RequestedAt) -> Message {
+pub async fn send(
+    app: &App,
+    conversation: &Conversation,
+    sender: &User,
+    sent_at: &RequestedAt,
+) -> Message {
     let body = propose();
 
     app.messages()
-        .send(&channel.id, sender, sent_at, &body)
+        .send(&conversation.id, sender, sent_at, &body)
         .await
-        .expect("should succeed if the channel exists")
+        .expect("should succeed if the conversation exists")
 }
 
 pub fn propose() -> Body {
diff --git a/src/test/fixtures/mod.rs b/src/test/fixtures/mod.rs
index 418bdb5..87d3fa1 100644
--- a/src/test/fixtures/mod.rs
+++ b/src/test/fixtures/mod.rs
@@ -3,7 +3,7 @@ use chrono::{TimeDelta, Utc};
 use crate::{app::App, clock::RequestedAt, db};
 
 pub mod boot;
-pub mod channel;
+pub mod conversation;
 pub mod cookie;
 pub mod event;
 pub mod future;