5 files changed, 81 insertions, 65 deletions

diff --git a/src/test/fixtures/channel.rs b/src/test/fixtures/channel.rs
index 1fd8d23..0c6480b 100644
--- a/src/test/fixtures/channel.rs
+++ b/src/test/fixtures/channel.rs
@@ -1,5 +1,3 @@
-use std::future;
-
 use faker_rand::{
     en_us::{addresses::CityName, names::FullName},
     faker_impl_from_templates,
@@ -10,7 +8,6 @@ use crate::{
     app::App,
     channel::{self, Channel},
     clock::RequestedAt,
-    event::Event,
     name::Name,
 };
 
@@ -31,27 +28,6 @@ faker_impl_from_templates! {
     NameTemplate; "{} {}", CityName, FullName;
 }
 
-pub fn events(event: Event) -> future::Ready<Option<channel::Event>> {
-    future::ready(match event {
-        Event::Channel(channel) => Some(channel),
-        _ => None,
-    })
-}
-
-pub fn created(event: channel::Event) -> future::Ready<Option<channel::event::Created>> {
-    future::ready(match event {
-        channel::Event::Created(event) => Some(event),
-        channel::Event::Deleted(_) => None,
-    })
-}
-
-pub fn deleted(event: channel::Event) -> future::Ready<Option<channel::event::Deleted>> {
-    future::ready(match event {
-        channel::Event::Deleted(event) => Some(event),
-        channel::Event::Created(_) => None,
-    })
-}
-
 pub fn fictitious() -> channel::Id {
     channel::Id::generate()
 }
diff --git a/src/test/fixtures/event.rs b/src/test/fixtures/event.rs
new file mode 100644
index 0000000..de02d4d
--- /dev/null
+++ b/src/test/fixtures/event.rs
@@ -0,0 +1,79 @@
+use std::future::{self, Ready};
+
+use crate::event::Event;
+
+pub fn channel(event: Event) -> Ready<Option<channel::Event>> {
+    future::ready(match event {
+        Event::Channel(channel) => Some(channel),
+        _ => None,
+    })
+}
+
+pub fn message(event: Event) -> Ready<Option<message::Event>> {
+    future::ready(match event {
+        Event::Message(event) => Some(event),
+        _ => None,
+    })
+}
+
+pub fn login(event: Event) -> Ready<Option<login::Event>> {
+    future::ready(match event {
+        Event::Login(event) => Some(event),
+        _ => None,
+    })
+}
+
+pub mod channel {
+    use std::future::{self, Ready};
+
+    use crate::channel::event;
+    pub use crate::channel::Event;
+
+    pub fn created(event: Event) -> Ready<Option<event::Created>> {
+        future::ready(match event {
+            Event::Created(event) => Some(event),
+            Event::Deleted(_) => None,
+        })
+    }
+
+    pub fn deleted(event: Event) -> Ready<Option<event::Deleted>> {
+        future::ready(match event {
+            Event::Deleted(event) => Some(event),
+            Event::Created(_) => None,
+        })
+    }
+}
+
+pub mod message {
+    use std::future::{self, Ready};
+
+    use crate::message::event;
+    pub use crate::message::Event;
+
+    pub fn sent(event: Event) -> Ready<Option<event::Sent>> {
+        future::ready(match event {
+            Event::Sent(event) => Some(event),
+            Event::Deleted(_) => None,
+        })
+    }
+
+    pub fn deleted(event: Event) -> future::Ready<Option<event::Deleted>> {
+        future::ready(match event {
+            Event::Deleted(event) => Some(event),
+            Event::Sent(_) => None,
+        })
+    }
+}
+
+pub mod login {
+    use std::future::{self, Ready};
+
+    use crate::login::event;
+    pub use crate::login::Event;
+
+    pub fn created(event: Event) -> Ready<Option<event::Created>> {
+        future::ready(match event {
+            Event::Created(event) => Some(event),
+        })
+    }
+}
diff --git a/src/test/fixtures/login.rs b/src/test/fixtures/login.rs
index cbcbdd4..e308289 100644
--- a/src/test/fixtures/login.rs
+++ b/src/test/fixtures/login.rs
@@ -1,12 +1,9 @@
-use std::future::{self, Ready};
-
 use faker_rand::en_us::internet;
 use uuid::Uuid;
 
 use crate::{
     app::App,
     clock::RequestedAt,
-    event::Event,
     login::{self, Login, Password},
     name::Name,
 };
@@ -48,16 +45,3 @@ fn propose_name() -> Name {
 pub fn propose_password() -> Password {
     Uuid::new_v4().to_string().into()
 }
-
-pub fn events(event: Event) -> Ready<Option<login::Event>> {
-    future::ready(match event {
-        Event::Login(event) => Some(event),
-        _ => None,
-    })
-}
-
-pub fn created(event: login::Event) -> Ready<Option<login::event::Created>> {
-    future::ready(match event {
-        login::Event::Created(event) => Some(event),
-    })
-}
diff --git a/src/test/fixtures/message.rs b/src/test/fixtures/message.rs
index 8cb50c1..d3b4719 100644
--- a/src/test/fixtures/message.rs
+++ b/src/test/fixtures/message.rs
@@ -1,14 +1,11 @@
-use std::future;
-
 use faker_rand::lorem::Paragraphs;
 
 use crate::{
     app::App,
     channel::Channel,
     clock::RequestedAt,
-    event::Event,
     login::Login,
-    message::{self, event, Body, Message},
+    message::{self, Body, Message},
 };
 
 pub async fn send(app: &App, channel: &Channel, sender: &Login, sent_at: &RequestedAt) -> Message {
@@ -24,27 +21,6 @@ pub fn propose() -> Body {
     rand::random::<Paragraphs>().to_string().into()
 }
 
-pub fn events(event: Event) -> future::Ready<Option<message::Event>> {
-    future::ready(match event {
-        Event::Message(event) => Some(event),
-        _ => None,
-    })
-}
-
-pub fn sent(event: message::Event) -> future::Ready<Option<event::Sent>> {
-    future::ready(match event {
-        message::Event::Sent(event) => Some(event),
-        message::Event::Deleted(_) => None,
-    })
-}
-
-pub fn deleted(event: message::Event) -> future::Ready<Option<event::Deleted>> {
-    future::ready(match event {
-        message::Event::Deleted(event) => Some(event),
-        message::Event::Sent(_) => None,
-    })
-}
-
 pub fn fictitious() -> message::Id {
     message::Id::generate()
 }
diff --git a/src/test/fixtures/mod.rs b/src/test/fixtures/mod.rs
index cf30e02..2b7b6af 100644
--- a/src/test/fixtures/mod.rs
+++ b/src/test/fixtures/mod.rs
@@ -4,6 +4,7 @@ use crate::{app::App, clock::RequestedAt, db};
 
 pub mod channel;
 pub mod cookie;
+pub mod event;
 pub mod future;
 pub mod identity;
 pub mod invite;