Merge branch 'main' into feature-frontend

1 files changed, 5 insertions, 9 deletions

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(_)))
 }