fmt + clippy

Author: simzzz

sentry/src/db/accounting.rs

@@ -185,15 +185,14 @@ pub async fn spend_amount(
 
 #[cfg(test)]
 mod test {
-    use primitives::{test_util::{
-        ADVERTISER, ADVERTISER_2, CREATOR, DUMMY_CAMPAIGN, PUBLISHER, PUBLISHER_2,
-    }, config::GANACHE_CONFIG};
-
-    use crate::{
-        db::{
-            insert_channel,
-            tests_postgres::{setup_test_migrations, DATABASE_POOL},
-        },
+    use primitives::{
+        config::GANACHE_CONFIG,
+        test_util::{ADVERTISER, ADVERTISER_2, CREATOR, DUMMY_CAMPAIGN, PUBLISHER, PUBLISHER_2},
+    };
+
+    use crate::db::{
+        insert_channel,
+        tests_postgres::{setup_test_migrations, DATABASE_POOL},
     };
 
     use super::*;

sentry/src/db/campaign.rs

@@ -571,11 +571,9 @@ mod campaign_remaining {
 
 #[cfg(test)]
 mod test {
-    use crate::{
-        db::{
-            insert_channel,
-            tests_postgres::{setup_test_migrations, DATABASE_POOL},
-        },
+    use crate::db::{
+        insert_channel,
+        tests_postgres::{setup_test_migrations, DATABASE_POOL},
     };
     use chrono::TimeZone;
     use primitives::{

sentry/src/db/channel.rs

@@ -64,11 +64,8 @@ pub async fn insert_channel(
 
 mod list_channels {
     use primitives::{
-        sentry::{
-            channel_list::ChannelListResponse,
-            Pagination,
-        },
-        Channel, ChainId, ValidatorId,
+        sentry::{channel_list::ChannelListResponse, Pagination},
+        ChainId, Channel, ValidatorId,
     };
 
     use crate::db::{DbPool, PoolError, TotalCount};
@@ -88,7 +85,7 @@ mod list_channels {
         if !chains.is_empty() {
             where_clauses.push(format!(
                 "chain_id IN ({})",
-            chains
+                chains
                     .iter()
                     .map(|id| id.to_u32().to_string())
                     .collect::<Vec<String>>()
@@ -193,13 +190,11 @@ mod list_channels {
 
 #[cfg(test)]
 mod test {
-    use primitives::{test_util::DUMMY_CAMPAIGN, config::GANACHE_CONFIG};
+    use primitives::{config::GANACHE_CONFIG, test_util::DUMMY_CAMPAIGN};
 
-    use crate::{
-        db::{
-            insert_channel,
-            tests_postgres::{setup_test_migrations, DATABASE_POOL},
-        },
+    use crate::db::{
+        insert_channel,
+        tests_postgres::{setup_test_migrations, DATABASE_POOL},
     };
 
     use super::list_channels::list_channels;
@@ -231,9 +226,15 @@ mod test {
             only_select
         };
 
-        let response = list_channels(&database.pool, 0, 10, None, &[channel_context.chain.chain_id])
-            .await
-            .expect("Should list Channels");
+        let response = list_channels(
+            &database.pool,
+            0,
+            10,
+            None,
+            &[channel_context.chain.chain_id],
+        )
+        .await
+        .expect("Should list Channels");
 
         assert_eq!(1, response.channels.len());
         assert_eq!(DUMMY_CAMPAIGN.channel, actual_channel);

sentry/src/db/spendable.rs

@@ -117,18 +117,16 @@ mod test {
     use std::collections::HashMap;
 
     use primitives::{
-        spender::Spendable,
         config::GANACHE_CONFIG,
+        spender::Spendable,
         test_util::DUMMY_CAMPAIGN,
         test_util::{ADVERTISER, CREATOR, FOLLOWER, GUARDIAN, GUARDIAN_2, PUBLISHER},
         Deposit, UnifiedNum,
     };
 
-    use crate::{
-        db::{
-            insert_channel,
-            tests_postgres::{setup_test_migrations, DATABASE_POOL},
-        }
+    use crate::db::{
+        insert_channel,
+        tests_postgres::{setup_test_migrations, DATABASE_POOL},
     };
     use tokio::time::{sleep, Duration};
 

sentry/src/routes/channel.rs

@@ -31,7 +31,6 @@ use primitives::{
 use slog::{error, Logger};
 use std::{collections::HashMap, str::FromStr};
 
-
 /// `GET /v5/channel/list` request
 ///
 /// Query: [`ChannelListQuery`]
@@ -47,8 +46,14 @@ pub async fn channel_list<C: Locked + 'static>(
         .checked_mul(app.config.channels_find_limit.into())
         .ok_or_else(|| ResponseError::BadRequest("Page and/or limit is too large".into()))?;
 
-    let list_response =
-        list_channels(&app.pool, skip, app.config.channels_find_limit, query.validator, &query.chains).await?;
+    let list_response = list_channels(
+        &app.pool,
+        skip,
+        app.config.channels_find_limit,
+        query.validator,
+        &query.chains,
+    )
+    .await?;
 
     Ok(success_response(serde_json::to_string(&list_response)?))
 }
@@ -702,7 +707,7 @@ mod test {
             ADVERTISER, CREATOR, DUMMY_CAMPAIGN, FOLLOWER, GUARDIAN, IDS, LEADER, LEADER_2,
             PUBLISHER, PUBLISHER_2,
         },
-        BigNum, Deposit, UnifiedMap, ValidatorId, ChainId
+        BigNum, ChainId, Deposit, UnifiedMap, ValidatorId,
     };
 
     #[tokio::test]
@@ -1245,7 +1250,7 @@ mod test {
                 "Response returns the correct channel"
             );
         }
-}
+    }
 
     #[tokio::test]
     async fn payouts_for_earners_test() {