diff --git a/lib/core/conf/src/lib.rs b/lib/core/conf/src/lib.rs index f1d979d9b9c923d1d0de90b71671e8c8a1dd2331..e7dec054f29104c82fa507805b6e88b8e5e4408f 100644 --- a/lib/core/conf/src/lib.rs +++ b/lib/core/conf/src/lib.rs @@ -29,8 +29,6 @@ unused_qualifications )] -#[macro_use] -extern crate log; #[macro_use] extern crate serde_derive; diff --git a/lib/core/module/src/lib.rs b/lib/core/module/src/lib.rs index e65d654d425e7d2300a3a0a656f51599a54baaca..4fce3070dae7183420af557b5dde760c07619b66 100644 --- a/lib/core/module/src/lib.rs +++ b/lib/core/module/src/lib.rs @@ -41,7 +41,6 @@ use durs_common_tools::fatal_error; use durs_common_tools::traits::merge::Merge; use durs_network_documents::network_endpoint::{ApiPart, EndpointEnum}; use failure::Fail; -use log::error; use serde::de::DeserializeOwned; use serde::ser::{Serialize, Serializer}; use std::collections::HashSet; diff --git a/lib/crypto/src/hashs/mod.rs b/lib/crypto/src/hashs/mod.rs index 963a003012e2b6c422137a8f64172ab816482499..81e5e43c4d1fef4817ffdea6ed06d4bcf7ddc2f0 100644 --- a/lib/crypto/src/hashs/mod.rs +++ b/lib/crypto/src/hashs/mod.rs @@ -17,7 +17,6 @@ use crate::bases::*; use durs_common_tools::fatal_error; -use log::error; use ring::{digest, rand}; use std::fmt::{Debug, Display, Error, Formatter}; diff --git a/lib/crypto/src/rand.rs b/lib/crypto/src/rand.rs index 313cd60f1cc5f3619337404bf0f5f9beb898725a..e6184dc1884cbd872a30675e21217c5d9cc8a7e2 100644 --- a/lib/crypto/src/rand.rs +++ b/lib/crypto/src/rand.rs @@ -17,7 +17,6 @@ use byteorder::ByteOrder; use durs_common_tools::fatal_error; -use log::error; use ring::rand; #[inline] diff --git a/lib/crypto/src/seeds.rs b/lib/crypto/src/seeds.rs index cfa560465f03e6d55ab943fcf1956b0efb6364b6..ab9d9f68d2ffc8c561d391d715b42b9c1368b1f1 100644 --- a/lib/crypto/src/seeds.rs +++ b/lib/crypto/src/seeds.rs @@ -19,7 +19,6 @@ use crate::bases::b58::{bytes_to_str_base58, ToBase58}; use crate::bases::*; use clear_on_drop::clear::Clear; use durs_common_tools::fatal_error; -use log::error; use ring::rand; use std::fmt::{self, Debug, Display, Formatter}; diff --git a/lib/dubp/user-docs/src/lib.rs b/lib/dubp/user-docs/src/lib.rs index fd680b6193e99586ae7d944c988bedafe84ff64a..f1c129afa471df3216ccd1f12950488c778e4485 100644 --- a/lib/dubp/user-docs/src/lib.rs +++ b/lib/dubp/user-docs/src/lib.rs @@ -27,8 +27,6 @@ unused_import_braces )] -#[macro_use] -extern crate log; #[macro_use] extern crate failure; #[cfg(test)] diff --git a/lib/dubp/wot/operations/density.rs b/lib/dubp/wot/operations/density.rs index f77def8a09d62584f98d1ff3a431d90e74a44e8a..e24584ee5f7fed1ff21d349acc8b0c2b64ea5413 100644 --- a/lib/dubp/wot/operations/density.rs +++ b/lib/dubp/wot/operations/density.rs @@ -17,7 +17,6 @@ use crate::data::WebOfTrust; use durs_common_tools::fatal_error; -use log::error; /// Compute average density pub fn calculate_average_density<T: WebOfTrust>(wot: &T) -> usize { diff --git a/lib/dunp/network-documents/src/lib.rs b/lib/dunp/network-documents/src/lib.rs index b1f517391dffc24ba78610339a5ecbf904e04937..08ad5454ede13a84e20d1ba092f55d0932a97a76 100644 --- a/lib/dunp/network-documents/src/lib.rs +++ b/lib/dunp/network-documents/src/lib.rs @@ -32,8 +32,6 @@ extern crate pest_derive; #[cfg(test)] #[macro_use] extern crate pretty_assertions; -#[macro_use] -extern crate log; pub mod host; pub mod network_endpoint; diff --git a/lib/modules-lib/bc-db-reader/src/blocks/fork_tree.rs b/lib/modules-lib/bc-db-reader/src/blocks/fork_tree.rs index a522a728c479da1a02a98781b32e9ad820c19a5c..3bb1888ca45a8eda043e49fd47a3fd1fd767aac6 100644 --- a/lib/modules-lib/bc-db-reader/src/blocks/fork_tree.rs +++ b/lib/modules-lib/bc-db-reader/src/blocks/fork_tree.rs @@ -16,7 +16,6 @@ //! Blocks fork tree: define entity and read requests. use dubp_common_doc::{BlockHash, BlockNumber, Blockstamp}; -use log::error; use serde::de::{self, Deserializer, Visitor}; use serde::{Deserialize, Serialize, Serializer}; use std::collections::{HashMap, HashSet}; diff --git a/lib/modules-lib/bc-db-reader/src/currency_params.rs b/lib/modules-lib/bc-db-reader/src/currency_params.rs index bed6d8cc19c03bade277e876f47941213710a044..7e131244f16835c91d0064299b01c0756557ab9a 100644 --- a/lib/modules-lib/bc-db-reader/src/currency_params.rs +++ b/lib/modules-lib/bc-db-reader/src/currency_params.rs @@ -21,7 +21,6 @@ use dubp_currency_params::db::write_currency_params; use dubp_currency_params::genesis_block_params::GenesisBlockParams; use dubp_currency_params::CurrencyParameters; use durs_common_tools::fatal_error; -use log::error; use std::path::PathBuf; use unwrap::unwrap; diff --git a/lib/modules-lib/bc-db-reader/src/indexes/sources.rs b/lib/modules-lib/bc-db-reader/src/indexes/sources.rs index b721db72b5c8728024633d35caf0c20ecf35d54b..073b89962e958e9d70d54f30fa2ebd2fb13c8ff1 100644 --- a/lib/modules-lib/bc-db-reader/src/indexes/sources.rs +++ b/lib/modules-lib/bc-db-reader/src/indexes/sources.rs @@ -22,7 +22,6 @@ use dubp_indexes::sindex::UniqueIdUTXOv10; use dubp_user_docs::documents::transaction::*; use durs_common_tools::fatal_error; use durs_dbs_tools::DbError; -use log::error; use serde::{Deserialize, Serialize}; use std::cmp::Ordering; use std::collections::HashMap; diff --git a/lib/modules-lib/bc-db-reader/src/tools.rs b/lib/modules-lib/bc-db-reader/src/tools.rs index cda4c9800e1ec01673566fa925560edf1a190371..5b1515dc80a73caa66d1791389a5863e8b864189 100644 --- a/lib/modules-lib/bc-db-reader/src/tools.rs +++ b/lib/modules-lib/bc-db-reader/src/tools.rs @@ -19,7 +19,6 @@ use crate::blocks::BlockDb; use dubp_block_doc::block::BlockDocumentTrait; use dup_crypto::keys::PubKey; use durs_common_tools::fatal_error; -use log::error; use std::collections::HashMap; /// Compute median issuers frame diff --git a/lib/modules/tui/tui.rs b/lib/modules/tui/tui.rs index d5b00ee852b947168083e016a9f19f3b4890fa68..5c4dbe464616ec9bdf0103fe93a833fa0167f79b 100644 --- a/lib/modules/tui/tui.rs +++ b/lib/modules/tui/tui.rs @@ -40,7 +40,7 @@ use durs_module::*; use durs_network::events::NetworkEvent; use durs_network_documents::network_head::NetworkHead; use durs_network_documents::NodeFullId; -use log::{debug, error, trace, warn}; +use log::{debug, trace, warn}; use serde::{Deserialize, Serialize}; use std::collections::HashMap; use std::io::{stdout, Write}; diff --git a/lib/modules/ws2p-v1-legacy/src/ws_connections/handler.rs b/lib/modules/ws2p-v1-legacy/src/ws_connections/handler.rs index 689d0a3e05d459262036ab5bbe1ea2e6e0407ee2..698fce42aa2784a45c7d0db4fe5bc4ce4b2fbbf0 100644 --- a/lib/modules/ws2p-v1-legacy/src/ws_connections/handler.rs +++ b/lib/modules/ws2p-v1-legacy/src/ws_connections/handler.rs @@ -22,7 +22,6 @@ use crate::constants::*; use crate::*; use dup_crypto::keys::*; use durs_common_tools::fatal_error; -use log::error; use std::sync::mpsc; #[allow(deprecated)] use ws::util::{Timeout, Token}; diff --git a/lib/modules/ws2p/ws2p-messages/lib.rs b/lib/modules/ws2p/ws2p-messages/lib.rs index 13df8c6e9aec00691576027d0c79f4dc557ede91..3ca06a2196989091aaa5d111f0cc3d7f834d08b3 100644 --- a/lib/modules/ws2p/ws2p-messages/lib.rs +++ b/lib/modules/ws2p/ws2p-messages/lib.rs @@ -35,8 +35,6 @@ extern crate pretty_assertions;*/ #[macro_use] extern crate serde_derive; -#[macro_use] -extern crate log; /// WS2Pv2 Messages pub mod v2; diff --git a/lib/modules/ws2p/ws2p-protocol/src/controller/meta_datas.rs b/lib/modules/ws2p/ws2p-protocol/src/controller/meta_datas.rs index 8bac4b6a2aa68250d6dbcfa048c5e994ad16d735..bee8472732470b5c136d25f657e7ae1b547ee40d 100644 --- a/lib/modules/ws2p/ws2p-protocol/src/controller/meta_datas.rs +++ b/lib/modules/ws2p/ws2p-protocol/src/controller/meta_datas.rs @@ -26,7 +26,6 @@ use durs_network_documents::network_peer::PeerCardV11; use durs_network_documents::NodeFullId; use durs_ws2p_messages::v2::api_features::WS2PFeatures; use durs_ws2p_messages::v2::connect::WS2Pv2ConnectType; -use log::error; use std::time::Instant; #[derive(Debug)] diff --git a/lib/modules/ws2p/ws2p-protocol/src/controller/on_message.rs b/lib/modules/ws2p/ws2p-protocol/src/controller/on_message.rs index 41c7561aa99b8e6005ffd0a97562c27f14328716..fdd28426b170e6aaa201c889f62418d593f4bdc1 100644 --- a/lib/modules/ws2p/ws2p-protocol/src/controller/on_message.rs +++ b/lib/modules/ws2p/ws2p-protocol/src/controller/on_message.rs @@ -30,7 +30,6 @@ use durs_module::ModuleMessage; use durs_network_documents::NodeFullId; use durs_ws2p_messages::v2::payload_container::WS2Pv2MessagePayload; use durs_ws2p_messages::WS2PMessage; -use log::error; use std::ops::Deref; use std::thread; use std::time::{Duration, Instant}; diff --git a/lib/modules/ws2p/ws2p-protocol/src/controller/on_message/ack_msg.rs b/lib/modules/ws2p/ws2p-protocol/src/controller/on_message/ack_msg.rs index c987782caa9b23418bca9d922ad993c217e824b7..579ae3ac559e62eab296c220574f92d927c26ff3 100644 --- a/lib/modules/ws2p/ws2p-protocol/src/controller/on_message/ack_msg.rs +++ b/lib/modules/ws2p/ws2p-protocol/src/controller/on_message/ack_msg.rs @@ -24,7 +24,6 @@ use durs_module::ModuleMessage; use durs_ws2p_messages::v2::ok::WS2Pv2OkMsg; use durs_ws2p_messages::v2::payload_container::WS2Pv2MessagePayload; use durs_ws2p_messages::v2::WS2Pv2Message; -use log::error; /// Process WS2P v2+ ACK Message pub fn process_ws2p_v2p_ack_msg<M: ModuleMessage>( diff --git a/lib/modules/ws2p/ws2p-protocol/src/controller/on_message/connect_msg.rs b/lib/modules/ws2p/ws2p-protocol/src/controller/on_message/connect_msg.rs index e8f7ec69dcad3afe4f8dc66d00d24b0e8b86f011..1640715eaaa389f56f97bec7ff83fbe8cd4a1d55 100644 --- a/lib/modules/ws2p/ws2p-protocol/src/controller/on_message/connect_msg.rs +++ b/lib/modules/ws2p/ws2p-protocol/src/controller/on_message/connect_msg.rs @@ -25,7 +25,6 @@ use durs_network_documents::NodeFullId; use durs_ws2p_messages::v2::connect::{WS2Pv2ConnectMsg, WS2Pv2ConnectType}; use durs_ws2p_messages::v2::payload_container::WS2Pv2MessagePayload; use durs_ws2p_messages::v2::WS2Pv2Message; -use log::error; use unwrap::unwrap; /// Process WS2P v2+ CONNECT Message diff --git a/lib/modules/ws2p/ws2p-protocol/src/controller/on_message/ok_msg.rs b/lib/modules/ws2p/ws2p-protocol/src/controller/on_message/ok_msg.rs index 6dd2ee4aa8559d8cfb6b5591577a0698385f1be6..7cb16efcddcba38aae5e4b19275b7c1ba4b5734a 100644 --- a/lib/modules/ws2p/ws2p-protocol/src/controller/on_message/ok_msg.rs +++ b/lib/modules/ws2p/ws2p-protocol/src/controller/on_message/ok_msg.rs @@ -22,7 +22,6 @@ use crate::controller::{ use durs_common_tools::fatal_error; use durs_module::ModuleMessage; use durs_ws2p_messages::v2::connect::WS2Pv2ConnectType; -use log::error; use unwrap::unwrap; /// Process WS2P v2+ OK Message diff --git a/lib/modules/ws2p/ws2p-protocol/src/controller/on_open.rs b/lib/modules/ws2p/ws2p-protocol/src/controller/on_open.rs index ca8c4d21dfb85194a58ebf675bf657a8f9336642..044ba6005b0153a3f5f374c3f0d65a4a0e44e3a8 100644 --- a/lib/modules/ws2p/ws2p-protocol/src/controller/on_open.rs +++ b/lib/modules/ws2p/ws2p-protocol/src/controller/on_open.rs @@ -24,7 +24,6 @@ use durs_module::ModuleMessage; use durs_ws2p_messages::v2::connect::generate_connect_message; use durs_ws2p_messages::v2::payload_container::WS2Pv2MessagePayload; use durs_ws2p_messages::v2::WS2Pv2Message; -use log::error; use std::net::SocketAddr; pub fn process<M: ModuleMessage>( diff --git a/lib/tools/common-tools/src/macros/fatal_error.rs b/lib/tools/common-tools/src/macros/fatal_error.rs index f1e51b1a8e02433b529c8a8570d2396bc41a02f4..1d3b3657b5f62d324625fe2f3634e1bb1c433b56 100644 --- a/lib/tools/common-tools/src/macros/fatal_error.rs +++ b/lib/tools/common-tools/src/macros/fatal_error.rs @@ -20,15 +20,15 @@ #[macro_export] macro_rules! fatal_error { ($msg:expr) => ({ - error!("{}", &dbg!($msg)); + log::error!("{}", &dbg!($msg)); panic!($msg); }); ($msg:expr,) => ({ - error!("{}", &dbg!($msg)); + log::error!("{}", &dbg!($msg)); panic!($msg); }); ($fmt:expr, $($arg:tt)+) => ({ - error!("{}", dbg!(format!($fmt, $($arg)+))); + log::error!("{}", dbg!(format!($fmt, $($arg)+))); panic!($fmt, $($arg)+); }); }