From c327bebb7dacbe6eba22e7427291843568fc5b86 Mon Sep 17 00:00:00 2001 From: kukkok3 <93382903+kukkok3@users.noreply.github.com> Date: Wed, 21 Feb 2024 12:52:48 +0100 Subject: [PATCH] fix: lints --- src/vit-testing/iapyx/src/lib.rs | 3 ++- src/vit-testing/iapyx/src/load/mod.rs | 2 +- src/vit-testing/iapyx/src/load/scenario/node.rs | 2 +- src/vit-testing/vitup/src/builders/helpers/mod.rs | 4 ++-- src/vit-testing/vitup/src/builders/helpers/vote_plan.rs | 1 - src/vit-testing/vitup/src/builders/mod.rs | 6 +++--- src/vit-testing/vitup/src/cli/generate/data/mod.rs | 2 +- src/vit-testing/vitup/src/cli/start/quick.rs | 1 - src/vit-testing/vitup/src/config/builder.rs | 6 +----- src/vit-testing/vitup/src/mode/standard/controllers/main.rs | 6 +++--- src/vit-testing/vitup/src/mode/standard/controllers/mod.rs | 4 ++-- .../vitup/src/mode/standard/controllers/vit_station/mod.rs | 3 +-- 12 files changed, 17 insertions(+), 23 deletions(-) diff --git a/src/vit-testing/iapyx/src/lib.rs b/src/vit-testing/iapyx/src/lib.rs index ca4607fefc..b01b65f4cb 100644 --- a/src/vit-testing/iapyx/src/lib.rs +++ b/src/vit-testing/iapyx/src/lib.rs @@ -24,9 +24,10 @@ mod exports { }; pub use crate::load::{ ArtificialUserLoad, ArtificialUserLoadError, MultiController, MultiControllerError, - NodeLoad, NodeLoadConfig, NodeLoadError, ServicingStationLoad, ServicingStationLoadError, + NodeLoad, NodeLoadError, ServicingStationLoad, ServicingStationLoadError, VoteStatusProvider, WalletRequestGen, }; + pub use crate::utils::{expiry, qr}; pub use crate::wallet::{Error as WalletError, Wallet}; } diff --git a/src/vit-testing/iapyx/src/load/mod.rs b/src/vit-testing/iapyx/src/load/mod.rs index 1f7219037b..2de310eff5 100644 --- a/src/vit-testing/iapyx/src/load/mod.rs +++ b/src/vit-testing/iapyx/src/load/mod.rs @@ -1,4 +1,4 @@ -mod config; +pub mod config; mod multi_controller; mod request_generators; mod scenario; diff --git a/src/vit-testing/iapyx/src/load/scenario/node.rs b/src/vit-testing/iapyx/src/load/scenario/node.rs index 75d7ccf717..18d4a33eba 100644 --- a/src/vit-testing/iapyx/src/load/scenario/node.rs +++ b/src/vit-testing/iapyx/src/load/scenario/node.rs @@ -2,7 +2,7 @@ use crate::load::multi_controller::MultiControllerError; use crate::load::request_generators::RequestGenError; use crate::load::request_generators::{BatchWalletRequestGen, WalletRequestGen}; use crate::load::status_provider::VoteStatusProvider; -use crate::load::NodeLoadConfig; +use crate::NodeLoadConfig; use crate::NodeLoadError; use jortestkit::measurement::EfficiencyBenchmarkFinish; use thiserror::Error; diff --git a/src/vit-testing/vitup/src/builders/helpers/mod.rs b/src/vit-testing/vitup/src/builders/helpers/mod.rs index f359d46f1b..1b2dbc0341 100644 --- a/src/vit-testing/vitup/src/builders/helpers/mod.rs +++ b/src/vit-testing/vitup/src/builders/helpers/mod.rs @@ -1,8 +1,8 @@ mod archive; -mod qr; +pub mod qr; mod static_data; mod time; -mod vote_plan; +pub mod vote_plan; pub use self::time::{convert_to_blockchain_date, convert_to_human_date}; pub use archive::{ diff --git a/src/vit-testing/vitup/src/builders/helpers/vote_plan.rs b/src/vit-testing/vitup/src/builders/helpers/vote_plan.rs index 4cc6262914..95baca98dc 100644 --- a/src/vit-testing/vitup/src/builders/helpers/vote_plan.rs +++ b/src/vit-testing/vitup/src/builders/helpers/vote_plan.rs @@ -4,7 +4,6 @@ use chain_impl_mockchain::testing::scenario::template::ProposalDefBuilder; use chain_impl_mockchain::testing::TestGen; use hersir::builder::VotePlanKey; use hersir::config::{CommitteeTemplate, PrivateParameters, VotePlanTemplate}; -pub use jormungandr_lib::interfaces::Initial; use jormungandr_lib::interfaces::{BlockDate, TokenIdentifier}; use std::iter; diff --git a/src/vit-testing/vitup/src/builders/mod.rs b/src/vit-testing/vitup/src/builders/mod.rs index 1bee475d92..831fe63ce5 100644 --- a/src/vit-testing/vitup/src/builders/mod.rs +++ b/src/vit-testing/vitup/src/builders/mod.rs @@ -1,7 +1,8 @@ -mod helpers; +pub mod helpers; mod reviews; pub mod utils; +use crate::builders::helpers::VitVotePlanDefBuilder; pub use crate::builders::helpers::{build_current_fund, build_servicing_station_parameters}; use crate::builders::utils::DeploymentTree; use crate::config; @@ -17,14 +18,13 @@ use config::Block0Initial::Wallet; pub use helpers::{ convert_to_blockchain_date, convert_to_human_date, discover_archive_input_files, generate_qr_and_hashes, get_configuration_from_file_url, ArchiveConfError, - ArchiveConfiguration, VitVotePlanDefBuilder, WalletExtension, + ArchiveConfiguration, }; use hersir::builder::settings::Blockchain; use hersir::builder::Node; use hersir::builder::Topology; use hersir::config::{CommitteeTemplate, ExplorerTemplate, SessionSettings, WalletTemplate}; use jormungandr_automation::jormungandr::PersistenceMode; -pub use jormungandr_lib::interfaces::Initial; use jormungandr_lib::interfaces::NumberOfSlotsPerEpoch; use jormungandr_lib::interfaces::SlotDuration; use jormungandr_lib::interfaces::TokenIdentifier as TokenIdentifierLib; diff --git a/src/vit-testing/vitup/src/cli/generate/data/mod.rs b/src/vit-testing/vitup/src/cli/generate/data/mod.rs index b5d3dce9e9..e23d3d248e 100644 --- a/src/vit-testing/vitup/src/cli/generate/data/mod.rs +++ b/src/vit-testing/vitup/src/cli/generate/data/mod.rs @@ -4,7 +4,7 @@ mod random; use crate::Result; pub use external::ExternalDataCommandArgs; -pub use jormungandr_lib::interfaces::Initial; + pub use perf::PerfDataCommandArgs; pub use random::{ AllRandomDataCommandArgs, RandomReviewsDataCommandArgs, RandomScoresDataCommandArgs, diff --git a/src/vit-testing/vitup/src/cli/start/quick.rs b/src/vit-testing/vitup/src/cli/start/quick.rs index b54d422144..e39face6d9 100644 --- a/src/vit-testing/vitup/src/cli/start/quick.rs +++ b/src/vit-testing/vitup/src/cli/start/quick.rs @@ -1,5 +1,4 @@ use crate::builders::utils::logger; -pub use crate::builders::{VitBackendSettingsBuilder, FOLLOWER, LEADER_1, LEADER_2, LEADER_3}; use crate::config::read_voter_hirs; use crate::config::ConfigBuilder; use crate::config::{ diff --git a/src/vit-testing/vitup/src/config/builder.rs b/src/vit-testing/vitup/src/config/builder.rs index d05e516cc6..594791bf48 100644 --- a/src/vit-testing/vitup/src/config/builder.rs +++ b/src/vit-testing/vitup/src/config/builder.rs @@ -1,8 +1,4 @@ -pub use crate::builders::ReviewGenerator; -pub use crate::builders::{ - convert_to_blockchain_date, convert_to_human_date, generate_qr_and_hashes, - VitVotePlanDefBuilder, WalletExtension, -}; +pub use crate::builders::convert_to_human_date; use crate::config::Block0Initials; use crate::config::{date_format, Initials}; use crate::config::{Config, VoteTime}; diff --git a/src/vit-testing/vitup/src/mode/standard/controllers/main.rs b/src/vit-testing/vitup/src/mode/standard/controllers/main.rs index 9bc3cf4cd4..9daefb5310 100644 --- a/src/vit-testing/vitup/src/mode/standard/controllers/main.rs +++ b/src/vit-testing/vitup/src/mode/standard/controllers/main.rs @@ -1,9 +1,9 @@ use super::{ super::VitSettings, vit_station::{ - dump_settings_to_file, BootstrapCommandBuilder, DbGenerator, - Error as VitStationControllerError, RestClient, ValidVotePlanParameters, - ValidVotingTemplateGenerator, VitStationController, VIT_CONFIG, + controller::VitStationController, controller::VIT_CONFIG, dump_settings_to_file, + BootstrapCommandBuilder, DbGenerator, Error as VitStationControllerError, RestClient, + ValidVotePlanParameters, ValidVotingTemplateGenerator, }, wallet_proxy::{Error as WalletProxyError, WalletProxyController, WalletProxySpawnParams}, }; diff --git a/src/vit-testing/vitup/src/mode/standard/controllers/mod.rs b/src/vit-testing/vitup/src/mode/standard/controllers/mod.rs index 85b8e47e70..1535307566 100644 --- a/src/vit-testing/vitup/src/mode/standard/controllers/mod.rs +++ b/src/vit-testing/vitup/src/mode/standard/controllers/mod.rs @@ -1,12 +1,12 @@ mod explorer; mod main; -mod vit_station; +pub mod vit_station; mod wallet_proxy; pub use vit_station::{ + controller::VitStationController, controller::VitStationSettings, controller::VIT_CONFIG, generate_database, generate_random_database, DataError, DbGenerator, Error as VitStationControllerError, ValidVotePlanParameters, ValidVotingTemplateGenerator, - VitStationController, VitStationSettings, }; pub use wallet_proxy::{ diff --git a/src/vit-testing/vitup/src/mode/standard/controllers/vit_station/mod.rs b/src/vit-testing/vitup/src/mode/standard/controllers/vit_station/mod.rs index 602bcca415..0d8128c7db 100644 --- a/src/vit-testing/vitup/src/mode/standard/controllers/vit_station/mod.rs +++ b/src/vit-testing/vitup/src/mode/standard/controllers/vit_station/mod.rs @@ -1,4 +1,4 @@ -mod controller; +pub mod controller; mod data; pub use vit_servicing_station_tests::common::{ @@ -12,7 +12,6 @@ pub use vit_servicing_station_tests::common::{ pub use vit_servicing_station_lib::server::settings::dump_settings_to_file; -pub use controller::{VitStationController, VitStationSettings, VIT_CONFIG, VIT_STATION_LOG}; pub use data::{generate_database, generate_random_database, DbGenerator, Error as DataError}; use std::time::Duration; pub type Result = std::result::Result;