Removed modules for qr and stats that are now located in catalyst-too…

…lbox project

iapyx/src/bin/iapyx-load.rs

@@ -1,4 +1,6 @@
-use iapyx::cli::args::load::IapyxLoadCommand;
+mod load;
+
+use load::IapyxLoadCommand;
 use structopt::StructOpt;
 
 pub fn main() {

iapyx/src/bin/iapyx.rs

@@ -1,5 +1,6 @@
-use iapyx::cli::args::interactive::CliController;
-use iapyx::cli::args::interactive::IapyxCommand;
+mod interactive;
+
+use interactive::{CliController, IapyxCommand};
 use structopt::StructOpt;
 
 pub fn main() {

iapyx/src/cli/args/interactive/command.rs → iapyx/src/bin/interactive/command.rs

@@ -1,9 +1,11 @@
-use crate::cli::args::interactive::CliController;
+use super::CliController;
 use bech32::ToBase32;
 use catalyst_toolbox::kedqr::decode;
 use catalyst_toolbox::kedqr::KeyQrCode;
 use catalyst_toolbox::kedqr::KeyQrCodeError;
 use chain_impl_mockchain::block::BlockDate;
+use iapyx::ControllerBuilderError;
+use iapyx::ControllerError;
 use jcli_lib::key::read_bech32;
 use jormungandr_automation::jormungandr::RestError;
 use jormungandr_lib::crypto::hash::Hash;
@@ -314,32 +316,24 @@ impl BatchOfVotes {
 #[allow(clippy::large_enum_variant)]
 #[derive(Error, Debug)]
 pub enum IapyxCommandError {
-    #[error("{0}")]
-    GeneralError(String),
     #[error(transparent)]
-    ControllerError(#[from] crate::controller::ControllerError),
+    ControllerError(#[from] ControllerError),
     #[error(transparent)]
     Inner(#[from] thor::cli::Error),
     #[error(transparent)]
     CannotParseChoicesString(#[from] serde_json::Error),
-    #[error("no valid until defined")]
-    NoValidUntilDefined,
-    #[error("wallet not recovered or generated")]
-    WalletNotRecovered,
     #[error("wrong choice: {0}")]
     WrongChoice(String),
     #[error("cannot find proposal: {0}")]
     CannotFindProposal(String),
     #[error(transparent)]
-    ControllerBuilder(#[from] crate::controller::ControllerBuilderError),
+    ControllerBuilder(#[from] ControllerBuilderError),
     #[error(transparent)]
     Hash(#[from] chain_crypto::hash::Error),
     #[error(transparent)]
     Image(#[from] image::ImageError),
     #[error(transparent)]
-    Controller(#[from] crate::cli::args::interactive::Error),
-    #[error("there is no default alias defined in config nor provided as argument")]
-    AliasNotDefined,
+    Controller(#[from] super::Error),
     #[error(transparent)]
     Bech32(#[from] bech32::Error),
     #[error(transparent)]

iapyx/src/cli/args/interactive/mod.rs → iapyx/src/bin/interactive/mod.rs

@@ -1,13 +1,13 @@
 mod command;
 
-use crate::Controller;
-use crate::Wallet;
 use bech32::u5;
 use bech32::FromBase32;
 use chain_impl_mockchain::block::BlockDate;
 use chain_impl_mockchain::fragment::FragmentId;
 use cocoon::Cocoon;
 pub use command::{IapyxCommand, IapyxCommandError};
+use iapyx::Controller;
+use iapyx::Wallet;
 use jormungandr_automation::jormungandr::RestError;
 use jormungandr_lib::interfaces::AccountState;
 use jormungandr_lib::interfaces::AccountVotes;
@@ -27,6 +27,7 @@ use valgrind::SettingsExtensions;
 use valgrind::ValgrindClient;
 use wallet_core::Choice;
 use wallet_core::Value;
+
 pub struct CliController {
     pub inner: ThorCliController,
     pub backend_client: ValgrindClient,
@@ -140,21 +141,6 @@ impl CliController {
         self.inner.votes_history().map_err(Into::into)
     }
 
-    pub fn vote_for(
-        &mut self,
-        vote_plan_id: String,
-        proposal_index: u32,
-        choice: u8,
-        password: &str,
-    ) -> Result<FragmentId, Error> {
-        let id = self
-            .controller(password)?
-            .vote_for(vote_plan_id, proposal_index, choice)?;
-        let template = self.inner.wallets_mut().wallet_mut()?;
-        template.pending_tx.push(id.into());
-        Ok(id)
-    }
-
     pub fn vote(
         &mut self,
         proposal: &Proposal,
@@ -194,12 +180,8 @@ pub enum Error {
     Config(#[from] thor::cli::ConfigError),
     #[error(transparent)]
     Inner(#[from] thor::cli::Error),
-    #[error("cannot connect to backend under address: {0}, due to: {1:?}")]
-    Connection(String, valgrind::Error),
     #[error("cannot serialize secret key")]
     CannotrSerializeSecretKey(#[from] bincode::ErrorKind),
-    #[error("cannot read secret key")]
-    CannotReadSecretKey,
     #[error(transparent)]
     Bincode(#[from] Box<bincode::ErrorKind>),
     #[error("cannot read/write secret key")]
@@ -209,9 +191,9 @@ pub enum Error {
     #[error(transparent)]
     Backend(#[from] RestError),
     #[error(transparent)]
-    Controller(#[from] crate::controller::ControllerError),
+    Controller(#[from] iapyx::ControllerError),
     #[error(transparent)]
-    Wallet(#[from] crate::wallet::Error),
+    Wallet(#[from] iapyx::WalletError),
     #[error(transparent)]
     Read(#[from] chain_core::property::ReadError),
 }

iapyx/src/cli/args/load/burst/count.rs → iapyx/src/bin/load/burst/count.rs

@@ -1,7 +1,5 @@
-use crate::cli::args::load::build_monitor;
-use crate::cli::args::load::IapyxLoadCommandError;
-use crate::load::NodeLoad;
-use crate::load::NodeLoadConfig;
+use crate::load::{build_monitor, IapyxLoadCommandError};
+use iapyx::{NodeLoad, NodeLoadConfig};
 pub use jortestkit::console::progress_bar::{parse_progress_bar_mode_from_str, ProgressBarMode};
 use jortestkit::load::ConfigurationBuilder;
 use std::path::PathBuf;

iapyx/src/cli/args/load/burst/duration.rs → iapyx/src/bin/load/burst/duration.rs

@@ -1,7 +1,7 @@
-use crate::cli::args::load::build_monitor;
-use crate::cli::args::load::IapyxLoadCommandError;
-use crate::load::NodeLoad;
-use crate::load::NodeLoadConfig;
+use crate::load::build_monitor;
+use crate::load::IapyxLoadCommandError;
+use iapyx::NodeLoad;
+use iapyx::NodeLoadConfig;
 pub use jortestkit::console::progress_bar::{parse_progress_bar_mode_from_str, ProgressBarMode};
 use jortestkit::load::ConfigurationBuilder;
 use std::path::PathBuf;

iapyx/src/cli/args/load/burst/mod.rs → iapyx/src/bin/load/burst/mod.rs

@@ -1,7 +1,7 @@
 mod count;
 mod duration;
 
-use crate::cli::args::load::IapyxLoadCommandError;
+use crate::load::IapyxLoadCommandError;
 pub use count::BurstCountIapyxLoadCommand;
 pub use duration::BurstDurationIapyxLoadCommand;
 use structopt::StructOpt;

iapyx/src/cli/args/load/constant/count.rs → iapyx/src/bin/load/constant/count.rs

@@ -1,7 +1,7 @@
-use crate::cli::args::load::build_monitor;
-use crate::cli::args::load::IapyxLoadCommandError;
-use crate::load::NodeLoad;
-use crate::load::NodeLoadConfig;
+use crate::load::build_monitor;
+use crate::load::IapyxLoadCommandError;
+use iapyx::NodeLoad;
+use iapyx::NodeLoadConfig;
 pub use jortestkit::console::progress_bar::{parse_progress_bar_mode_from_str, ProgressBarMode};
 use jortestkit::load::ConfigurationBuilder;
 use std::path::PathBuf;

iapyx/src/cli/args/load/constant/duration.rs → iapyx/src/bin/load/constant/duration.rs

@@ -1,7 +1,7 @@
-use crate::cli::args::load::build_monitor;
-use crate::cli::args::load::IapyxLoadCommandError;
-use crate::load::NodeLoad;
-use crate::load::NodeLoadConfig;
+use crate::load::build_monitor;
+use crate::load::IapyxLoadCommandError;
+use iapyx::NodeLoad;
+use iapyx::NodeLoadConfig;
 pub use jortestkit::console::progress_bar::{parse_progress_bar_mode_from_str, ProgressBarMode};
 use jortestkit::load::ConfigurationBuilder;
 use std::path::PathBuf;

iapyx/src/cli/args/load/constant/mod.rs → iapyx/src/bin/load/constant/mod.rs

@@ -1,7 +1,7 @@
 mod count;
 mod duration;
 
-use crate::cli::args::load::IapyxLoadCommandError;
+use crate::load::IapyxLoadCommandError;
 pub use count::ConstantCountIapyxLoadCommand;
 pub use duration::ConstDurationIapyxLoadCommand;
 use structopt::StructOpt;

iapyx/src/cli/args/load/mod.rs → iapyx/src/bin/load/mod.rs

@@ -1,9 +1,12 @@
 mod burst;
 mod constant;
 
-use crate::load::{ArtificialUserLoad, MultiControllerError, NodeLoadError, ServicingStationLoad};
 use burst::BurstIapyxLoadCommand;
 use constant::ConstIapyxLoadCommand;
+use iapyx::ArtificialUserLoad;
+use iapyx::MultiControllerError;
+use iapyx::NodeLoadError;
+use iapyx::ServicingStationLoad;
 pub use jortestkit::console::progress_bar::{parse_progress_bar_mode_from_str, ProgressBarMode};
 use jortestkit::load::Monitor;
 use std::path::PathBuf;
@@ -12,18 +15,16 @@ use thiserror::Error;
 
 #[derive(Error, Debug)]
 pub enum IapyxLoadCommandError {
-    #[error("duration or requests per thread stategy has to be defined")]
-    NoStrategyDefined,
     #[error("load runner error")]
     NodeLoadError(#[from] NodeLoadError),
     #[error("internal error")]
     MultiControllerError(#[from] MultiControllerError),
     #[error("serialize error")]
     SerializeError(#[from] serde_json::Error),
     #[error("servicing station error")]
-    ServicingStationError(#[from] crate::load::ServicingStationLoadError),
+    ServicingStationError(#[from] iapyx::ServicingStationLoadError),
     #[error("artificial users error")]
-    ArtificialUserError(#[from] crate::load::ArtificialUserLoadError),
+    ArtificialUserError(#[from] iapyx::ArtificialUserLoadError),
     #[error(transparent)]
     Io(#[from] std::io::Error),
 }