[refactor]: chores

Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com>
hyperledger · Apr 17, 2024 · ecd3119 · ecd3119
1 parent 786b8c6
commit ecd3119
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cli/src/lib.rs b/cli/src/lib.rs
@@ -582,6 +582,8 @@ fn genesis_domain(public_key: PublicKey) -> Domain {
 pub enum ConfigError {
     #[error("Error occurred while reading configuration from file(s) and environment")]
     ReadConfig,
+    #[error("Error occurred while validating configuration integrity")]
+    ParseConfig,
     #[error("Error occurred while reading genesis block")]
     ReadGenesis,
     #[error("The network consists from this one peer only")]
@@ -596,7 +598,7 @@ pub enum ConfigError {
     SameNetworkAndToriiAddrs,
     #[error("Invalid directory path found")]
     InvalidDirPath,
-    #[error("Cannot bind a listener to address `{addr}`")]
+    #[error("Network error: cannot listen to address `{addr}`")]
     CannotBindAddress { addr: SocketAddr },
 }
 
@@ -623,7 +625,7 @@ pub fn read_config_and_genesis(
         .read_and_complete::<UserConfig>()
         .change_context(ConfigError::ReadConfig)?
         .parse()
-        .change_context(ConfigError::ReadConfig)?;
+        .change_context(ConfigError::ParseConfig)?;
 
     let genesis = if let Genesis::Full { key_pair, file } = &config.genesis {
         let raw_block = RawGenesisBlock::from_path(file.resolve_relative_path())

diff --git a/client_cli/Cargo.toml b/client_cli/Cargo.toml
@@ -35,6 +35,7 @@ json5 = { workspace = true }
 once_cell = { workspace = true }
 serde_json = { workspace = true }
 erased-serde = "0.3.31"
+supports-color = { workspace = true }
 
 [build-dependencies]
 vergen = { version = "8.2.5", default-features = false }

diff --git a/client_cli/src/main.rs b/client_cli/src/main.rs
@@ -7,7 +7,7 @@ use std::{
 };
 
 use erased_serde::Serialize;
-use error_stack::{IntoReportCompat, ResultExt};
+use error_stack::{fmt::ColorMode, IntoReportCompat, ResultExt};
 use eyre::{eyre, Error, Result, WrapErr};
 use iroha_client::{
     client::{Client, QueryResult},
@@ -192,6 +192,8 @@ fn main() -> error_stack::Result<(), MainError> {
         verbose,
     } = clap::Parser::parse();
 
+    error_stack::Report::set_color_mode(color_mode());
+
     let config = Config::load(config_path)
         // FIXME: would be nice to NOT change the context, it's unnecessary
         .change_context(MainError::Config)
@@ -217,6 +219,16 @@ fn main() -> error_stack::Result<(), MainError> {
     Ok(())
 }
 
+fn color_mode() -> ColorMode {
+    if supports_color::on(supports_color::Stream::Stdout)
+        && supports_color::on(supports_color::Stream::Stderr)
+    {
+        ColorMode::Color
+    } else {
+        ColorMode::None
+    }
+}
+
 /// Submit instruction with metadata to network.
 ///
 /// # Errors

diff --git a/config/base/src/toml.rs b/config/base/src/toml.rs
@@ -21,9 +21,9 @@ pub struct TomlSource {
 
 #[derive(Error, Debug, Copy, Clone)]
 pub enum FromFileError {
-    #[error("Failed to read file from disk")]
+    #[error("File system error")]
     Read,
-    #[error("Failed to parse file contents as TOML")]
+    #[error("Error while deserializing file contents as TOML")]
     Parse,
 }
 

diff --git a/primitives/src/unique_vec.rs b/primitives/src/unique_vec.rs
@@ -72,6 +72,7 @@ impl<T> UniqueVec<T> {
 }
 
 /// A result for [`UniqueVec::push`]
+#[derive(Debug)]
 pub enum PushResult<T> {
     /// The element was pushed into the vec
     Ok,