Merge branch 'main' into wip/mobile

1 files changed, 8 insertions, 4 deletions

diff --git a/src/channel/history.rs b/src/channel/history.rs
index 4b9fcc7..ef2120d 100644
--- a/src/channel/history.rs
+++ b/src/channel/history.rs
@@ -1,8 +1,10 @@
+use itertools::Itertools as _;
+
 use super::{
     event::{Created, Deleted, Event},
     Channel, Id,
 };
-use crate::event::{Instant, ResumePoint, Sequence};
+use crate::event::{Instant, Sequence};
 
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct History {
@@ -26,9 +28,9 @@ impl History {
         self.channel.clone()
     }
 
-    pub fn as_of(&self, resume_point: impl Into<ResumePoint>) -> Option<Channel> {
+    pub fn as_of(&self, resume_point: Sequence) -> Option<Channel> {
         self.events()
-            .filter(Sequence::up_to(resume_point.into()))
+            .filter(Sequence::up_to(resume_point))
             .collect()
     }
 
@@ -41,7 +43,9 @@ impl History {
 // Event factories
 impl History {
     pub fn events(&self) -> impl Iterator<Item = Event> {
-        [self.created()].into_iter().chain(self.deleted())
+        [self.created()]
+            .into_iter()
+            .merge_by(self.deleted(), Sequence::merge)
     }
 
     fn created(&self) -> Event {