Use a two-tier hierarchy for events.

This will make it much easier to slot in new event types (login events!).

2 files changed, 7 insertions, 7 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(_))))
 }