Move client cli commands module declaration to its lib.rs

Reverting a change that was made when we worked on the first client
library version to remove the lib api the code only needed by the binary.

Author: Alenar

mithril-client-cli/src/commands/mithril_stake_distribution/download.rs

@@ -8,8 +8,8 @@ use std::{
     sync::Arc,
 };
 
+use crate::{configuration::ConfigParameters, utils::ExpanderUtils};
 use mithril_client::{ClientBuilder, MessageBuilder};
-use mithril_client_cli::{configuration::ConfigParameters, utils::ExpanderUtils};
 use mithril_common::StdResult;
 
 /// Download and verify a Mithril Stake Distribution information. If the

mithril-client-cli/src/commands/mithril_stake_distribution/list.rs

@@ -4,8 +4,8 @@ use config::{builder::DefaultState, ConfigBuilder};
 use slog_scope::logger;
 use std::{collections::HashMap, sync::Arc};
 
+use crate::configuration::ConfigParameters;
 use mithril_client::ClientBuilder;
-use mithril_client_cli::configuration::ConfigParameters;
 use mithril_common::{test_utils::fake_keys, StdResult};
 
 /// Mithril stake distribution LIST command

mithril-client-cli/src/commands/snapshot/download.rs

@@ -10,16 +10,16 @@ use std::{
     sync::Arc,
 };
 
-use mithril_client::{
-    common::ProtocolMessage, Client, ClientBuilder, MessageBuilder, MithrilCertificate, Snapshot,
-};
-use mithril_client_cli::{
+use crate::{
     configuration::ConfigParameters,
     utils::{
         ExpanderUtils, IndicatifFeedbackReceiver, ProgressOutputType, ProgressPrinter,
         SnapshotUnpacker, SnapshotUtils,
     },
 };
+use mithril_client::{
+    common::ProtocolMessage, Client, ClientBuilder, MessageBuilder, MithrilCertificate, Snapshot,
+};
 use mithril_common::StdResult;
 
 /// Clap command to download the snapshot and verify the certificate.

mithril-client-cli/src/commands/snapshot/list.rs

@@ -4,8 +4,8 @@ use config::{builder::DefaultState, ConfigBuilder};
 use slog_scope::logger;
 use std::{collections::HashMap, sync::Arc};
 
+use crate::configuration::ConfigParameters;
 use mithril_client::ClientBuilder;
-use mithril_client_cli::configuration::ConfigParameters;
 use mithril_common::{test_utils::fake_keys, StdResult};
 
 /// Clap command to list existing snapshots

mithril-client-cli/src/commands/snapshot/show.rs

@@ -5,8 +5,8 @@ use config::{builder::DefaultState, ConfigBuilder};
 use slog_scope::logger;
 use std::{collections::HashMap, sync::Arc};
 
+use crate::{configuration::ConfigParameters, utils::ExpanderUtils};
 use mithril_client::ClientBuilder;
-use mithril_client_cli::{configuration::ConfigParameters, utils::ExpanderUtils};
 use mithril_common::{test_utils::fake_keys, StdResult};
 
 /// Clap command to show a given snapshot

mithril-client-cli/src/lib.rs

@@ -7,5 +7,6 @@
 //
 //! You can find more information on how it works reading the [documentation website](https://mithril.network/doc/mithril/mithril-network/client).
 
-pub mod configuration;
-pub mod utils;
+pub mod commands;
+mod configuration;
+mod utils;

mithril-client-cli/src/main.rs

@@ -1,7 +1,5 @@
 #![doc = include_str!("../README.md")]
 
-mod commands;
-
 use anyhow::Context;
 use clap::{Parser, Subcommand};
 use config::{builder::DefaultState, ConfigBuilder, Map, Source, Value, ValueKind};
@@ -15,7 +13,7 @@ use std::{fs::File, path::PathBuf};
 
 use mithril_common::StdResult;
 
-use commands::{
+use mithril_client_cli::commands::{
     mithril_stake_distribution::MithrilStakeDistributionCommands, snapshot::SnapshotCommands,
 };