Fix clippy, fmt & MerkleTree

elpiel · elpiel · commit 116539bc5e1e · 2020-07-10T09:41:48.000+03:00
diff --git a/adapter/src/lib.rs b/adapter/src/lib.rs
@@ -230,12 +230,12 @@ mod test {
             .expect("The timestamp should be able to be converted to u64");
         BigEndian::write_uint(&mut timestamp_buf[26..], n, 6);
 
-        let merkle_tree = MerkleTree::new(&[timestamp_buf]);
+        let merkle_tree = MerkleTree::new(&[timestamp_buf]).expect("Should instantiate");
 
         let channel_id = "061d5e2a67d0a9a10f1c732bca12a676d83f79663a396f7d87b3e30b9b411088";
 
         let state_root = get_signable_state_root(
-            &hex::decode(&channel_id).expect("fialed"),
+            &hex::decode(&channel_id).expect("failed"),
             &merkle_tree.root(),
         )
         .expect("Should get state_root");
diff --git a/primitives/src/merkle_tree.rs b/primitives/src/merkle_tree.rs
@@ -1,9 +1,9 @@
 use merkletree::{hash::Algorithm, merkle, merkle::VecStore, proof::Proof};
+use std::fmt;
 use std::hash::Hasher;
 use std::iter::FromIterator;
-use tiny_keccak::Keccak;
 use thiserror::Error;
-use std::fmt;
+use tiny_keccak::Keccak;
 
 #[derive(Clone)]
 struct KeccakAlgorithm(Keccak);
diff --git a/sentry/src/db.rs b/sentry/src/db.rs
@@ -46,7 +46,7 @@ pub async fn postgres_connection() -> Result<DbPool, bb8_postgres::tokio_postgre
         .user(POSTGRES_USER.as_str())
         .password(POSTGRES_PASSWORD.as_str())
         .host(POSTGRES_HOST.as_str())
-        .port(POSTGRES_PORT.clone());
+        .port(*POSTGRES_PORT);
     if let Some(db) = POSTGRES_DB.clone() {
         config.dbname(&db);
     }
@@ -62,7 +62,7 @@ pub async fn setup_migrations(environment: &str) {
         .database_user(POSTGRES_USER.as_str())
         .database_password(POSTGRES_PASSWORD.as_str())
         .database_host(POSTGRES_HOST.as_str())
-        .database_port(POSTGRES_PORT.clone())
+        .database_port(*POSTGRES_PORT)
         .database_name(&POSTGRES_DB.as_ref().unwrap_or(&POSTGRES_USER))
         .build()
         .expect("Should build migration settings");
diff --git a/sentry/src/event_aggregator.rs b/sentry/src/event_aggregator.rs
@@ -58,7 +58,7 @@ async fn store(db: &DbPool, channel_id: &ChannelId, logger: &Logger, recorder: R
                 aggregate: new_aggr(&channel_id),
             };
             channel_recorder.insert(channel_id.to_owned(), record);
-        };
+        }
     }
 }
 
diff --git a/sentry/src/event_reducer.rs b/sentry/src/event_reducer.rs
@@ -2,8 +2,6 @@ use crate::analytics_recorder::get_payout;
 use primitives::sentry::{AggregateEvents, Event, EventAggregate};
 use primitives::{BigNum, Channel, ValidatorId};
 
-// @TODO: Remove attribute once we use this function!
-#[allow(dead_code)]
 pub(crate) fn reduce(channel: &Channel, initial_aggr: &mut EventAggregate, ev: &Event) {
     match ev {
         Event::Impression { publisher, .. } => {
diff --git a/sentry/src/middleware/auth.rs b/sentry/src/middleware/auth.rs
@@ -77,7 +77,7 @@ fn get_request_ip(req: &Request<Body>) -> Option<String> {
         .get("true-client-ip")
         .or_else(|| req.headers().get("x-forwarded-for"))
         .and_then(|hv| hv.to_str().map(ToString::to_string).ok())
-        .map(|token| token.split(',').nth(0).map(ToString::to_string))
+        .map(|token| token.split(',').next().map(ToString::to_string))
         .flatten()
 }
 

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ async fn store(db: &DbPool, channel_id: &ChannelId, logger: &Logger, recorder: R`
`58`	`58`	`aggregate: new_aggr(&channel_id),`
`59`	`59`	`};`
`60`	`60`	`channel_recorder.insert(channel_id.to_owned(), record);`
`61`		`- };`
	`61`	`+ }`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ fn get_request_ip(req: &Request<Body>) -> Option<String> {`
`77`	`77`	`.get("true-client-ip")`
`78`	`78`	`.or_else(\|\| req.headers().get("x-forwarded-for"))`
`79`	`79`	`.and_then(\|hv\| hv.to_str().map(ToString::to_string).ok())`
`80`		`- .map(\|token\| token.split(',').nth(0).map(ToString::to_string))`
	`80`	`+ .map(\|token\| token.split(',').next().map(ToString::to_string))`
`81`	`81`	`.flatten()`
`82`	`82`	`}`
`83`	`83`