Merge branch 'main' into wip/path-routing-for-channels

1 files changed, 16 insertions, 16 deletions

diff --git a/src/channel/event.rs b/src/channel/event.rs
index 9c54174..f3dca3e 100644
--- a/src/channel/event.rs
+++ b/src/channel/event.rs
@@ -5,32 +5,30 @@ use crate::{
 };
 
 #[derive(Clone, Debug, Eq, PartialEq, serde::Serialize)]
-pub struct Event {
-    #[serde(flatten)]
-    pub instant: Instant,
-    #[serde(flatten)]
-    pub kind: Kind,
+#[serde(tag = "event", rename_all = "snake_case")]
+pub enum Event {
+    Created(Created),
+    Deleted(Deleted),
 }
 
 impl Sequenced for Event {
     fn instant(&self) -> Instant {
-        self.instant
+        match self {
+            Self::Created(event) => event.instant,
+            Self::Deleted(event) => event.instant,
+        }
     }
 }
 
 #[derive(Clone, Debug, Eq, PartialEq, serde::Serialize)]
-#[serde(tag = "type", rename_all = "snake_case")]
-pub enum Kind {
-    Created(Created),
-    Deleted(Deleted),
-}
-
-#[derive(Clone, Debug, Eq, PartialEq, serde::Serialize)]
 pub struct Created {
+    #[serde(flatten)]
+    pub instant: Instant,
+    #[serde(flatten)]
     pub channel: Channel,
 }
 
-impl From<Created> for Kind {
+impl From<Created> for Event {
     fn from(event: Created) -> Self {
         Self::Created(event)
     }
@@ -38,10 +36,12 @@ impl From<Created> for Kind {
 
 #[derive(Clone, Debug, Eq, PartialEq, serde::Serialize)]
 pub struct Deleted {
-    pub channel: channel::Id,
+    #[serde(flatten)]
+    pub instant: Instant,
+    pub id: channel::Id,
 }
 
-impl From<Deleted> for Kind {
+impl From<Deleted> for Event {
     fn from(event: Deleted) -> Self {
         Self::Deleted(event)
     }