4 files changed, 17 insertions, 13 deletions
diff --git a/src/events/app/events.rs b/src/events/app/events.rs
index a8814c9..8b76994 100644
--- a/src/events/app/events.rs
+++ b/src/events/app/events.rs
@@ -9,7 +9,10 @@ use sqlx::sqlite::SqlitePool;
 use super::Broadcaster;
 use crate::{
     clock::DateTime,
-    events::repo::broadcast::{self, Provider as _},
+    events::{
+        app::EventsError,
+        repo::broadcast::{self, Provider as _},
+    },
     repo::{
         channel::{self, Provider as _},
         error::NotFound as _,
@@ -33,7 +36,7 @@ impl<'a> Events<'a> {
         channel: &channel::Id,
         body: &str,
         sent_at: &DateTime,
-    ) -> Result<broadcast::Message, EventsError> {
+    ) -> Result<broadcast::Message, Error> {
         let mut tx = self.db.begin().await?;
         let channel = tx
             .channels()
@@ -55,7 +58,7 @@ impl<'a> Events<'a> {
         channel: &channel::Id,
         subscribed_at: &DateTime,
         resume_at: Option<broadcast::Sequence>,
-    ) -> Result<impl Stream<Item = broadcast::Message> + std::fmt::Debug, EventsError> {
+    ) -> Result<impl Stream<Item = broadcast::Message> + std::fmt::Debug, Error> {
         // Somewhat arbitrarily, expire after 90 days.
         let expire_at = subscribed_at.to_owned() - TimeDelta::days(90);
 
@@ -130,7 +133,7 @@ impl<'a> Events<'a> {
 }
 
 #[derive(Debug, thiserror::Error)]
-pub enum EventsError {
+pub enum Error {
     #[error("channel {0} not found")]
     ChannelNotFound(channel::Id),
     #[error(transparent)]
diff --git a/src/events/app/mod.rs b/src/events/app/mod.rs
index 03a7da2..f364e00 100644
--- a/src/events/app/mod.rs
+++ b/src/events/app/mod.rs
@@ -2,4 +2,4 @@ mod broadcaster;
 mod events;
 
 pub use self::broadcaster::Broadcaster;
-pub use self::events::{Events, EventsError};
+pub use self::events::{Error as EventsError, Events};
diff --git a/src/events/routes.rs b/src/events/routes.rs
index 5181370..d901f9b 100644
--- a/src/events/routes.rs
+++ b/src/events/routes.rs
@@ -20,7 +20,7 @@ use super::{extract::LastEventId, repo::broadcast};
 use crate::{
     app::App,
     clock::RequestedAt,
-    error::InternalError,
+    error::Internal,
     events::app::EventsError,
     repo::{channel, login::Login},
 };
@@ -121,7 +121,7 @@ impl IntoResponse for ErrorResponse {
             not_found @ EventsError::ChannelNotFound(_) => {
                 (StatusCode::NOT_FOUND, not_found.to_string()).into_response()
             }
-            other => InternalError::from(other).into_response(),
+            other => Internal::from(other).into_response(),
         }
     }
 }
diff --git a/src/events/routes/test.rs b/src/events/routes/test.rs
index d3f3fd6..a3f5519 100644
--- a/src/events/routes/test.rs
+++ b/src/events/routes/test.rs
@@ -111,18 +111,19 @@ async fn excludes_other_channels() {
     // Set up the environment
 
     let app = fixtures::scratch_app().await;
-    let subscribed = fixtures::channel::create(&app).await;
-    let unsubscribed = fixtures::channel::create(&app).await;
+    let subscribed_channel = fixtures::channel::create(&app).await;
+    let unsubscribed_channel = fixtures::channel::create(&app).await;
     let sender = fixtures::login::create(&app).await;
-    let message = fixtures::message::send(&app, &sender, &subscribed, &fixtures::now()).await;
-    fixtures::message::send(&app, &sender, &unsubscribed, &fixtures::now()).await;
+    let message =
+        fixtures::message::send(&app, &sender, &subscribed_channel, &fixtures::now()).await;
+    fixtures::message::send(&app, &sender, &unsubscribed_channel, &fixtures::now()).await;
 
     // Call the endpoint
 
     let subscriber = fixtures::login::create(&app).await;
     let subscribed_at = fixtures::now();
     let query = routes::EventsQuery {
-        channels: [subscribed.id.clone()].into(),
+        channels: [subscribed_channel.id.clone()].into(),
     };
     let routes::Events(mut events) =
         routes::events(State(app), subscribed_at, subscriber, None, Query(query))
@@ -137,7 +138,7 @@ async fn excludes_other_channels() {
         .await
         .expect("delivered at least one message");
 
-    assert_eq!(subscribed.id, event.channel);
+    assert_eq!(subscribed_channel.id, event.channel);
     assert_eq!(message, event.message);
 }