move entire load module to mjolnir

testing/jormungandr-integration-tests/Cargo.toml

@@ -20,6 +20,7 @@ chain-time      = { git = "https://github.com/input-output-hk/chain-libs.git", b
 chain-vote      = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" }
 jormungandr-lib = { path = "../../jormungandr-lib" }
 hersir = { path = "../hersir" }
+mjolnir = { path = "../mjolnir" }
 jormungandr-testing-utils = { path = "../jormungandr-testing-utils" }
 jortestkit = { git = "https://github.com/input-output-hk/jortestkit.git", branch = "master" }
 rand = "0.8"

testing/jormungandr-integration-tests/src/jormungandr/fragments.rs

@@ -3,9 +3,9 @@ use jormungandr_testing_utils::testing::{jormungandr::ConfigurationBuilder, star
 use chain_impl_mockchain::{chaintypes::ConsensusType, fee::LinearFee};
 use jormungandr_lib::interfaces::{ActiveSlotCoefficient, BlockDate, Mempool};
 use jormungandr_testing_utils::testing::{
-    node::time, FragmentGenerator, FragmentSender, FragmentSenderSetup, FragmentVerifier,
-    MemPoolCheck,
+    node::time, FragmentSender, FragmentSenderSetup, FragmentVerifier, MemPoolCheck,
 };
+use mjolnir::generators::FragmentGenerator;
 use std::time::Duration;
 
 #[test]

testing/jormungandr-integration-tests/src/jormungandr/mempool.rs

@@ -17,9 +17,10 @@ use jormungandr_testing_utils::testing::{
     },
     node::time,
     startup, AdversaryFragmentSender, AdversaryFragmentSenderSetup, BlockDateGenerator,
-    FragmentBuilder, FragmentGenerator, FragmentNode, FragmentSender, FragmentSenderSetup,
-    FragmentVerifier, MemPoolCheck,
+    FragmentBuilder, FragmentNode, FragmentSender, FragmentSenderSetup, FragmentVerifier,
+    MemPoolCheck,
 };
+use mjolnir::generators::FragmentGenerator;
 use std::fs::metadata;
 use std::path::Path;
 use std::thread::sleep;

testing/jormungandr-integration-tests/src/non_functional/fragment.rs

@@ -3,18 +3,19 @@ use jormungandr_lib::interfaces::{
     ActiveSlotCoefficient, BlockDate as BlockDateDto, KesUpdateSpeed,
 };
 use jormungandr_testing_utils::testing::{
-    fragments::TransactionGenerator,
     jcli::{FragmentsCheck, JCli},
     jormungandr::ConfigurationBuilder,
     node::time,
-    startup, BatchFragmentGenerator, BlockDateGenerator, FragmentGenerator, FragmentSender,
-    FragmentSenderSetup, FragmentStatusProvider,
+    startup, BlockDateGenerator, FragmentSender, FragmentSenderSetup,
 };
 pub use jortestkit::{
     console::progress_bar::{parse_progress_bar_mode_from_str, ProgressBarMode},
     load::{self, ConfigurationBuilder as LoadConfigurationBuilder, Monitor},
     prelude::Wait,
 };
+use mjolnir::generators::{
+    BatchFragmentGenerator, FragmentGenerator, FragmentStatusProvider, TransactionGenerator,
+};
 use std::time::Duration;
 
 #[test]

testing/jormungandr-integration-tests/src/non_functional/persistent_log.rs

@@ -4,13 +4,14 @@ use assert_fs::{fixture::PathChild, TempDir};
 use chain_impl_mockchain::block::BlockDate;
 use jormungandr_lib::interfaces::{Mempool, PersistentLog};
 use jormungandr_testing_utils::testing::{
-    fragments::PersistentLogViewer, jormungandr::ConfigurationBuilder, startup,
-    BatchFragmentGenerator, BlockDateGenerator, FragmentSenderSetup, FragmentStatusProvider,
+    fragments::PersistentLogViewer, jormungandr::ConfigurationBuilder, startup, BlockDateGenerator,
+    FragmentSenderSetup,
 };
 pub use jortestkit::{
     console::progress_bar::{parse_progress_bar_mode_from_str, ProgressBarMode},
     load::{self, ConfigurationBuilder as LoadConfigurationBuilder, Monitor},
 };
+use mjolnir::generators::{BatchFragmentGenerator, FragmentStatusProvider};
 
 #[test]
 pub fn persistent_log_load_test() {

testing/jormungandr-integration-tests/src/non_functional/voting/private/mod.rs

@@ -15,15 +15,11 @@ use chain_impl_mockchain::{
     value::Value,
 };
 use jormungandr_lib::interfaces::BlockDate as BlockDateLib;
-use jormungandr_testing_utils::testing::fragments::AdversaryFragmentGenerator;
 use jormungandr_testing_utils::testing::jormungandr::{ConfigurationBuilder, Starter};
 use jormungandr_testing_utils::testing::AdversaryFragmentSender;
 use jormungandr_testing_utils::testing::AdversaryFragmentSenderSetup;
 use jormungandr_testing_utils::testing::BlockDateGenerator;
-use jormungandr_testing_utils::testing::VoteCastsGenerator;
-use jormungandr_testing_utils::testing::{
-    benchmark_consumption, FragmentStatusProvider, VotePlanBuilder,
-};
+use jormungandr_testing_utils::testing::{benchmark_consumption, VotePlanBuilder};
 use jormungandr_testing_utils::{
     testing::{
         node::time::{wait_for_date, wait_for_epoch},
@@ -33,6 +29,7 @@ use jormungandr_testing_utils::{
 };
 use jortestkit::load::Configuration;
 use jortestkit::measurement::Status;
+use mjolnir::generators::{AdversaryFragmentGenerator, FragmentStatusProvider, VoteCastsGenerator};
 use rand::rngs::OsRng;
 
 const CRS_SEED: &[u8] = "Testing seed".as_bytes();

testing/jormungandr-integration-tests/src/non_functional/voting/public/mod.rs

@@ -12,21 +12,18 @@ use chain_impl_mockchain::{
     ledger::governance::TreasuryGovernanceAction,
     value::Value,
 };
-use jormungandr_testing_utils::testing::fragments::AdversaryFragmentGenerator;
 use jormungandr_testing_utils::testing::jormungandr::{ConfigurationBuilder, Starter};
 use jormungandr_testing_utils::testing::AdversaryFragmentSender;
 use jormungandr_testing_utils::testing::AdversaryFragmentSenderSetup;
 use jormungandr_testing_utils::testing::BlockDateGenerator;
-use jormungandr_testing_utils::testing::VoteCastsGenerator;
-use jormungandr_testing_utils::testing::{
-    benchmark_consumption, FragmentStatusProvider, VotePlanBuilder,
-};
+use jormungandr_testing_utils::testing::{benchmark_consumption, VotePlanBuilder};
 use jormungandr_testing_utils::{
     testing::{node::time::wait_for_epoch, vote_plan_cert, FragmentSender, FragmentSenderSetup},
     wallet::Wallet,
 };
 use jortestkit::load::Configuration;
 use jortestkit::measurement::Status;
+use mjolnir::generators::{AdversaryFragmentGenerator, FragmentStatusProvider, VoteCastsGenerator};
 use rand::rngs::OsRng;
 
 pub fn public_vote_load_scenario(quick_config: PublicVotingLoadTestConfig) {

testing/jormungandr-testing-utils/src/testing/fragments/mod.rs

@@ -5,7 +5,6 @@ pub use self::{
     },
     chain_sender::FragmentChainSender,
     export::{FragmentExporter, FragmentExporterError},
-    generator::FragmentGenerator,
     initial_certificates::{signed_delegation_cert, signed_stake_pool_cert, vote_plan_cert},
     node::{FragmentNode, FragmentNodeError, MemPoolCheck},
     persistent_log::{write_into_persistent_log, PersistentLogViewer},
@@ -31,20 +30,14 @@ use jormungandr_lib::{
     crypto::hash::Hash,
     interfaces::{Address, Initial, Value},
 };
-pub use load::{
-    AdversaryFragmentGenerator, AdversaryVoteCastsGenerator, BatchFragmentGenerator,
-    FragmentStatusProvider, TransactionGenerator, VoteCastsGenerator,
-};
 use rand_chacha::ChaCha20Rng;
 use rand_core::SeedableRng;
 use thiserror::Error;
 
 mod adversary;
 mod chain_sender;
 mod export;
-mod generator;
 mod initial_certificates;
-mod load;
 mod node;
 mod persistent_log;
 mod sender;

testing/jormungandr-testing-utils/src/testing/mod.rs

@@ -20,13 +20,11 @@ pub mod vit;
 pub mod witness;
 
 pub use fragments::{
-    signed_delegation_cert, signed_stake_pool_cert, vote_plan_cert, AdversaryFragmentGenerator,
-    AdversaryFragmentSender, AdversaryFragmentSenderError, AdversaryFragmentSenderSetup,
-    AdversaryVoteCastsGenerator, BatchFragmentGenerator, BlockDateGenerator, DummySyncNode,
-    FragmentBuilder, FragmentBuilderError, FragmentChainSender, FragmentGenerator, FragmentNode,
-    FragmentNodeError, FragmentSender, FragmentSenderError, FragmentSenderSetup,
-    FragmentSenderSetupBuilder, FragmentStatusProvider, FragmentVerifier, FragmentVerifierError,
-    MemPoolCheck, VerifyStrategy, VoteCastsGenerator,
+    signed_delegation_cert, signed_stake_pool_cert, vote_plan_cert, AdversaryFragmentSender,
+    AdversaryFragmentSenderError, AdversaryFragmentSenderSetup, BlockDateGenerator, DummySyncNode,
+    FragmentBuilder, FragmentBuilderError, FragmentChainSender, FragmentNode, FragmentNodeError,
+    FragmentSender, FragmentSenderError, FragmentSenderSetup, FragmentSenderSetupBuilder,
+    FragmentVerifier, FragmentVerifierError, MemPoolCheck, VerifyStrategy,
 };
 pub use jortestkit::archive::decompress;
 pub use jortestkit::github::{CachedReleases, GitHubApiBuilder, GitHubApiError, Release};

testing/mjolnir/Cargo.toml

@@ -10,7 +10,8 @@ edition = "2018"
 jormungandr-lib = { path = "../../jormungandr-lib" }
 jortestkit = { git = "https://github.com/input-output-hk/jortestkit.git", branch = "master" }
 jormungandr-testing-utils = { path = "../jormungandr-testing-utils" }
-jormungandr-integration-tests = { path = "../jormungandr-integration-tests" }
+rand_core = "0.6"
+rand = "0.8"
 thiserror = "1.0"
 structopt = "^0.3"
 assert_fs = "1.0"

testing/mjolnir/src/lib.rs

@@ -0,0 +1,2 @@
+pub mod mjolnir_lib;
+pub use crate::mjolnir_lib::*;

testing/mjolnir/src/main.rs

@@ -1,12 +1,9 @@
-mod mjolnir_app;
-
+use mjolnir::Mjolnir;
 use std::error::Error;
 use structopt::StructOpt;
 
 fn main() {
-    mjolnir_app::Mjolnir::from_args()
-        .exec()
-        .unwrap_or_else(report_error)
+    Mjolnir::from_args().exec().unwrap_or_else(report_error)
 }
 
 fn report_error(error: Box<dyn Error>) {

testing/mjolnir/src/mjolnir_app/bootstrap/config.rs → testing/mjolnir/src/mjolnir_lib/bootstrap/config.rs

@@ -1,4 +1,4 @@
-use crate::mjolnir_app::{
+use crate::mjolnir_lib::{
     bootstrap::scenario::{DurationBasedClientLoad, IterationBasedClientLoad},
     MjolnirError,
 };

testing/mjolnir/src/mjolnir_app/bootstrap/mod.rs → testing/mjolnir/src/mjolnir_lib/bootstrap/mod.rs

@@ -1,7 +1,7 @@
 mod config;
 mod scenario;
 
-use crate::mjolnir_app::MjolnirError;
+use crate::mjolnir_lib::MjolnirError;
 use chain_impl_mockchain::key::Hash;
 use config::{ClientLoadConfig, PassiveBootstrapLoad, ScenarioType};
 use jormungandr_testing_utils::testing::node::grpc::client::JormungandrClient;

testing/mjolnir/src/mjolnir_app/bootstrap/scenario/duration.rs → testing/mjolnir/src/mjolnir_lib/bootstrap/scenario/duration.rs

@@ -6,8 +6,8 @@ use jormungandr_testing_utils::testing::{
     benchmark_speed, node::LogLevel, SpeedBenchmarkFinish, SpeedBenchmarkRun,
 };
 
-use crate::mjolnir_app::bootstrap::ClientLoadConfig;
-use crate::mjolnir_app::MjolnirError;
+use crate::mjolnir_lib::bootstrap::ClientLoadConfig;
+use crate::mjolnir_lib::MjolnirError;
 use jormungandr_testing_utils::testing::jormungandr::JormungandrProcess;
 use std::{
     thread,

testing/mjolnir/src/mjolnir_app/bootstrap/scenario/iteration.rs → testing/mjolnir/src/mjolnir_lib/bootstrap/scenario/iteration.rs

@@ -1,6 +1,6 @@
 use super::ScenarioProgressBar;
-use crate::mjolnir_app::bootstrap::ClientLoadConfig;
-use crate::mjolnir_app::MjolnirError;
+use crate::mjolnir_lib::bootstrap::ClientLoadConfig;
+use crate::mjolnir_lib::MjolnirError;
 use assert_fs::TempDir;
 use indicatif::{MultiProgress, ProgressBar};
 use jormungandr_lib::interfaces::NodeState;

testing/mjolnir/src/mjolnir_app/explorer.rs → testing/mjolnir/src/mjolnir_lib/explorer.rs

@@ -1,4 +1,4 @@
-use crate::mjolnir_app::MjolnirError;
+use crate::mjolnir_lib::MjolnirError;
 use jormungandr_testing_utils::testing::node::{explorer::load::ExplorerRequestGen, Explorer};
 use jortestkit::{
     load::{ConfigurationBuilder, Monitor},

testing/mjolnir/src/mjolnir_app/fragment/batch/adversary/all.rs → testing/mjolnir/src/mjolnir_lib/fragment/batch/adversary/all.rs

@@ -1,11 +1,12 @@
-use crate::mjolnir_app::{args::parse_shift, build_monitor, MjolnirError};
+use crate::generators::AdversaryFragmentGenerator;
+use crate::generators::FragmentStatusProvider;
+use crate::{args::parse_shift, build_monitor, MjolnirError};
 use chain_impl_mockchain::block::BlockDate;
 use jormungandr_lib::crypto::hash::Hash;
 use jormungandr_testing_utils::{
     testing::{
-        fragments::{AdversaryFragmentGenerator, BlockDateGenerator},
-        AdversaryFragmentSender, AdversaryFragmentSenderSetup, FragmentSender, FragmentSenderSetup,
-        FragmentStatusProvider, RemoteJormungandrBuilder,
+        fragments::BlockDateGenerator, AdversaryFragmentSender, AdversaryFragmentSenderSetup,
+        FragmentSender, FragmentSenderSetup, RemoteJormungandrBuilder,
     },
     wallet::Wallet,
 };

testing/mjolnir/src/mjolnir_app/fragment/batch/adversary/mod.rs → testing/mjolnir/src/mjolnir_lib/fragment/batch/adversary/mod.rs

@@ -1,7 +1,7 @@
 mod all;
 mod votes_only;
 
-use crate::mjolnir_app::MjolnirError;
+use crate::mjolnir_lib::MjolnirError;
 use structopt::StructOpt;
 pub use votes_only::VotesOnly;
 #[derive(StructOpt, Debug)]

testing/mjolnir/src/mjolnir_app/fragment/batch/adversary/votes_only.rs → testing/mjolnir/src/mjolnir_lib/fragment/batch/adversary/votes_only.rs

@@ -1,12 +1,13 @@
-use crate::mjolnir_app::{args::parse_shift, build_monitor, MjolnirError};
+use crate::generators::AdversaryVoteCastsGenerator;
+use crate::generators::FragmentStatusProvider;
+use crate::mjolnir_lib::{args::parse_shift, build_monitor, MjolnirError};
 use chain_impl_mockchain::block::BlockDate;
 use jormungandr_lib::crypto::hash::Hash;
 use jormungandr_testing_utils::{
     testing::{
         block0::{get_block, Block0ConfigurationExtension},
         fragments::BlockDateGenerator,
-        AdversaryVoteCastsGenerator, FragmentSender, FragmentSenderSetup, FragmentStatusProvider,
-        RemoteJormungandrBuilder,
+        FragmentSender, FragmentSenderSetup, RemoteJormungandrBuilder,
     },
     wallet::Wallet,
 };

testing/mjolnir/src/mjolnir_app/fragment/batch/mod.rs → testing/mjolnir/src/mjolnir_lib/fragment/batch/mod.rs

@@ -1,7 +1,7 @@
 mod adversary;
 mod tx_only;
 
-use crate::mjolnir_app::MjolnirError;
+use crate::mjolnir_lib::MjolnirError;
 use structopt::StructOpt;
 pub use tx_only::TxOnly;
 #[derive(StructOpt, Debug)]

testing/mjolnir/src/mjolnir_app/fragment/batch/tx_only.rs → testing/mjolnir/src/mjolnir_lib/fragment/batch/tx_only.rs

@@ -1,11 +1,10 @@
-use crate::mjolnir_app::{args::parse_shift, build_monitor, MjolnirError};
+use crate::generators::BatchFragmentGenerator;
+use crate::generators::FragmentStatusProvider;
+use crate::mjolnir_lib::{args::parse_shift, build_monitor, MjolnirError};
 use chain_impl_mockchain::block::BlockDate;
 use jormungandr_lib::crypto::hash::Hash;
 use jormungandr_testing_utils::{
-    testing::{
-        fragments::BlockDateGenerator, BatchFragmentGenerator, FragmentSenderSetup,
-        FragmentStatusProvider, RemoteJormungandrBuilder,
-    },
+    testing::{fragments::BlockDateGenerator, FragmentSenderSetup, RemoteJormungandrBuilder},
     wallet::Wallet,
 };
 use jortestkit::{

testing/mjolnir/src/mjolnir_app/fragment/mod.rs → testing/mjolnir/src/mjolnir_lib/fragment/mod.rs

@@ -1,4 +1,4 @@
-use crate::mjolnir_app::MjolnirError;
+use crate::mjolnir_lib::MjolnirError;
 use structopt::StructOpt;
 use thiserror::Error;
 

testing/mjolnir/src/mjolnir_app/fragment/standard/adversary/all.rs → testing/mjolnir/src/mjolnir_lib/fragment/standard/adversary/all.rs

@@ -1,11 +1,12 @@
-use crate::mjolnir_app::{args::parse_shift, build_monitor, MjolnirError};
+use crate::generators::AdversaryFragmentGenerator;
+use crate::generators::FragmentStatusProvider;
+use crate::mjolnir_lib::{args::parse_shift, build_monitor, MjolnirError};
 use chain_impl_mockchain::block::BlockDate;
 use jormungandr_lib::crypto::hash::Hash;
 use jormungandr_testing_utils::{
     testing::{
-        fragments::{AdversaryFragmentGenerator, BlockDateGenerator},
-        AdversaryFragmentSender, AdversaryFragmentSenderSetup, FragmentSender, FragmentSenderSetup,
-        FragmentStatusProvider, RemoteJormungandrBuilder,
+        fragments::BlockDateGenerator, AdversaryFragmentSender, AdversaryFragmentSenderSetup,
+        FragmentSender, FragmentSenderSetup, RemoteJormungandrBuilder,
     },
     wallet::Wallet,
 };

testing/mjolnir/src/mjolnir_app/fragment/standard/adversary/mod.rs → testing/mjolnir/src/mjolnir_lib/fragment/standard/adversary/mod.rs

@@ -1,7 +1,7 @@
 mod all;
 mod votes_only;
 
-use crate::mjolnir_app::MjolnirError;
+use crate::mjolnir_lib::MjolnirError;
 use structopt::StructOpt;
 pub use votes_only::VotesOnly;
 

testing/mjolnir/src/mjolnir_app/fragment/standard/adversary/votes_only.rs → testing/mjolnir/src/mjolnir_lib/fragment/standard/adversary/votes_only.rs

@@ -1,12 +1,13 @@
-use crate::mjolnir_app::{args::parse_shift, build_monitor, MjolnirError};
+use crate::generators::AdversaryVoteCastsGenerator;
+use crate::generators::FragmentStatusProvider;
+use crate::mjolnir_lib::{args::parse_shift, build_monitor, MjolnirError};
 use chain_impl_mockchain::block::BlockDate;
 use jormungandr_lib::crypto::hash::Hash;
 use jormungandr_testing_utils::{
     testing::{
         block0::{get_block, Block0ConfigurationExtension},
         fragments::BlockDateGenerator,
-        AdversaryVoteCastsGenerator, FragmentSender, FragmentSenderSetup, FragmentStatusProvider,
-        RemoteJormungandrBuilder,
+        FragmentSender, FragmentSenderSetup, RemoteJormungandrBuilder,
     },
     wallet::Wallet,
 };

testing/mjolnir/src/mjolnir_app/fragment/standard/all.rs → testing/mjolnir/src/mjolnir_lib/fragment/standard/all.rs

@@ -1,10 +1,12 @@
-use crate::mjolnir_app::{args::parse_shift, build_monitor, MjolnirError};
+use crate::generators::FragmentGenerator;
+use crate::generators::FragmentStatusProvider;
+use crate::mjolnir_lib::{args::parse_shift, build_monitor, MjolnirError};
 use chain_impl_mockchain::block::BlockDate;
 use jormungandr_lib::crypto::hash::Hash;
 use jormungandr_testing_utils::{
     testing::{
-        fragments::BlockDateGenerator, node::time, startup, FragmentGenerator, FragmentSender,
-        FragmentSenderSetup, FragmentStatusProvider, RemoteJormungandrBuilder,
+        fragments::BlockDateGenerator, node::time, startup, FragmentSender, FragmentSenderSetup,
+        RemoteJormungandrBuilder,
     },
     wallet::Wallet,
 };