bin: Replace simple_logger with simplelog.

Cargo.lock

@@ -856,7 +856,7 @@ dependencies = [
  "num-integer",
  "num-traits",
  "serde",
- "time 0.1.44",
+ "time",
  "winapi 0.3.9",
 ]
 
@@ -919,17 +919,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
 
-[[package]]
-name = "colored"
-version = "1.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4ffc801dacf156c5854b9df4f425a626539c3a6ef7893cc0c5084a23f0b6c59"
-dependencies = [
- "atty",
- "lazy_static",
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "concurrent-queue"
 version = "1.2.2"
@@ -1376,7 +1365,6 @@ dependencies = [
  "sha2",
  "signal-hook",
  "signal-hook-async-std",
- "simple_logger",
  "simplelog",
  "smol",
  "solana-client",
@@ -4245,19 +4233,6 @@ version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "02658e48d89f2bec991f9a78e69cfa4c316f8d6a6c4ec12fae1aeb263d486788"
 
-[[package]]
-name = "simple_logger"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45b60258a35dc3cb8a16890b8fd6723349bfa458d7960e25e633f1b1c19d7b5e"
-dependencies = [
- "atty",
- "colored",
- "log",
- "time 0.3.5",
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "simplelog"
 version = "0.11.1"
@@ -4973,7 +4948,7 @@ dependencies = [
 [[package]]
 name = "sqlx"
 version = "0.5.9"
-source = "git+https://github.com/parazyd/sqlx?rev=0fbdc4f5d7334568e375c9ce4aa45a6cd3ea9867#0fbdc4f5d7334568e375c9ce4aa45a6cd3ea9867"
+source = "git+https://github.com/parazyd/sqlx?rev=94a600cced8e3a2dea78f506f9325494d68b771a#94a600cced8e3a2dea78f506f9325494d68b771a"
 dependencies = [
  "sqlx-core",
  "sqlx-macros",
@@ -4982,7 +4957,7 @@ dependencies = [
 [[package]]
 name = "sqlx-core"
 version = "0.5.9"
-source = "git+https://github.com/parazyd/sqlx?rev=0fbdc4f5d7334568e375c9ce4aa45a6cd3ea9867#0fbdc4f5d7334568e375c9ce4aa45a6cd3ea9867"
+source = "git+https://github.com/parazyd/sqlx?rev=94a600cced8e3a2dea78f506f9325494d68b771a#94a600cced8e3a2dea78f506f9325494d68b771a"
 dependencies = [
  "ahash 0.7.6",
  "atoi",
@@ -5016,13 +4991,12 @@ dependencies = [
  "stringprep",
  "thiserror",
  "url",
- "whoami",
 ]
 
 [[package]]
 name = "sqlx-macros"
 version = "0.5.9"
-source = "git+https://github.com/parazyd/sqlx?rev=0fbdc4f5d7334568e375c9ce4aa45a6cd3ea9867#0fbdc4f5d7334568e375c9ce4aa45a6cd3ea9867"
+source = "git+https://github.com/parazyd/sqlx?rev=94a600cced8e3a2dea78f506f9325494d68b771a#94a600cced8e3a2dea78f506f9325494d68b771a"
 dependencies = [
  "dotenv",
  "either",
@@ -5040,7 +5014,7 @@ dependencies = [
 [[package]]
 name = "sqlx-rt"
 version = "0.5.9"
-source = "git+https://github.com/parazyd/sqlx?rev=0fbdc4f5d7334568e375c9ce4aa45a6cd3ea9867#0fbdc4f5d7334568e375c9ce4aa45a6cd3ea9867"
+source = "git+https://github.com/parazyd/sqlx?rev=94a600cced8e3a2dea78f506f9325494d68b771a#94a600cced8e3a2dea78f506f9325494d68b771a"
 dependencies = [
  "async-native-tls 0.3.3",
  "async-std",
@@ -5239,23 +5213,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "time"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41effe7cfa8af36f439fac33861b66b049edc6f9a32331e2312660529c1c24ad"
-dependencies = [
- "itoa 0.4.8",
- "libc",
- "time-macros",
-]
-
-[[package]]
-name = "time-macros"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25eb0ca3468fc0acc11828786797f6ef9aa1555e4a211a60d64cc8e4d1be47d6"
-
 [[package]]
 name = "tiny-bip39"
 version = "0.8.2"
@@ -5747,16 +5704,6 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "whoami"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524b58fa5a20a2fb3014dd6358b70e6579692a56ef6fce928834e488f42f65e8"
-dependencies = [
- "wasm-bindgen",
- "web-sys",
-]
-
 [[package]]
 name = "winapi"
 version = "0.2.8"

Cargo.toml

@@ -66,7 +66,7 @@ failure = "0.1.8"
 lazy_static = "1.4.0"
 log = "0.4.14"
 num_cpus = "1.13.0"
-simple_logger = "1.15.0"
+simplelog = "0.11.1"
 signal-hook = "0.3.10"
 signal-hook-async-std = "0.2.1"
 subtle = "2.4.1"
@@ -78,7 +78,7 @@ async-tungstenite = "0.16.0"
 tungstenite = "0.16.0"
 
 # Used for wallet management.
-sqlx = {git = "https://github.com/parazyd/sqlx", rev = "0fbdc4f5d7334568e375c9ce4aa45a6cd3ea9867", features = ["runtime-async-std-native-tls", "sqlite"]}
+sqlx = {git = "https://github.com/parazyd/sqlx", rev = "94a600cced8e3a2dea78f506f9325494d68b771a", features = ["runtime-async-std-native-tls", "sqlite"]}
 libsqlite3-sys = {version = "0.23.1", features = ["bundled-sqlcipher"]}
 
 # Used for gatewayd network transport.
@@ -100,7 +100,6 @@ spl-associated-token-account = {version = "1.0.3", features = ["no-entrypoint"],
 spl-token = {version = "3.2.0", features = ["no-entrypoint"], optional = true}
 
 aes-gcm = {version = "0.9.4", optional = true}
-simplelog = {version = "0.11.1", optional = true}
 chrono = {version = "0.4.19", optional = true}
 rusqlite = {version = "0.26.3", optional = true}
 
@@ -108,7 +107,7 @@ rusqlite = {version = "0.26.3", optional = true}
 btc = ["bdk", "bitcoin", "secp256k1"]
 eth = ["keccak-hasher", "hash-db"]
 sol = ["solana-sdk", "solana-client", "spl-token", "spl-associated-token-account"]
-darkpulse = ["aes-gcm", "simplelog", "chrono","rusqlite"]
+darkpulse = ["aes-gcm", "chrono","rusqlite"]
 
 
 

src/bin/cashierd.rs

@@ -9,6 +9,7 @@ use incrementalmerkletree::bridgetree::BridgeTree;
 use log::{debug, info, trace};
 use rand::rngs::OsRng;
 use serde_json::{json, Value};
+use simplelog::{ColorChoice, LevelFilter, TermLogger, TerminalMode};
 
 use drk::{
     blockchain::{rocks::columns, Rocks, RocksColumn},
@@ -748,14 +749,19 @@ async fn main() -> Result<()> {
     };
 
     let loglevel = if args.is_present("verbose") {
-        log::Level::Debug
+        LevelFilter::Debug
     } else if args.is_present("trace") {
-        log::Level::Trace
+        LevelFilter::Trace
     } else {
-        log::Level::Info
+        LevelFilter::Info
     };
 
-    simple_logger::init_with_level(loglevel)?;
+    TermLogger::init(
+        loglevel,
+        simplelog::Config::default(),
+        TerminalMode::Mixed,
+        ColorChoice::Auto,
+    )?;
 
     let config: CashierdConfig = Config::<CashierdConfig>::load(config_path)?;
 

src/bin/darkfid.rs

@@ -9,6 +9,7 @@ use incrementalmerkletree::bridgetree::BridgeTree;
 use log::{debug, info};
 use num_bigint::BigUint;
 use serde_json::{json, Value};
+use simplelog::{ColorChoice, LevelFilter, TermLogger, TerminalMode};
 use url::Url;
 
 use drk::{
@@ -633,14 +634,19 @@ async fn main() -> Result<()> {
     };
 
     let loglevel = if args.is_present("verbose") {
-        log::Level::Debug
+        LevelFilter::Debug
     } else if args.is_present("trace") {
-        log::Level::Trace
+        LevelFilter::Trace
     } else {
-        log::Level::Info
+        LevelFilter::Info
     };
 
-    simple_logger::init_with_level(loglevel)?;
+    TermLogger::init(
+        loglevel,
+        simplelog::Config::default(),
+        TerminalMode::Mixed,
+        ColorChoice::Auto,
+    )?;
 
     let config: DarkfidConfig = Config::<DarkfidConfig>::load(config_path)?;
 

src/bin/drk.rs

@@ -6,6 +6,7 @@ use clap::{clap_app, ArgMatches};
 use log::debug;
 use prettytable::{format, Table};
 use serde_json::{json, Value};
+use simplelog::{ColorChoice, LevelFilter, TermLogger, TerminalMode};
 
 use drk::{
     cli::{Config, DrkConfig},
@@ -341,14 +342,19 @@ async fn main() -> Result<()> {
     };
 
     let loglevel = if args.is_present("verbose") {
-        log::Level::Debug
+        LevelFilter::Debug
     } else if args.is_present("trace") {
-        log::Level::Trace
+        LevelFilter::Trace
     } else {
-        log::Level::Info
+        LevelFilter::Info
     };
 
-    simple_logger::init_with_level(loglevel)?;
+    TermLogger::init(
+        loglevel,
+        simplelog::Config::default(),
+        TerminalMode::Mixed,
+        ColorChoice::Auto,
+    )?;
     let config = Config::<DrkConfig>::load(config_path)?;
 
     start(&config, args).await

src/bin/eth.rs

@@ -1,4 +1,5 @@
 use num_bigint::BigUint;
+use simplelog::{ColorChoice, LevelFilter, TermLogger, TerminalMode};
 
 use drk::{
     service::eth::{erc20_transfer_data, EthClient, EthTx, Keypair},
@@ -8,7 +9,12 @@ use drk::{
 
 #[async_std::main]
 async fn main() -> Result<()> {
-    simple_logger::init_with_level(log::Level::Debug)?;
+    TermLogger::init(
+        LevelFilter::Trace,
+        simplelog::Config::default(),
+        TerminalMode::Mixed,
+        ColorChoice::Auto,
+    )?;
 
     let acc = "0x113b6648f34f4d0340d04ff171cbcf0b49d47827".to_string();
     let key = "67cbb73cb293eea5fa2a7025d5479dbd50319010c03fd8821917ad0d9d53276c".to_string();

src/bin/gatewayd.rs

@@ -4,6 +4,7 @@ use async_executor::Executor;
 use clap::clap_app;
 use easy_parallel::Parallel;
 use log::debug;
+use simplelog::{LevelFilter, SimpleLogger};
 
 use drk::{
     blockchain::{rocks::columns, Rocks, RocksColumn},
@@ -42,14 +43,14 @@ async fn main() -> Result<()> {
     };
 
     let loglevel = if args.is_present("verbose") {
-        log::Level::Debug
+        LevelFilter::Debug
     } else if args.is_present("trace") {
-        log::Level::Trace
+        LevelFilter::Trace
     } else {
-        log::Level::Info
+        LevelFilter::Info
     };
 
-    simple_logger::init_with_level(loglevel)?;
+    SimpleLogger::init(loglevel, simplelog::Config::default())?;
 
     let config: GatewaydConfig = Config::<GatewaydConfig>::load(config_path)?;
 

src/bin/ircd.rs

@@ -1,3 +1,9 @@
+use std::{
+    io,
+    net::{SocketAddr, TcpListener, TcpStream},
+    sync::Arc,
+};
+
 use async_executor::Executor;
 use async_std::io::BufReader;
 use futures::{
@@ -5,12 +11,8 @@ use futures::{
     AsyncBufReadExt, AsyncReadExt, AsyncWriteExt, Future, FutureExt,
 };
 use log::{debug, error, info, warn};
+use simplelog::{ColorChoice, LevelFilter, TermLogger, TerminalMode};
 use smol::Async;
-use std::{
-    io,
-    net::{SocketAddr, TcpListener, TcpStream},
-    sync::Arc,
-};
 
 use drk::{Error, Result};
 
@@ -173,11 +175,12 @@ async fn async_main(executor: Arc<Executor<'_>>) -> Result<()> {
 }
 
 fn main() -> Result<()> {
-    //simple_logger::init_with_level(log::Level::Trace)?;
-    simple_logger::SimpleLogger::new()
-        .with_level(log::LevelFilter::Debug)
-        .with_utc_timestamps()
-        .init()?;
+    TermLogger::init(
+        LevelFilter::Debug,
+        simplelog::Config::default(),
+        TerminalMode::Mixed,
+        ColorChoice::Auto,
+    )?;
 
     let ex = Arc::new(Executor::new());
     smol::block_on(ex.run(async_main(ex.clone())))