Organizational pass on endpoints and routes.

1 files changed, 15 insertions, 14 deletions

diff --git a/src/event/routes/test.rs b/src/event/routes/test.rs
index 209a016..249f5c2 100644
--- a/src/event/routes/test.rs
+++ b/src/event/routes/test.rs
@@ -5,8 +5,9 @@ use futures::{
     stream::{self, StreamExt as _},
 };
 
+use super::get;
 use crate::{
-    event::{routes, Sequenced as _},
+    event::Sequenced as _,
     test::fixtures::{self, future::Immediately as _},
 };
 
@@ -23,7 +24,7 @@ async fn includes_historical_message() {
 
     let subscriber_creds = fixtures::login::create_with_password(&app, &fixtures::now()).await;
     let subscriber = fixtures::identity::identity(&app, &subscriber_creds, &fixtures::now()).await;
-    let routes::Events(events) = routes::events(State(app), subscriber, None, Query::default())
+    let get::Response(events) = get::handler(State(app), subscriber, None, Query::default())
         .await
         .expect("subscribe never fails");
 
@@ -50,8 +51,8 @@ async fn includes_live_message() {
 
     let subscriber_creds = fixtures::login::create_with_password(&app, &fixtures::now()).await;
     let subscriber = fixtures::identity::identity(&app, &subscriber_creds, &fixtures::now()).await;
-    let routes::Events(events) =
-        routes::events(State(app.clone()), subscriber, None, Query::default())
+    let get::Response(events) =
+        get::handler(State(app.clone()), subscriber, None, Query::default())
             .await
             .expect("subscribe never fails");
 
@@ -96,7 +97,7 @@ async fn includes_multiple_channels() {
 
     let subscriber_creds = fixtures::login::create_with_password(&app, &fixtures::now()).await;
     let subscriber = fixtures::identity::identity(&app, &subscriber_creds, &fixtures::now()).await;
-    let routes::Events(events) = routes::events(State(app), subscriber, None, Query::default())
+    let get::Response(events) = get::handler(State(app), subscriber, None, Query::default())
         .await
         .expect("subscribe never fails");
 
@@ -134,7 +135,7 @@ async fn sequential_messages() {
 
     let subscriber_creds = fixtures::login::create_with_password(&app, &fixtures::now()).await;
     let subscriber = fixtures::identity::identity(&app, &subscriber_creds, &fixtures::now()).await;
-    let routes::Events(events) = routes::events(State(app), subscriber, None, Query::default())
+    let get::Response(events) = get::handler(State(app), subscriber, None, Query::default())
         .await
         .expect("subscribe never fails");
 
@@ -182,7 +183,7 @@ async fn resumes_from() {
 
     let resume_at = {
         // First subscription
-        let routes::Events(events) = routes::events(
+        let get::Response(events) = get::handler(
             State(app.clone()),
             subscriber.clone(),
             None,
@@ -204,7 +205,7 @@ async fn resumes_from() {
     };
 
     // Resume after disconnect
-    let routes::Events(resumed) = routes::events(
+    let get::Response(resumed) = get::handler(
         State(app),
         subscriber,
         Some(resume_at.into()),
@@ -264,7 +265,7 @@ async fn serial_resume() {
         ];
 
         // First subscription
-        let routes::Events(events) = routes::events(
+        let get::Response(events) = get::handler(
             State(app.clone()),
             subscriber.clone(),
             None,
@@ -302,7 +303,7 @@ async fn serial_resume() {
         ];
 
         // Second subscription
-        let routes::Events(events) = routes::events(
+        let get::Response(events) = get::handler(
             State(app.clone()),
             subscriber.clone(),
             Some(resume_at.into()),
@@ -340,7 +341,7 @@ async fn serial_resume() {
         ];
 
         // Third subscription
-        let routes::Events(events) = routes::events(
+        let get::Response(events) = get::handler(
             State(app.clone()),
             subscriber.clone(),
             Some(resume_at.into()),
@@ -380,8 +381,8 @@ async fn terminates_on_token_expiry() {
     let subscriber =
         fixtures::identity::identity(&app, &subscriber_creds, &fixtures::ancient()).await;
 
-    let routes::Events(events) =
-        routes::events(State(app.clone()), subscriber, None, Query::default())
+    let get::Response(events) =
+        get::handler(State(app.clone()), subscriber, None, Query::default())
             .await
             .expect("subscribe never fails");
 
@@ -427,7 +428,7 @@ async fn terminates_on_logout() {
     let subscriber =
         fixtures::identity::from_token(&app, &subscriber_token, &fixtures::now()).await;
 
-    let routes::Events(events) = routes::events(
+    let get::Response(events) = get::handler(
         State(app.clone()),
         subscriber.clone(),
         None,