Fix clippy warnings for aggregator & client

Author: Alenar

mithril-network/mithril-aggregator/Makefile

@@ -18,8 +18,8 @@ test:
 	${CARGO} test
 
 check:
-	${CARGO} check --all-targets
-	${CARGO} clippy --all-targets
+	${CARGO} check --all-features
+	${CARGO} clippy --all-features
 
 help:
 	@${CARGO} run -- -h

mithril-network/mithril-aggregator/src/apispec.rs

@@ -91,7 +91,7 @@ impl<'a> APISpec<'a> {
                         None => Err("empty body expected".to_string()),
                     }
                 } else {
-                    match &serde_json::from_slice(&body) {
+                    match &serde_json::from_slice(body) {
                         Ok(value) => self.validate_conformity(value, response_schema),
                         Err(_) => Err("non empty body expected".to_string()),
                     }

mithril-network/mithril-aggregator/src/entities.rs

@@ -121,6 +121,7 @@ pub struct Certificate {
 
 impl Certificate {
     /// Certificate factory
+    #[allow(clippy::too_many_arguments)]
     pub fn new(
         hash: String,
         previous_hash: String,

mithril-network/mithril-aggregator/src/lib.rs

@@ -1,7 +1,4 @@
 pub mod apispec;
-mod dependency;
 pub mod entities;
 pub mod fake_data;
-pub mod http_server;
-mod snapshot_store;
 pub mod snapshotter;

mithril-network/mithril-aggregator/src/main.rs

@@ -9,7 +9,7 @@ mod snapshot_store;
 mod snapshotter;
 
 use clap::Parser;
-use config;
+
 use log::debug;
 use std::env;
 use std::sync::Arc;
@@ -61,7 +61,7 @@ async fn main() {
         .init();
 
     // Load config
-    let run_mode = env::var("RUN_MODE").unwrap_or_else(|_| args.run_mode.into());
+    let run_mode = env::var("RUN_MODE").unwrap_or(args.run_mode);
     debug!("Run Mode: {}", run_mode);
     let config: Config = config::Config::builder()
         .add_source(config::File::with_name(&format!("./config/{}.json", run_mode)).required(false))
@@ -84,10 +84,8 @@ async fn main() {
 
     // Start snapshot uploader
     let handle = tokio::spawn(async move {
-        let snapshotter = Snapshotter::new(
-            args.snapshot_interval.clone() * 1000,
-            args.db_directory.clone(),
-        );
+        let snapshotter =
+            Snapshotter::new(args.snapshot_interval * 1000, args.db_directory.clone());
         snapshotter.run().await
     });
 

mithril-network/mithril-aggregator/src/snapshotter.rs

@@ -6,10 +6,10 @@ use cloud_storage::object_access_control::NewObjectAccessControl;
 use cloud_storage::Client;
 use flate2::write::GzEncoder;
 use flate2::Compression;
-use hex;
+
 use log::error;
 use log::info;
-use serde_json;
+
 use sha2::{Digest, Sha256};
 use std::env;
 use std::ffi::OsStr;
@@ -37,10 +37,11 @@ pub struct Snapshotter {
 #[derive(Debug)]
 struct SnapshotError {
     /// Detailed error
+    #[allow(dead_code)] // Indirectly used in Snapshotter::run when logging the error
     reason: String,
 }
 
-impl std::convert::From<io::Error> for SnapshotError {
+impl From<io::Error> for SnapshotError {
     fn from(err: io::Error) -> Self {
         SnapshotError {
             reason: err.to_string(),
@@ -114,11 +115,7 @@ impl Snapshotter {
         let tar_gz = match File::create(&path) {
             Err(e) => {
                 return Err(SnapshotError {
-                    reason: format!(
-                        "cannot create archive {}: {}",
-                        &path.to_str().unwrap(),
-                        e.to_string()
-                    ),
+                    reason: format!("cannot create archive {}: {}", &path.to_str().unwrap(), e),
                 })
             }
             Ok(f) => f,
@@ -222,15 +219,11 @@ impl Progress {
 
 impl std::fmt::Display for Progress {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> Result<(), std::fmt::Error> {
-        write!(
-            f,
-            "{}",
-            format!("{}/{} ({}%)", self.index, self.total, self.percent())
-        )
+        write!(f, "{}/{} ({}%)", self.index, self.total, self.percent())
     }
 }
 
-fn compute_hash(entries: &Vec<&DirEntry>) -> [u8; 32] {
+fn compute_hash(entries: &[&DirEntry]) -> [u8; 32] {
     let mut hasher = Sha256::new();
     let mut progress = Progress {
         index: 0,
@@ -277,9 +270,9 @@ mod tests {
             total: 7000,
         };
 
-        assert_eq!(false, progress.report(1));
-        assert_eq!(false, progress.report(4));
-        assert_eq!(true, progress.report(350));
-        assert_eq!(false, progress.report(351));
+        assert!(!progress.report(1));
+        assert!(!progress.report(4));
+        assert!(progress.report(350));
+        assert!(!progress.report(351));
     }
 }

mithril-network/mithril-client/Makefile

@@ -23,8 +23,8 @@ test:
 	${CARGO} test
 
 check:
-	${CARGO} check
-	${CARGO} clippy
+	${CARGO} check --all-features
+	${CARGO} clippy --all-features
 
 clean:
 	${CARGO} clean
@@ -33,4 +33,4 @@ help:
 	@${CARGO} run -- -h
 
 doc:
-	${CARGO} doc --no-deps --open
+	${CARGO} doc --no-deps --open

mithril-network/mithril-client/src/client.rs

@@ -148,18 +148,10 @@ pub(crate) fn convert_to_field_items(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use std::sync::Arc;
 
     use crate::aggregator::MockAggregatorHandler;
     use mithril_aggregator::fake_data;
 
-    fn setup_test() -> Arc<Config> {
-        Arc::new(Config {
-            network: "testnet".to_string(),
-            aggregator_endpoint: "".to_string(),
-        })
-    }
-
     #[tokio::test]
     async fn test_list_snapshots_ok() {
         let network = "testnet".to_string();