diff --git a/rustfmt.toml b/rustfmt.toml index 8971d8abc..e70aee8cc 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -6,4 +6,4 @@ wrap_comments = true binop_separator = "Back" trailing_comma = "Vertical" trailing_semicolon = false -use_field_init_shorthand = true \ No newline at end of file +use_field_init_shorthand = true diff --git a/src/bin/cashierd.rs b/src/bin/cashierd.rs index 83cfd2b3e..bbb58b3e4 100644 --- a/src/bin/cashierd.rs +++ b/src/bin/cashierd.rs @@ -736,6 +736,7 @@ async fn main() -> Result<()> { (@arg CONFIG: -c --config +takes_value "Sets a custom config file") (@arg ADDRESS: -a --address "Get Cashier Public key") (@arg verbose: -v --verbose "Increase verbosity") + (@arg trace: -t --trace "Show event trace") (@arg refresh: -r --refresh "Refresh the wallet and slabstore") ) .get_matches(); @@ -746,7 +747,13 @@ async fn main() -> Result<()> { join_config_path(&PathBuf::from("cashierd.toml"))? }; - let loglevel = if args.is_present("verbose") { log::Level::Debug } else { log::Level::Info }; + let loglevel = if args.is_present("verbose") { + log::Level::Debug + } else if args.is_present("trace") { + log::Level::Trace + } else { + log::Level::Info + }; simple_logger::init_with_level(loglevel)?; diff --git a/src/bin/darkfid.rs b/src/bin/darkfid.rs index 7da2d540a..ecc3dd832 100644 --- a/src/bin/darkfid.rs +++ b/src/bin/darkfid.rs @@ -617,6 +617,7 @@ async fn main() -> Result<()> { let args = clap_app!(darkfid => (@arg CONFIG: -c --config +takes_value "Sets a custom config file") (@arg verbose: -v --verbose "Increase verbosity") + (@arg trace: -t --trace "Show event trace") (@arg refresh: -r --refresh "Refresh the wallet and slabstore") (@arg cashier: --cashier +takes_value "Local cashier public key") ) @@ -628,7 +629,13 @@ async fn main() -> Result<()> { join_config_path(&PathBuf::from("darkfid.toml"))? }; - let loglevel = if args.is_present("verbose") { log::Level::Debug } else { log::Level::Info }; + let loglevel = if args.is_present("verbose") { + log::Level::Debug + } else if args.is_present("trace") { + log::Level::Trace + } else { + log::Level::Info + }; simple_logger::init_with_level(loglevel)?; diff --git a/src/bin/drk.rs b/src/bin/drk.rs index 4425476cc..03f283d4d 100644 --- a/src/bin/drk.rs +++ b/src/bin/drk.rs @@ -287,6 +287,7 @@ async fn main() -> Result<()> { let args = clap_app!(drk => (@arg CONFIG: -c --config +takes_value "Sets a custom config file") (@arg verbose: -v --verbose "Increase verbosity") + (@arg trace: -t --trace "Show event trace") (@subcommand hello => (about: "Say hello to the RPC") ) @@ -339,7 +340,13 @@ async fn main() -> Result<()> { join_config_path(&PathBuf::from("drk.toml"))? }; - let loglevel = if args.is_present("verbose") { log::Level::Debug } else { log::Level::Info }; + let loglevel = if args.is_present("verbose") { + log::Level::Debug + } else if args.is_present("trace") { + log::Level::Debug + } else { + log::Level::Info + }; simple_logger::init_with_level(loglevel)?; let config = Config::::load(config_path)?; diff --git a/src/service/bridge.rs b/src/service/bridge.rs index e53b04856..29db946f6 100644 --- a/src/service/bridge.rs +++ b/src/service/bridge.rs @@ -4,7 +4,7 @@ use async_executor::Executor; use async_std::sync::{Arc, Mutex}; use async_trait::async_trait; use futures::stream::{FuturesUnordered, StreamExt}; -use log::{error, debug}; +use log::{debug, error}; use crate::{ crypto::keypair::PublicKey, types::*, util::NetworkName, wallet::cashierdb::TokenKey, Error, diff --git a/src/service/eth.rs b/src/service/eth.rs index 057211203..f38c058b0 100644 --- a/src/service/eth.rs +++ b/src/service/eth.rs @@ -6,7 +6,7 @@ use async_trait::async_trait; use hash_db::Hasher; use keccak_hasher::KeccakHasher; use lazy_static::lazy_static; -use log::{debug, info, error}; +use log::{debug, error, info}; use num_bigint::{BigUint, RandBigInt}; use serde::{Deserialize, Serialize}; use serde_json::{json, Value};