1 files changed, 18 insertions, 29 deletions

diff --git a/src/events/routes/test.rs b/src/events/routes/test.rs
index 820192d..1cfca4f 100644
--- a/src/events/routes/test.rs
+++ b/src/events/routes/test.rs
@@ -5,7 +5,7 @@ use futures::{
 };
 
 use crate::{
-    events::{routes, types},
+    events::routes,
     test::fixtures::{self, future::Immediately as _},
 };
 
@@ -28,7 +28,7 @@ async fn includes_historical_message() {
 
     // Verify the structure of the response.
 
-    let types::ResumableEvent(_, event) = events
+    let event = events
         .filter(fixtures::filter::messages())
         .next()
         .immediately()
@@ -58,7 +58,7 @@ async fn includes_live_message() {
     let sender = fixtures::login::create(&app).await;
     let message = fixtures::message::send(&app, &sender, &channel, &fixtures::now()).await;
 
-    let types::ResumableEvent(_, event) = events
+    let event = events
         .filter(fixtures::filter::messages())
         .next()
         .immediately()
@@ -108,9 +108,7 @@ async fn includes_multiple_channels() {
         .await;
 
     for message in &messages {
-        assert!(events
-            .iter()
-            .any(|types::ResumableEvent(_, event)| { event == message }));
+        assert!(events.iter().any(|event| { event == message }));
     }
 }
 
@@ -138,12 +136,11 @@ async fn sequential_messages() {
 
     // Verify the structure of the response.
 
-    let mut events =
-        events.filter(|types::ResumableEvent(_, event)| future::ready(messages.contains(event)));
+    let mut events = events.filter(|event| future::ready(messages.contains(event)));
 
     // Verify delivery in order
     for message in &messages {
-        let types::ResumableEvent(_, event) = events
+        let event = events
             .next()
             .immediately()
             .await
@@ -179,7 +176,7 @@ async fn resumes_from() {
             .await
             .expect("subscribe never fails");
 
-        let types::ResumableEvent(last_event_id, event) = events
+        let event = events
             .filter(fixtures::filter::messages())
             .next()
             .immediately()
@@ -188,7 +185,7 @@ async fn resumes_from() {
 
         assert_eq!(initial_message, event);
 
-        last_event_id
+        event.sequence
     };
 
     // Resume after disconnect
@@ -205,9 +202,7 @@ async fn resumes_from() {
         .await;
 
     for message in &later_messages {
-        assert!(events
-            .iter()
-            .any(|types::ResumableEvent(_, event)| event == message));
+        assert!(events.iter().any(|event| event == message));
     }
 }
 
@@ -259,14 +254,12 @@ async fn serial_resume() {
             .await;
 
         for message in &initial_messages {
-            assert!(events
-                .iter()
-                .any(|types::ResumableEvent(_, event)| event == message));
+            assert!(events.iter().any(|event| event == message));
         }
 
-        let types::ResumableEvent(id, _) = events.last().expect("this vec is non-empty");
+        let event = events.last().expect("this vec is non-empty");
 
-        id.to_owned()
+        event.sequence
     };
 
     // Resume after disconnect
@@ -296,14 +289,12 @@ async fn serial_resume() {
             .await;
 
         for message in &resume_messages {
-            assert!(events
-                .iter()
-                .any(|types::ResumableEvent(_, event)| event == message));
+            assert!(events.iter().any(|event| event == message));
         }
 
-        let types::ResumableEvent(id, _) = events.last().expect("this vec is non-empty");
+        let event = events.last().expect("this vec is non-empty");
 
-        id.to_owned()
+        event.sequence
     };
 
     // Resume after disconnect a second time
@@ -335,9 +326,7 @@ async fn serial_resume() {
         // This set of messages, in particular, _should not_ include any prior
         // messages from `initial_messages` or `resume_messages`.
         for message in &final_messages {
-            assert!(events
-                .iter()
-                .any(|types::ResumableEvent(_, event)| event == message));
+            assert!(events.iter().any(|event| event == message));
         }
     };
 }
@@ -375,7 +364,7 @@ async fn terminates_on_token_expiry() {
     ];
 
     assert!(events
-        .filter(|types::ResumableEvent(_, event)| future::ready(messages.contains(event)))
+        .filter(|event| future::ready(messages.contains(event)))
         .next()
         .immediately()
         .await
@@ -417,7 +406,7 @@ async fn terminates_on_logout() {
     ];
 
     assert!(events
-        .filter(|types::ResumableEvent(_, event)| future::ready(messages.contains(event)))
+        .filter(|event| future::ready(messages.contains(event)))
         .next()
         .immediately()
         .await