fix: apply proper formatting

Author: samparsky

sentry/src/access.rs

@@ -84,7 +84,7 @@ pub async fn check_access(
         .as_ref()
         .map(|ev_sub| ev_sub.allow.as_slice())
         .unwrap_or_else(|| &default_rules);
-    
+
     // first, find an applicable access rule
     let rules = allow_rules
         .iter()

sentry/src/db.rs

@@ -82,9 +82,7 @@ pub async fn setup_migrations(environment: &str) {
         };
     }
 
-    let mut migrations = vec![
-        make_migration!("20190806011140_initial-tables")
-    ];
+    let mut migrations = vec![make_migration!("20190806011140_initial-tables")];
 
     if environment == "development" {
         // seeds database tables for testing

sentry/src/db/event_aggregate.rs

@@ -1,17 +1,16 @@
 use crate::db::DbPool;
 use bb8::RunError;
 // use bb8_postgres::tokio_postgres::types::{ToSql, FromSql};
+use bb8_postgres::tokio_postgres::binary_copy::BinaryCopyInWriter;
+use bb8_postgres::tokio_postgres::types::Type;
+use bb8_postgres::tokio_postgres::Error;
 use chrono::{DateTime, Utc};
+use futures::pin_mut;
 use postgres_types::{FromSql, ToSql};
 use primitives::sentry::EventAggregate;
 use primitives::BigNum;
 use primitives::{ChannelId, ValidatorId};
 use std::ops::Add;
-use bb8_postgres::tokio_postgres::binary_copy::BinaryCopyInWriter;
-use bb8_postgres::tokio_postgres::types::{Type};
-use futures::{pin_mut};
-use bb8_postgres::tokio_postgres::{Error};
-
 
 pub async fn list_event_aggregates(
     pool: &DbPool,
@@ -25,10 +24,7 @@ pub async fn list_event_aggregates(
     where_clauses.push(format!("channel_id = '{}'", id));
 
     if let Some(from) = from {
-        where_clauses.push(format!(
-            "earner = '{}'",
-            from.to_string()
-        ));
+        where_clauses.push(format!("earner = '{}'", from.to_string()));
         where_clauses.push("event_type = 'IMPRESSION'".to_string());
     } else {
         where_clauses.push("earner is NOT NULL".to_string());
@@ -71,9 +67,8 @@ pub async fn list_event_aggregates(
                                 as data
                             FROM event_aggregates WHERE {} GROUP BY channel_id, event_type, created ORDER BY created DESC LIMIT {}
                         ) SELECT channel_id, created, jsonb_object_agg(event_type , data) as events FROM aggregates GROUP BY channel_id, created
-                    "
-                    , where_clause, limit);
-                
+                    ", where_clause, limit);
+
                 match connection.prepare(&statement).await {
                     Ok(stmt) => {
                         match connection.query(&stmt, params.as_slice()).await {
@@ -101,7 +96,7 @@ struct EventData {
     earner: Option<String>,
     event_count: String,
     event_payout: String,
-    created: DateTime<Utc>
+    created: DateTime<Utc>,
 }
 
 pub async fn insert_event_aggregate(
@@ -132,7 +127,6 @@ pub async fn insert_event_aggregate(
                 // total sum
                 total_event_counts = event_count.add(&total_event_counts);
                 total_event_payouts = total_event_payouts.add(event_payout);
-
             }
 
             data.extend(vec![EventData {
@@ -146,7 +140,6 @@ pub async fn insert_event_aggregate(
         }
     }
 
-
     let result = pool
         .run(move |connection| {
             async move {
@@ -174,10 +167,9 @@ pub async fn insert_event_aggregate(
                         Ok((true, connection))
                     }
                 }
-                
             }
         })
         .await?;
 
     Ok(result)
-}
+}

sentry/src/event_aggregator.rs

@@ -116,7 +116,7 @@ impl EventAggregator {
             println!("storing data in ");
             store(&app.pool, &channel.id, self.aggregate.clone()).await;
         }
-        
+
         println!("finished succesfully");
 
         Ok(())

sentry/src/routes/channel.rs

@@ -123,8 +123,10 @@ pub async fn insert_events<A: Adapter + 'static>(
     let into_body = req.into_body();
     let body = hyper::body::to_bytes(into_body).await?;
     let request_body = serde_json::from_slice::<HashMap<String, Vec<Event>>>(&body)?;
-    let events = request_body.get("events").ok_or_else(|| ResponseError::BadRequest("invalid request".to_string()))?;
-    
+    let events = request_body
+        .get("events")
+        .ok_or_else(|| ResponseError::BadRequest("invalid request".to_string()))?;
+
     println!("working on something");
 
     app.event_aggregator

sentry/src/routes/event_aggregate.rs

@@ -32,11 +32,17 @@ pub async fn list_channel_event_aggregates<A: Adapter>(
     let from = if channel.spec.validators.find(&session.uid).is_some() {
         None
     } else {
-        Some(session.uid.clone())  
+        Some(session.uid.clone())
     };
 
-    let event_aggregates =
-        list_event_aggregates(&app.pool, &channel.id, app.config.events_find_limit, &from, &query.after).await?;
+    let event_aggregates = list_event_aggregates(
+        &app.pool,
+        &channel.id,
+        app.config.events_find_limit,
+        &from,
+        &query.after,
+    )
+    .await?;
 
     let response = EventAggregateResponse {
         channel: channel.clone(),