refactor CommitteeData in thor in order to allow to specify external …

…CommitteKeys
input-output-hk · Sep 23, 2022 · 57ec715 · 57ec715
1 parent 983a37c
commit 57ec715
Show file tree

Hide file tree

Showing 14 changed files with 410 additions and 260 deletions.
diff --git a/testing/mjolnir/src/mjolnir_lib/fragment/batch/adversary/all.rs b/testing/mjolnir/src/mjolnir_lib/fragment/batch/adversary/all.rs
@@ -2,7 +2,6 @@ use crate::{
     args::parse_shift,
     build_monitor,
     generators::{AdversaryFragmentGenerator, FragmentStatusProvider},
-    mjolnir_lib::DiscriminationExtensions,
     MjolnirError,
 };
 use chain_addr::Discrimination;
@@ -16,7 +15,9 @@ use jortestkit::{
 use loki::{AdversaryFragmentSender, AdversaryFragmentSenderSetup};
 use std::{path::PathBuf, str::FromStr, time::Duration};
 use structopt::StructOpt;
-use thor::{BlockDateGenerator, FragmentSender, FragmentSenderSetup, Wallet};
+use thor::{
+    BlockDateGenerator, DiscriminationExtension, FragmentSender, FragmentSenderSetup, Wallet,
+};
 #[derive(StructOpt, Debug)]
 pub struct AdversaryAll {
     /// Number of threads

diff --git a/testing/mjolnir/src/mjolnir_lib/fragment/batch/adversary/votes_only.rs b/testing/mjolnir/src/mjolnir_lib/fragment/batch/adversary/votes_only.rs
@@ -1,6 +1,6 @@
 use crate::{
     generators::{AdversaryVoteCastsGenerator, FragmentStatusProvider},
-    mjolnir_lib::{args::parse_shift, build_monitor, DiscriminationExtensions, MjolnirError},
+    mjolnir_lib::{args::parse_shift, build_monitor, MjolnirError},
 };
 use chain_addr::Discrimination;
 use chain_impl_mockchain::block::BlockDate;
@@ -15,7 +15,9 @@ use jortestkit::{
 };
 use std::{path::PathBuf, str::FromStr, time::Duration};
 use structopt::StructOpt;
-use thor::{BlockDateGenerator, FragmentSender, FragmentSenderSetup, Wallet};
+use thor::{
+    BlockDateGenerator, DiscriminationExtension, FragmentSender, FragmentSenderSetup, Wallet,
+};
 
 #[derive(StructOpt, Debug)]
 pub struct VotesOnly {

diff --git a/testing/mjolnir/src/mjolnir_lib/fragment/batch/tx_only.rs b/testing/mjolnir/src/mjolnir_lib/fragment/batch/tx_only.rs
@@ -1,6 +1,6 @@
 use crate::{
     generators::{BatchFragmentGenerator, FragmentStatusProvider},
-    mjolnir_lib::{args::parse_shift, build_monitor, DiscriminationExtensions, MjolnirError},
+    mjolnir_lib::{args::parse_shift, build_monitor, MjolnirError},
 };
 use chain_addr::Discrimination;
 use chain_impl_mockchain::block::BlockDate;
@@ -12,7 +12,7 @@ use jortestkit::{
 };
 use std::{path::PathBuf, str::FromStr, time::Duration};
 use structopt::StructOpt;
-use thor::{BlockDateGenerator, FragmentSenderSetup, Wallet};
+use thor::{BlockDateGenerator, DiscriminationExtension, FragmentSenderSetup, Wallet};
 #[derive(StructOpt, Debug)]
 pub struct TxOnly {
     /// Number of threads

diff --git a/testing/mjolnir/src/mjolnir_lib/fragment/standard/adversary/all.rs b/testing/mjolnir/src/mjolnir_lib/fragment/standard/adversary/all.rs
@@ -1,6 +1,6 @@
 use crate::{
     generators::{AdversaryFragmentGenerator, FragmentStatusProvider},
-    mjolnir_lib::{args::parse_shift, build_monitor, DiscriminationExtensions, MjolnirError},
+    mjolnir_lib::{args::parse_shift, build_monitor, MjolnirError},
 };
 use chain_addr::Discrimination;
 use chain_impl_mockchain::block::BlockDate;
@@ -13,7 +13,9 @@ use jortestkit::{
 use loki::{AdversaryFragmentSender, AdversaryFragmentSenderSetup};
 use std::{path::PathBuf, str::FromStr, time::Duration};
 use structopt::StructOpt;
-use thor::{BlockDateGenerator, FragmentSender, FragmentSenderSetup, Wallet};
+use thor::{
+    BlockDateGenerator, DiscriminationExtension, FragmentSender, FragmentSenderSetup, Wallet,
+};
 #[derive(StructOpt, Debug)]
 pub struct AllAdversary {
     /// Number of threads

diff --git a/testing/mjolnir/src/mjolnir_lib/fragment/standard/adversary/votes_only.rs b/testing/mjolnir/src/mjolnir_lib/fragment/standard/adversary/votes_only.rs
@@ -1,6 +1,6 @@
 use crate::{
     generators::{AdversaryVoteCastsGenerator, FragmentStatusProvider},
-    mjolnir_lib::{args::parse_shift, build_monitor, DiscriminationExtensions, MjolnirError},
+    mjolnir_lib::{args::parse_shift, build_monitor, MjolnirError},
 };
 use chain_addr::Discrimination;
 use chain_impl_mockchain::block::BlockDate;
@@ -15,7 +15,9 @@ use jortestkit::{
 };
 use std::{path::PathBuf, str::FromStr, time::Duration};
 use structopt::StructOpt;
-use thor::{BlockDateGenerator, FragmentSender, FragmentSenderSetup, Wallet};
+use thor::{
+    BlockDateGenerator, DiscriminationExtension, FragmentSender, FragmentSenderSetup, Wallet,
+};
 
 #[derive(StructOpt, Debug)]
 pub struct VotesOnly {

diff --git a/testing/mjolnir/src/mjolnir_lib/fragment/standard/all.rs b/testing/mjolnir/src/mjolnir_lib/fragment/standard/all.rs
@@ -1,6 +1,6 @@
 use crate::{
     generators::{FragmentGenerator, FragmentStatusProvider},
-    mjolnir_lib::{args::parse_shift, build_monitor, DiscriminationExtensions, MjolnirError},
+    mjolnir_lib::{args::parse_shift, build_monitor, MjolnirError},
 };
 use chain_addr::Discrimination;
 use chain_impl_mockchain::block::BlockDate;
@@ -12,7 +12,9 @@ use jortestkit::{
 };
 use std::{path::PathBuf, str::FromStr, time::Duration};
 use structopt::StructOpt;
-use thor::{BlockDateGenerator, FragmentSender, FragmentSenderSetup, Wallet};
+use thor::{
+    BlockDateGenerator, DiscriminationExtension, FragmentSender, FragmentSenderSetup, Wallet,
+};
 
 #[derive(StructOpt, Debug)]
 pub struct AllFragments {

diff --git a/testing/mjolnir/src/mjolnir_lib/fragment/standard/tx_only.rs b/testing/mjolnir/src/mjolnir_lib/fragment/standard/tx_only.rs
@@ -1,6 +1,6 @@
 use crate::{
     generators::TransactionGenerator,
-    mjolnir_lib::{args::parse_shift, build_monitor, DiscriminationExtensions, MjolnirError},
+    mjolnir_lib::{args::parse_shift, build_monitor, MjolnirError},
 };
 use chain_addr::Discrimination;
 use chain_impl_mockchain::block::BlockDate;
@@ -12,7 +12,7 @@ use jortestkit::{
 };
 use std::{path::PathBuf, str::FromStr, time::Duration};
 use structopt::StructOpt;
-use thor::{BlockDateGenerator, FragmentSenderSetup, Wallet};
+use thor::{BlockDateGenerator, DiscriminationExtension, FragmentSenderSetup, Wallet};
 #[derive(StructOpt, Debug)]
 pub struct TxOnly {
     /// Number of threads

diff --git a/testing/mjolnir/src/mjolnir_lib/mod.rs b/testing/mjolnir/src/mjolnir_lib/mod.rs
@@ -6,7 +6,6 @@ pub mod fragment;
 pub mod generators;
 pub mod rest;
 
-use chain_addr::Discrimination;
 pub use error::MjolnirError;
 use jortestkit::{load::Monitor, prelude::ProgressBarMode};
 use std::error::Error;
@@ -79,17 +78,3 @@ pub fn build_monitor(progress_bar_mode: &ProgressBarMode) -> Monitor {
         ProgressBarMode::None => Monitor::Disabled(10),
     }
 }
-
-pub trait DiscriminationExtensions {
-    fn from_testing_bool(testing: bool) -> Self;
-}
-
-impl DiscriminationExtensions for Discrimination {
-    fn from_testing_bool(testing: bool) -> Discrimination {
-        if testing {
-            Discrimination::Test
-        } else {
-            Discrimination::Production
-        }
-    }
-}
diff --git a/testing/thor/src/lib.rs b/testing/thor/src/lib.rs
@@ -1,7 +1,7 @@
 pub mod cli;
 mod fragment;
 mod stake_pool;
-mod wallet;
+pub mod wallet;
 
 pub use fragment::{
     signed_delegation_cert, signed_stake_pool_cert, vote_plan_cert, write_into_persistent_log,
@@ -12,7 +12,7 @@ pub use fragment::{
 };
 pub use stake_pool::StakePool;
 pub use wallet::{
-    account::Wallet as AccountWallet, delegation::Wallet as DelegationWallet,
-    discrimination::DiscriminationExtension, utxo::Wallet as UTxOWallet,
-    PrivateVoteCommitteeDataManager, Wallet, WalletAlias, WalletError,
+    account::Wallet as AccountWallet, committee::CommitteeDataManager,
+    delegation::Wallet as DelegationWallet, discrimination::DiscriminationExtension,
+    utxo::Wallet as UTxOWallet, Wallet, WalletAlias, WalletError,
 };