Merge branch 'dev' into validator-messages

Author: elpiel

sentry/src/access.rs

@@ -260,7 +260,7 @@ mod test {
             uids: None,
             rate_limit: Some(RateLimit {
                 limit_type: "ip".to_string(),
-                time_frame: Duration::from_millis(20_000),
+                time_frame: Duration::from_millis(1),
             }),
         };
         let channel = get_channel(rule);

sentry/src/db/analytics.rs

@@ -83,19 +83,17 @@ pub async fn get_analytics(
     );
 
     // execute query
-    pool.run(move |connection| {
-        async move {
-            match connection.prepare(&sql_query).await {
-                Ok(stmt) => match connection.query(&stmt, &[]).await {
-                    Ok(rows) => {
-                        let analytics: Vec<AnalyticsResponse> =
-                            rows.iter().map(AnalyticsResponse::from).collect();
-                        Ok((analytics, connection))
-                    }
-                    Err(e) => Err((e, connection)),
-                },
+    pool.run(move |connection| async move {
+        match connection.prepare(&sql_query).await {
+            Ok(stmt) => match connection.query(&stmt, &[]).await {
+                Ok(rows) => {
+                    let analytics: Vec<AnalyticsResponse> =
+                        rows.iter().map(AnalyticsResponse::from).collect();
+                    Ok((analytics, connection))
+                }
                 Err(e) => Err((e, connection)),
-            }
+            },
+            Err(e) => Err((e, connection)),
         }
     })
     .await

sentry/src/db/channel.rs

@@ -176,19 +176,17 @@ mod list_channels {
         pool: &DbPool,
         (where_clauses, params): (&'a [String], Vec<&'a (dyn ToSql + Sync)>),
     ) -> Result<u64, RunError<bb8_postgres::tokio_postgres::Error>> {
-        pool.run(move |connection| {
-            async move {
-                let statement = format!(
-                    "SELECT COUNT(id)::varchar FROM channels WHERE {}",
-                    where_clauses.join(" AND ")
-                );
-                match connection.prepare(&statement).await {
-                    Ok(stmt) => match connection.query_one(&stmt, params.as_slice()).await {
-                        Ok(row) => Ok((row.get::<_, TotalCount>(0).0, connection)),
-                        Err(e) => Err((e, connection)),
-                    },
+        pool.run(move |connection| async move {
+            let statement = format!(
+                "SELECT COUNT(id)::varchar FROM channels WHERE {}",
+                where_clauses.join(" AND ")
+            );
+            match connection.prepare(&statement).await {
+                Ok(stmt) => match connection.query_one(&stmt, params.as_slice()).await {
+                    Ok(row) => Ok((row.get::<_, TotalCount>(0).0, connection)),
                     Err(e) => Err((e, connection)),
-                }
+                },
+                Err(e) => Err((e, connection)),
             }
         })
         .await