From 45d98dd124e9528ba90962b9057a19ed36a71f45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marin=20Ver=C5=A1i=C4=87?= <marin.versic101@gmail.com>
Date: Mon, 30 Oct 2023 14:57:23 +0300
Subject: [PATCH] [fix] #4014: Fix build of client_cli
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marin Veršić <marin.versic101@gmail.com>
---
 Cargo.lock               | 98 ++++++++++++++++++++--------------------
 client_cli/src/main.rs   | 16 +++----
 tools/kagami/src/main.rs |  6 +--
 3 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4d65b134304..994db19844a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2719,7 +2719,7 @@ checksum = "b33c9a5c599d67d051c4dc25eb1b6b4ef715d1763c20c85c688717a1734f204e"
 
 [[package]]
 name = "iroha"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "async-trait",
  "color-eyre",
@@ -2761,7 +2761,7 @@ dependencies = [
 
 [[package]]
 name = "iroha_cli_derive"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2771,7 +2771,7 @@ dependencies = [
 
 [[package]]
 name = "iroha_client"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "attohttpc",
  "base64 0.21.4",
@@ -2810,7 +2810,7 @@ dependencies = [
 
 [[package]]
 name = "iroha_client_cli"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "clap 3.2.25",
  "color-eyre",
@@ -2829,7 +2829,7 @@ dependencies = [
 
 [[package]]
 name = "iroha_config"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "cfg-if",
  "derive_more",
@@ -2854,7 +2854,7 @@ dependencies = [
 
 [[package]]
 name = "iroha_config_base"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "crossbeam",
  "displaydoc",
@@ -2870,7 +2870,7 @@ dependencies = [
 
 [[package]]
 name = "iroha_config_derive"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "iroha_macro_utils",
  "proc-macro-error",
@@ -2881,7 +2881,7 @@ dependencies = [
 
 [[package]]
 name = "iroha_core"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "async-trait",
  "byte-unit",
@@ -2919,7 +2919,7 @@ dependencies = [
 
 [[package]]
 name = "iroha_core_wasm_codec_derive"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "once_cell",
  "proc-macro-error",
@@ -2930,7 +2930,7 @@ dependencies = [
 
 [[package]]
 name = "iroha_crypto"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "derive_more",
  "getset",
@@ -2950,7 +2950,7 @@ dependencies = [
 
 [[package]]
 name = "iroha_data_model"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "base64 0.21.4",
  "criterion",
@@ -2977,7 +2977,7 @@ dependencies = [
 
 [[package]]
 name = "iroha_data_model_derive"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "darling",
  "derive_more",
@@ -2996,7 +2996,7 @@ dependencies = [
 
 [[package]]
 name = "iroha_derive"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "darling",
  "impls",
@@ -3010,7 +3010,7 @@ dependencies = [
 
 [[package]]
 name = "iroha_dsl"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "iroha_client",
  "iroha_config",
@@ -3024,7 +3024,7 @@ dependencies = [
 
 [[package]]
 name = "iroha_executor"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "iroha_data_model",
  "iroha_executor_derive",
@@ -3037,7 +3037,7 @@ dependencies = [
 
 [[package]]
 name = "iroha_executor_derive"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3046,7 +3046,7 @@ dependencies = [
 
 [[package]]
 name = "iroha_ffi"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "derive_more",
  "getset",
@@ -3056,7 +3056,7 @@ dependencies = [
 
 [[package]]
 name = "iroha_ffi_derive"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "darling",
  "getset",
@@ -3073,7 +3073,7 @@ dependencies = [
 
 [[package]]
 name = "iroha_futures"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "iroha_config",
  "iroha_futures_derive",
@@ -3087,7 +3087,7 @@ dependencies = [
 
 [[package]]
 name = "iroha_futures_derive"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "iroha_macro_utils",
  "manyhow",
@@ -3098,7 +3098,7 @@ dependencies = [
 
 [[package]]
 name = "iroha_genesis"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "derive_more",
  "eyre",
@@ -3116,7 +3116,7 @@ dependencies = [
 
 [[package]]
 name = "iroha_logger"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "color-eyre",
  "console-subscriber",
@@ -3136,14 +3136,14 @@ dependencies = [
 
 [[package]]
 name = "iroha_macro"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "iroha_derive",
 ]
 
 [[package]]
 name = "iroha_macro_utils"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "darling",
  "drop_bomb",
@@ -3156,7 +3156,7 @@ dependencies = [
 
 [[package]]
 name = "iroha_p2p"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "aead",
  "async-trait",
@@ -3179,7 +3179,7 @@ dependencies = [
 
 [[package]]
 name = "iroha_primitives"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -3200,7 +3200,7 @@ dependencies = [
 
 [[package]]
 name = "iroha_primitives_derive"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "iroha_primitives",
  "manyhow",
@@ -3211,7 +3211,7 @@ dependencies = [
 
 [[package]]
 name = "iroha_schema"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "fixnum",
  "impls",
@@ -3223,7 +3223,7 @@ dependencies = [
 
 [[package]]
 name = "iroha_schema_derive"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "darling",
  "iroha_schema",
@@ -3236,7 +3236,7 @@ dependencies = [
 
 [[package]]
 name = "iroha_schema_gen"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "iroha_crypto",
  "iroha_data_model",
@@ -3247,7 +3247,7 @@ dependencies = [
 
 [[package]]
 name = "iroha_smart_contract"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "iroha_data_model",
  "iroha_smart_contract_derive",
@@ -3258,7 +3258,7 @@ dependencies = [
 
 [[package]]
 name = "iroha_smart_contract_derive"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3267,7 +3267,7 @@ dependencies = [
 
 [[package]]
 name = "iroha_smart_contract_utils"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "iroha_data_model",
  "parity-scale-codec",
@@ -3276,11 +3276,11 @@ dependencies = [
 
 [[package]]
 name = "iroha_substrate"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 
 [[package]]
 name = "iroha_swarm"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "clap 4.4.6",
  "color-eyre",
@@ -3301,7 +3301,7 @@ dependencies = [
 
 [[package]]
 name = "iroha_telemetry"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "async-trait",
  "chrono",
@@ -3324,7 +3324,7 @@ dependencies = [
 
 [[package]]
 name = "iroha_telemetry_derive"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "iroha_core",
  "proc-macro-error",
@@ -3336,7 +3336,7 @@ dependencies = [
 
 [[package]]
 name = "iroha_trigger"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "iroha_data_model",
  "iroha_smart_contract",
@@ -3346,7 +3346,7 @@ dependencies = [
 
 [[package]]
 name = "iroha_trigger_derive"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3355,7 +3355,7 @@ dependencies = [
 
 [[package]]
 name = "iroha_version"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "iroha_data_model",
  "iroha_logger",
@@ -3370,7 +3370,7 @@ dependencies = [
 
 [[package]]
 name = "iroha_version_derive"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "darling",
  "iroha_macro",
@@ -3387,7 +3387,7 @@ dependencies = [
 
 [[package]]
 name = "iroha_wasm_builder"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "eyre",
  "path-absolutize",
@@ -3398,7 +3398,7 @@ dependencies = [
 
 [[package]]
 name = "iroha_wasm_builder_cli"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "clap 4.4.6",
  "color-eyre",
@@ -3409,7 +3409,7 @@ dependencies = [
 
 [[package]]
 name = "iroha_wasm_codec"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "iroha_core_wasm_codec_derive",
  "parity-scale-codec",
@@ -3419,7 +3419,7 @@ dependencies = [
 
 [[package]]
 name = "iroha_wasm_test_runner"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "anyhow",
  "wasmtime",
@@ -3529,7 +3529,7 @@ dependencies = [
 
 [[package]]
 name = "kagami"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "clap 4.4.6",
  "color-eyre",
@@ -3556,7 +3556,7 @@ dependencies = [
 
 [[package]]
 name = "kura_inspector"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "clap 4.4.6",
  "iroha_core",
@@ -3992,7 +3992,7 @@ dependencies = [
 
 [[package]]
 name = "parity_scale_decoder"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "clap 4.4.6",
  "colored",
@@ -5382,7 +5382,7 @@ dependencies = [
 
 [[package]]
 name = "test_network"
-version = "2.0.0-pre-rc.19"
+version = "2.0.0-pre-rc.20"
 dependencies = [
  "eyre",
  "futures",
diff --git a/client_cli/src/main.rs b/client_cli/src/main.rs
index b52cc851b3d..3cdbf884aa1 100644
--- a/client_cli/src/main.rs
+++ b/client_cli/src/main.rs
@@ -46,7 +46,7 @@ impl FromStr for Metadata {
 
 /// Client configuration wrapper. Allows getting itself from arguments from cli (from user supplied file).
 #[derive(Debug, Clone)]
-pub struct Configuration(pub ClientConfiguration);
+struct Configuration(pub ClientConfiguration);
 
 impl FromStr for Configuration {
     type Err = Error;
@@ -62,7 +62,7 @@ impl FromStr for Configuration {
 /// Iroha CLI Client provides an ability to interact with Iroha Peers Web API without direct network usage.
 #[derive(StructOpt, Debug)]
 #[structopt(name = "iroha_client_cli", version = concat!(env!("CARGO_PKG_VERSION")), author)]
-pub struct Args {
+struct Args {
     /// Sets a config file path
     #[structopt(short, long)]
     config: Option<Configuration>,
@@ -80,7 +80,7 @@ pub struct Args {
 }
 
 #[derive(StructOpt, Debug)]
-pub enum Subcommand {
+enum Subcommand {
     /// The subcommand related to domains
     #[clap(subcommand)]
     Domain(domain::Args),
@@ -105,7 +105,7 @@ pub enum Subcommand {
 }
 
 /// Context inside which command is executed
-pub trait RunContext {
+trait RunContext {
     /// Get access to configuration
     fn configuration(&self) -> &ClientConfiguration;
 
@@ -142,7 +142,7 @@ impl<W: std::io::Write> RunContext for PrintJsonContext<W> {
 }
 
 /// Runs subcommand
-pub trait RunArgs {
+trait RunArgs {
     /// Runs command
     ///
     /// # Errors
@@ -218,7 +218,7 @@ fn main() -> Result<()> {
 /// # Errors
 /// Fails if submitting over network fails
 #[allow(clippy::shadow_unrelated)]
-pub fn submit(
+fn submit(
     instructions: impl Into<Executable>,
     metadata: UnlimitedMetadata,
     context: &mut dyn RunContext,
@@ -307,7 +307,7 @@ mod events {
         }
     }
 
-    pub fn listen(filter: FilterBox, context: &mut dyn RunContext) -> Result<()> {
+    fn listen(filter: FilterBox, context: &mut dyn RunContext) -> Result<()> {
         let iroha_client = Client::new(context.configuration())?;
         eprintln!("Listening to events with filter: {filter:?}");
         iroha_client
@@ -339,7 +339,7 @@ mod blocks {
         }
     }
 
-    pub fn listen(height: NonZeroU64, context: &mut dyn RunContext) -> Result<()> {
+    fn listen(height: NonZeroU64, context: &mut dyn RunContext) -> Result<()> {
         let iroha_client = Client::new(context.configuration())?;
         eprintln!("Listening to blocks from height: {height}");
         iroha_client
diff --git a/tools/kagami/src/main.rs b/tools/kagami/src/main.rs
index f34d3715774..f4ed9d40733 100644
--- a/tools/kagami/src/main.rs
+++ b/tools/kagami/src/main.rs
@@ -22,7 +22,7 @@ pub(crate) type Outcome = color_eyre::Result<()>;
 // The reason for hard-coding this default is to ensure that the
 // algorithm is matched to the public key in Ed25519 format. If
 // you need to change either, you should definitely change both.
-pub const DEFAULT_PUBLIC_KEY: &str =
+const DEFAULT_PUBLIC_KEY: &str =
     "ed01207233bfc89dcbd68c19fde6ce6158225298ec1131b6a130d1aeb454c1ab5183c0";
 
 fn main() -> Outcome {
@@ -33,7 +33,7 @@ fn main() -> Outcome {
 }
 
 /// Trait to encapsulate common attributes of the commands and sub-commands.
-pub trait RunArgs<T: Write> {
+trait RunArgs<T: Write> {
     /// Run the given command.
     ///
     /// # Errors
@@ -45,7 +45,7 @@ pub trait RunArgs<T: Write> {
 /// shipped with Iroha.
 #[derive(Parser, Debug)]
 #[command(name = "kagami", version, author)]
-pub enum Args {
+enum Args {
     /// Generate cryptographic key pairs using the given algorithm and either private key or seed
     Crypto(Box<crypto::Args>),
     /// Generate the schema used for code generation in Iroha SDKs