primitives - sentry - rename ChannelAllResponse to ChannelListResponse and use it in the response

Author: elpiel

primitives/src/sentry.rs

@@ -75,9 +75,9 @@ pub struct AggregateEvents {
     pub event_payouts: HashMap<String, BigNum>,
 }
 
-#[derive(Deserialize, Debug)]
+#[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ChannelAllResponse {
+pub struct ChannelListResponse {
     pub channels: Vec<Channel>,
     pub total_pages: u64,
 }

sentry/src/routes/channel.rs

@@ -1,6 +1,5 @@
 use self::channel_list::ChannelListQuery;
 use crate::db::{get_channel_by_id, insert_channel, list_channels};
-use crate::routes::channel::channel_list::ChannelListResponse;
 use crate::success_response;
 use crate::Application;
 use crate::ResponseError;
@@ -9,7 +8,7 @@ use futures::TryStreamExt;
 use hex::FromHex;
 use hyper::{Body, Request, Response};
 use primitives::adapter::Adapter;
-use primitives::sentry::SuccessResponse;
+use primitives::sentry::{ChannelListResponse, SuccessResponse};
 use primitives::{Channel, ChannelId};
 use slog::error;
 
@@ -119,15 +118,8 @@ pub async fn last_approved<A: Adapter>(
 mod channel_list {
     use chrono::serde::ts_seconds::deserialize as ts_seconds;
     use chrono::{DateTime, Utc};
-    use primitives::{Channel, ValidatorId};
-    use serde::{Deserialize, Serialize};
-
-    #[derive(Debug, Serialize)]
-    #[serde(rename_all = "camelCase")]
-    pub(super) struct ChannelListResponse {
-        pub channels: Vec<Channel>,
-        pub total_pages: u64,
-    }
+    use primitives::ValidatorId;
+    use serde::Deserialize;
 
     #[derive(Debug, Deserialize)]
     pub(super) struct ChannelListQuery {

validator_worker/src/sentry_interface.rs

@@ -6,7 +6,7 @@ use futures_legacy::Future as LegacyFuture;
 use primitives::adapter::Adapter;
 use primitives::channel::SpecValidator;
 use primitives::sentry::{
-    ChannelAllResponse, EventAggregateResponse, LastApprovedResponse, SuccessResponse,
+    ChannelListResponse, EventAggregateResponse, LastApprovedResponse, SuccessResponse,
     ValidatorMessageResponse,
 };
 use primitives::validator::MessageTypes;
@@ -230,7 +230,7 @@ pub async fn all_channels(
     if first_page.total_pages < 2 {
         Ok(first_page.channels)
     } else {
-        let mut all: Vec<ChannelAllResponse> = try_join_all(
+        let mut all: Vec<ChannelListResponse> = try_join_all(
             (1..first_page.total_pages).map(|i| fetch_page(url.clone(), i, whoami.clone())),
         )
         .await?;
@@ -248,7 +248,7 @@ async fn fetch_page(
     sentry_url: String,
     page: u64,
     validator: String,
-) -> Result<ChannelAllResponse, reqwest::Error> {
+) -> Result<ChannelListResponse, reqwest::Error> {
     let client = Client::new();
 
     let mut query = vec![format!("page={}", page)];
@@ -257,7 +257,7 @@ async fn fetch_page(
     let future = client
         .get(format!("{}/channel/list?{}", sentry_url, query.join("&")).as_str())
         .send()
-        .and_then(|mut res: Response| res.json::<ChannelAllResponse>());
+        .and_then(|mut res: Response| res.json::<ChannelListResponse>());
 
     future.compat().await
 }