Represent channels and messages using a split "History" and "Snapshot" model.

This separates the code that figures out what happened to an entity from the code that represents it to a user, and makes it easier to compute a snapshot at a point in time (for things like bootstrap). It also makes the internal logic a bit easier to follow, since it's easier to tell whether you're working with a point in time or with the whole recorded history.

This hefty.

2 files changed, 10 insertions, 9 deletions

diff --git a/src/channel/routes/test/on_create.rs b/src/channel/routes/test/on_create.rs
index 9988932..5733c9e 100644
--- a/src/channel/routes/test/on_create.rs
+++ b/src/channel/routes/test/on_create.rs
@@ -3,7 +3,7 @@ use futures::stream::StreamExt as _;
 
 use crate::{
     channel::{app, routes},
-    event::types,
+    event,
     test::fixtures::{self, future::Immediately as _},
 };
 
@@ -50,8 +50,8 @@ async fn new_channel() {
         .expect("creation event published");
 
     assert!(matches!(
-        event.data,
-        types::ChannelEventData::Created(event)
+        event.kind,
+        event::Kind::ChannelCreated(event)
             if event.channel == response_channel
     ));
 }
diff --git a/src/channel/routes/test/on_send.rs b/src/channel/routes/test/on_send.rs
index 33ec3b7..1027b29 100644
--- a/src/channel/routes/test/on_send.rs
+++ b/src/channel/routes/test/on_send.rs
@@ -4,7 +4,8 @@ use futures::stream::StreamExt;
 use crate::{
     channel,
     channel::routes,
-    event::{app, types},
+    event,
+    message::app,
     test::fixtures::{self, future::Immediately as _},
 };
 
@@ -54,10 +55,10 @@ async fn messages_in_order() {
     for ((sent_at, message), event) in requests.into_iter().zip(events) {
         assert_eq!(*sent_at, event.instant.at);
         assert!(matches!(
-            event.data,
-            types::ChannelEventData::Message(event_message)
-                if event_message.sender == sender
-                    && event_message.message.body == message
+            event.kind,
+            event::Kind::MessageSent(event)
+                if event.message.sender == sender
+                    && event.message.body == message
         ));
     }
 }
@@ -90,6 +91,6 @@ async fn nonexistent_channel() {
 
     assert!(matches!(
         error,
-        app::EventsError::ChannelNotFound(error_channel) if channel == error_channel
+        app::Error::ChannelNotFound(error_channel) if channel == error_channel
     ));
 }