diff --git a/common/config/src/lib.rs b/common/config/src/lib.rs index edd6a4bdeb..4cf0cadc37 100644 --- a/common/config/src/lib.rs +++ b/common/config/src/lib.rs @@ -1,7 +1,7 @@ use handlebars::Handlebars; use serde::de::DeserializeOwned; use serde::Serialize; -use std::path::{Path, PathBuf}; +use std::path::PathBuf; use std::{fs, io}; pub trait NymConfig: Default + Serialize + DeserializeOwned { diff --git a/common/healthcheck/src/result.rs b/common/healthcheck/src/result.rs index 3a6826544a..e1f8ad969c 100644 --- a/common/healthcheck/src/result.rs +++ b/common/healthcheck/src/result.rs @@ -1,7 +1,7 @@ use crate::path_check::{PathChecker, PathStatus}; use crate::score::NodeScore; use crypto::identity::MixIdentityKeyPair; -use log::{debug, error, info, warn}; +use log::{debug, error, warn}; use rand_os::rand_core::RngCore; use sphinx::route::NodeAddressBytes; use std::collections::HashMap; diff --git a/common/pemstore/src/pemstore.rs b/common/pemstore/src/pemstore.rs index b123c1e2ce..f6059b3a06 100644 --- a/common/pemstore/src/pemstore.rs +++ b/common/pemstore/src/pemstore.rs @@ -10,6 +10,7 @@ use std::io::prelude::*; use std::path::PathBuf; pub struct PemStore { + #[allow(dead_code)] config_dir: PathBuf, private_mix_key_file: PathBuf, public_mix_key_file: PathBuf, diff --git a/mixnode/src/commands/init.rs b/mixnode/src/commands/init.rs index 3ebbc018e8..fdbba7dd2d 100644 --- a/mixnode/src/commands/init.rs +++ b/mixnode/src/commands/init.rs @@ -3,7 +3,6 @@ use crate::config::persistance::pathfinder::MixNodePathfinder; use clap::{App, Arg, ArgMatches}; use config::NymConfig; use crypto::encryption; -use crypto::identity::MixIdentityKeyPair; use pemstore::pemstore::PemStore; pub fn command_args<'a, 'b>() -> clap::App<'a, 'b> { diff --git a/mixnode/src/commands/run.rs b/mixnode/src/commands/run.rs index a058e7b56a..36fdb8af4a 100644 --- a/mixnode/src/commands/run.rs +++ b/mixnode/src/commands/run.rs @@ -1,11 +1,8 @@ use crate::commands::override_config; -use crate::config::persistance::pathfinder::MixNodePathfinder; use crate::config::Config; -use crate::node; use crate::node::MixNode; use clap::{App, Arg, ArgMatches}; use config::NymConfig; -use pemstore::pemstore::PemStore; pub fn command_args<'a, 'b>() -> App<'a, 'b> { App::new("run") diff --git a/mixnode/src/config/persistance/pathfinder.rs b/mixnode/src/config/persistance/pathfinder.rs index d4bfe9da5e..a0a7627bf1 100644 --- a/mixnode/src/config/persistance/pathfinder.rs +++ b/mixnode/src/config/persistance/pathfinder.rs @@ -10,18 +10,6 @@ pub struct MixNodePathfinder { } impl MixNodePathfinder { - pub fn new(id: String) -> Self { - let os_config_dir = dirs::config_dir().unwrap(); // grabs the OS default config dir - let config_dir = os_config_dir.join("nym").join("mixnodes").join(id); - let private_sphinx_key = config_dir.join("private.pem"); - let public_sphinx_key = config_dir.join("public.pem"); - MixNodePathfinder { - config_dir, - private_sphinx_key, - public_sphinx_key, - } - } - pub fn new_from_config(config: &Config) -> Self { MixNodePathfinder { config_dir: config.get_config_file_save_location(), diff --git a/mixnode/src/main.rs b/mixnode/src/main.rs index 212d2d6c3c..d073b1385c 100644 --- a/mixnode/src/main.rs +++ b/mixnode/src/main.rs @@ -1,6 +1,4 @@ use clap::{App, ArgMatches}; -use log::*; -use std::process; pub mod built_info; mod commands; diff --git a/mixnode/src/node/metrics.rs b/mixnode/src/node/metrics.rs index c29f7fef26..a7913200ef 100644 --- a/mixnode/src/node/metrics.rs +++ b/mixnode/src/node/metrics.rs @@ -9,8 +9,6 @@ use std::collections::HashMap; use std::sync::Arc; use std::time::Duration; -const METRICS_INTERVAL: u64 = 3; - #[derive(Debug)] pub struct MetricsReporter { received: u64, diff --git a/mixnode/src/node/mod.rs b/mixnode/src/node/mod.rs index 65da46e7f5..2f6f9dccac 100644 --- a/mixnode/src/node/mod.rs +++ b/mixnode/src/node/mod.rs @@ -1,7 +1,6 @@ use crate::config::persistance::pathfinder::MixNodePathfinder; use crate::config::Config; use crate::mix_peer::MixPeer; -use crate::node; use crate::node::metrics::MetricsReporter; use crypto::encryption; use futures::channel::mpsc; @@ -11,7 +10,6 @@ use log::*; use pemstore::pemstore::PemStore; use sphinx::header::delays::Delay as SphinxDelay; use sphinx::{ProcessedPacket, SphinxPacket}; -use std::net::SocketAddr; use std::sync::Arc; use std::time::Duration; use tokio::prelude::*; diff --git a/nym-client/src/commands/run.rs b/nym-client/src/commands/run.rs index 7d9eeb3f01..9d2918a204 100644 --- a/nym-client/src/commands/run.rs +++ b/nym-client/src/commands/run.rs @@ -1,10 +1,8 @@ use crate::client::NymClient; use crate::commands::override_config; -use crate::config::persistance::pathfinder::ClientPathfinder; use crate::config::Config; use clap::{App, Arg, ArgMatches}; use config::NymConfig; -use pemstore::pemstore::PemStore; pub fn command_args<'a, 'b>() -> clap::App<'a, 'b> { App::new("run") diff --git a/sfw-provider/src/commands/run.rs b/sfw-provider/src/commands/run.rs index 60d51328db..cabb7bcfd1 100644 --- a/sfw-provider/src/commands/run.rs +++ b/sfw-provider/src/commands/run.rs @@ -1,12 +1,8 @@ use crate::commands::override_config; use crate::config::Config; -use crate::provider; use crate::provider::ServiceProvider; use clap::{App, Arg, ArgMatches}; use config::NymConfig; -use crypto::identity::{MixIdentityPrivateKey, MixIdentityPublicKey}; -use std::net::ToSocketAddrs; -use std::path::PathBuf; pub fn command_args<'a, 'b>() -> clap::App<'a, 'b> { App::new("run") diff --git a/sfw-provider/src/config/persistance/pathfinder.rs b/sfw-provider/src/config/persistance/pathfinder.rs index fd74b03c04..a86a967e4e 100644 --- a/sfw-provider/src/config/persistance/pathfinder.rs +++ b/sfw-provider/src/config/persistance/pathfinder.rs @@ -10,18 +10,6 @@ pub struct ProviderPathfinder { } impl ProviderPathfinder { - pub fn new(id: String) -> Self { - let os_config_dir = dirs::config_dir().unwrap(); // grabs the OS default config dir - let config_dir = os_config_dir.join("nym").join("mixnodes").join(id); - let private_sphinx_key = config_dir.join("private.pem"); - let public_sphinx_key = config_dir.join("public.pem"); - ProviderPathfinder { - config_dir, - private_sphinx_key, - public_sphinx_key, - } - } - pub fn new_from_config(config: &Config) -> Self { ProviderPathfinder { config_dir: config.get_config_file_save_location(), diff --git a/sfw-provider/src/main.rs b/sfw-provider/src/main.rs index c563f141eb..9f4d755644 100644 --- a/sfw-provider/src/main.rs +++ b/sfw-provider/src/main.rs @@ -1,4 +1,4 @@ -use clap::{App, ArgMatches, SubCommand}; +use clap::{App, ArgMatches}; pub mod built_info; mod commands; diff --git a/sfw-provider/src/provider/client_handling/mod.rs b/sfw-provider/src/provider/client_handling/mod.rs index 7cae0b4894..3890316548 100644 --- a/sfw-provider/src/provider/client_handling/mod.rs +++ b/sfw-provider/src/provider/client_handling/mod.rs @@ -1,7 +1,6 @@ use crate::provider::storage::{ClientStorage, StoreError}; use crate::provider::ClientLedger; use crypto::encryption; -use crypto::identity::MixIdentityPrivateKey; use futures::lock::Mutex as FMutex; use hmac::{Hmac, Mac}; use log::*; diff --git a/sfw-provider/src/provider/mix_handling/mod.rs b/sfw-provider/src/provider/mix_handling/mod.rs index aab17f1dda..12bd4a6f7e 100644 --- a/sfw-provider/src/provider/mix_handling/mod.rs +++ b/sfw-provider/src/provider/mix_handling/mod.rs @@ -1,6 +1,5 @@ use crate::provider::storage::StoreData; use crypto::encryption; -use crypto::identity::MixIdentityPrivateKey; use log::{error, warn}; use sphinx::{ProcessedPacket, SphinxPacket}; use std::path::PathBuf; diff --git a/sfw-provider/src/provider/mod.rs b/sfw-provider/src/provider/mod.rs index 2f709a843e..86b19fe9e0 100644 --- a/sfw-provider/src/provider/mod.rs +++ b/sfw-provider/src/provider/mod.rs @@ -4,7 +4,7 @@ use crate::provider::client_handling::{ClientProcessingData, ClientRequestProces use crate::provider::mix_handling::{MixPacketProcessor, MixProcessingData}; use crate::provider::storage::ClientStorage; use crypto::encryption; -use crypto::identity::{MixIdentityPrivateKey, MixIdentityPublicKey}; +use crypto::identity::MixIdentityPublicKey; use directory_client::presence::providers::MixProviderClient; use futures::io::Error; use futures::lock::Mutex as FMutex; diff --git a/validator/src/config/mod.rs b/validator/src/config/mod.rs index 461690a0e1..e23c6f86c0 100644 --- a/validator/src/config/mod.rs +++ b/validator/src/config/mod.rs @@ -1,10 +1,7 @@ use crate::config::template::config_template; use config::NymConfig; -use log::*; use serde::{Deserialize, Serialize}; -use std::net::{IpAddr, SocketAddr}; use std::path::PathBuf; -use std::str::FromStr; use std::time; mod template; @@ -73,13 +70,13 @@ impl NymConfig for Config { impl Config { fn default_directory_server() -> String { #[cfg(feature = "qa")] - return "https://qa-directory.nymtech.net".to_string(); + return "https://qa-directory.nymtech.net".to_string(); #[cfg(feature = "local")] - return "http://localhost:8080".to_string(); + return "http://localhost:8080".to_string(); "https://directory.nymtech.net".to_string() } - + pub fn new>(id: S) -> Self { Config::default().with_id(id) } @@ -105,28 +102,31 @@ impl Config { pub fn get_config_file_save_location(&self) -> PathBuf { self.config_directory().join(Self::config_file_name()) } - + pub fn get_mix_mining_directory_server(&self) -> String { self.mix_mining.directory_server.clone() } - + + // dead_code until validator actually sends the presence data + #[allow(dead_code)] pub fn get_presence_directory_server(&self) -> String { self.debug.presence_directory_server.clone() } - + + #[allow(dead_code)] pub fn get_presence_sending_delay(&self) -> time::Duration { time::Duration::from_millis(self.debug.presence_sending_delay) } - + pub fn get_mix_mining_run_delay(&self) -> time::Duration { time::Duration::from_millis(self.mix_mining.run_delay) } - + pub fn get_mix_mining_resolution_timeout(&self) -> time::Duration { time::Duration::from_millis(self.mix_mining.resolution_timeout) } - - pub fn get_mix_mining_number_of_test_packets(&self) -> u64 { + + pub fn get_mix_mining_number_of_test_packets(&self) -> u64 { self.mix_mining.number_of_test_packets } } @@ -214,9 +214,7 @@ pub struct Debug { presence_sending_delay: u64, } -impl Debug { - -} +impl Debug {} impl Default for Debug { fn default() -> Self {