Track event sequences globally, not per channel.

Per-channel event sequences were a cute idea, but it made reasoning about event resumption much, much harder (case in point: recovering the order of events in a partially-ordered collection is quadratic, since it's basically graph sort). The minor overhead of a global sequence number is likely tolerable, and this simplifies both the API and the internals.

1 files changed, 4 insertions, 8 deletions

diff --git a/src/test/fixtures/filter.rs b/src/test/fixtures/filter.rs
index fbebced..c31fa58 100644
--- a/src/test/fixtures/filter.rs
+++ b/src/test/fixtures/filter.rs
@@ -2,14 +2,10 @@ use futures::future;
 
 use crate::events::types;
 
-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(&types::ChannelEvent) -> future::Ready<bool> {
+    |event| future::ready(matches!(event.data, types::ChannelEventData::Message(_)))
 }
 
-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(&types::ChannelEvent) -> future::Ready<bool> {
+    |event| future::ready(matches!(event.data, types::ChannelEventData::Created(_)))
 }