fix build

oldGreg5 · oldGreg5 · commit ffdb8609433d · 2025-06-16T15:12:35.000+02:00
diff --git a/src/audit/src/lib/tally.rs b/src/audit/src/lib/tally.rs
@@ -1,7 +1,6 @@
 use bech32::{self, Error as Bech32Error, FromBase32};
 use bech32::{ToBase32, Variant};
 
-use chain_crypto::testing::TestCryptoRng;
 use chain_crypto::{Ed25519, SecretKey};
 use chain_vote::committee::MemberSecretKey;
 use chain_vote::tally::batch_decrypt;
@@ -13,6 +12,7 @@ use base64::{engine::general_purpose, Engine as _};
 
 use color_eyre::Result;
 use rand_core::SeedableRng;
+use rand::rngs::StdRng;
 
 /// A Bech32_encoded address consists of 3 parts: A Human-Readable Part (HRP) + Separator + Data:
 const HRP_PK: &str = "ristretto255_memberpk";
@@ -50,7 +50,7 @@ pub fn extract_decrypt_shares(
     encrypted_tally: EncryptedTally,
     committee_priv_keys: Vec<MemberSecretKey>,
 ) -> Vec<TallyDecryptShare> {
-    let mut rng = TestCryptoRng::seed_from_u64(0);
+    let mut rng = StdRng::seed_from_u64(0);
 
     let mut shares = vec![];
 
@@ -171,7 +171,7 @@ pub fn decrypt_tally_with_secret_keys(
     encrypted_tally: EncryptedTally,
     committee_priv_keys: Vec<MemberSecretKey>,
 ) -> Result<Vec<Tally>, Box<dyn std::error::Error>> {
-    let mut rng = TestCryptoRng::seed_from_u64(0);
+    let mut rng = StdRng::seed_from_u64(0);
 
     let mut public_keys = vec![];
 
diff --git a/src/catalyst-toolbox/catalyst-toolbox/Cargo.toml b/src/catalyst-toolbox/catalyst-toolbox/Cargo.toml
@@ -72,7 +72,7 @@ assert_cmd = "2"
 predicates = "2"
 assert_fs = "1.0.0"
 chain-vote = { path = "../../chain-libs/chain-vote" }
-proptest = { workspace = true, branch = "master" }
+proptest = { workspace = true }
 test-strategy = "0.2"
 serde_test = "1"
 snapshot-lib =  { path = "../snapshot-lib", features = ["proptest"] }
diff --git a/src/catalyst-toolbox/snapshot-lib/Cargo.toml b/src/catalyst-toolbox/snapshot-lib/Cargo.toml
@@ -10,7 +10,7 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 jormungandr-lib = { workspace = true }
-proptest = { workspace = true, branch = "master", optional = true }
+proptest = { workspace = true, optional = true }
 chain-addr = { path = "../../chain-libs/chain-addr" }
 test-strategy = { version = "0.2", optional = true }
 hex = { version = "0.4" }
@@ -39,7 +39,7 @@ serde_test = { workspace = true }
 serde_json = { workspace = true }
 serde_yaml = { workspace = true }
 
-proptest = { workspace = true, branch = "master" }
+proptest = { workspace = true }
 chain-addr = { path = "../../chain-libs/chain-addr" }
 
 [features]
diff --git a/src/jormungandr/jormungandr/src/network/client/mod.rs b/src/jormungandr/jormungandr/src/network/client/mod.rs
@@ -1,6 +1,6 @@
 mod connect;
 
-pub use self::connect::{connect, ConnectError, ConnectFuture, ConnectHandle};
+pub use self::connect::{connect, ConnectError, ConnectHandle};
 use super::{
     buffer_sizes,
     convert::{Decode, Encode},
diff --git a/src/jormungandr/testing/hersir/src/config/blockchain/mod.rs b/src/jormungandr/testing/hersir/src/config/blockchain/mod.rs
@@ -1,5 +1,4 @@
 mod configuration;
-pub use chain_impl_mockchain::chaintypes::ConsensusVersion;
 pub use configuration::{BlockchainBuilder, BlockchainConfiguration};
 use jormungandr_lib::crypto::hash::Hash;
 use serde::Deserialize;
diff --git a/src/jormungandr/testing/hersir/src/controller/monitor/node/legacy.rs b/src/jormungandr/testing/hersir/src/controller/monitor/node/legacy.rs
@@ -7,7 +7,7 @@ use chain_impl_mockchain::{
     header::HeaderId,
 };
 pub use jormungandr_automation::jormungandr::{
-    grpc::JormungandrClient, BackwardCompatibleRest, FragmentNode, FragmentNodeError,
+    BackwardCompatibleRest, FragmentNode, FragmentNodeError,
     JormungandrLogger, JormungandrProcess, JormungandrRest, MemPoolCheck, StartupVerificationMode,
     Status,
 };
diff --git a/src/jormungandr/testing/hersir/src/controller/monitor/node/mod.rs b/src/jormungandr/testing/hersir/src/controller/monitor/node/mod.rs
@@ -7,8 +7,7 @@ use chain_core::property::Fragment as _;
 use chain_impl_mockchain::fragment::{Fragment, FragmentId};
 use indicatif::ProgressBar;
 pub use jormungandr_automation::jormungandr::{
-    grpc::{client::MockClientError, JormungandrClient},
-    uri_from_socket_addr, FragmentNode, FragmentNodeError, JormungandrLogger, JormungandrRest,
+    grpc::{client::MockClientError, JormungandrClient}, FragmentNode, FragmentNodeError, JormungandrLogger, JormungandrRest,
     MemPoolCheck, RestError,
 };
 use jormungandr_automation::{
diff --git a/src/jormungandr/testing/jormungandr-automation/src/jcli/command/votes/mod.rs b/src/jormungandr/testing/jormungandr-automation/src/jcli/command/votes/mod.rs
@@ -9,7 +9,6 @@ mod tally;
 
 pub use committee::CommitteeCommand;
 pub use crs::CrsCommand;
-pub use election_public_key::ElectionPublicKeyCommand;
 pub use tally::TallyCommand;
 
 #[derive(Debug)]
diff --git a/src/jormungandr/testing/jormungandr-automation/src/jormungandr/configuration/mod.rs b/src/jormungandr/testing/jormungandr-automation/src/jormungandr/configuration/mod.rs
@@ -13,7 +13,7 @@ mod secret;
 pub use block0::Block0ConfigurationBuilder;
 pub use jormungandr_config::EitherHashOrBlock0;
 pub use node::{NodeConfigBuilder, NodeConfigManager};
-pub use secret::{NodeSecretExtension, SecretModelFactory};
+pub use secret::SecretModelFactory;
 
 lazy_static! {
     static ref NEXT_AVAILABLE_PORT_NUMBER: AtomicU16 = AtomicU16::new(10000);
diff --git a/src/jormungandr/testing/jormungandr-automation/src/jormungandr/legacy/mod.rs b/src/jormungandr/testing/jormungandr-automation/src/jormungandr/legacy/mod.rs
@@ -8,9 +8,6 @@ pub use config::{
     LegacyConfigError, LegacyNodeConfig, LegacyNodeConfigBuilder, LegacyNodeConfigConverter,
     LegacyNodeConfigManager,
 };
-pub use jormungandr_lib::interfaces::{
-    Log, Mempool, NodeConfig, P2p, Policy, Rest, TopicsOfInterest, TrustedPeer,
-};
 use jortestkit::file;
 pub use rest::BackwardCompatibleRest;
 use std::path::PathBuf;
diff --git a/src/jormungandr/testing/jormungandr-automation/src/jormungandr/starter/mod.rs b/src/jormungandr/testing/jormungandr-automation/src/jormungandr/starter/mod.rs
@@ -1,7 +1,7 @@
 #![allow(dead_code)]
 
 mod commands;
-pub use commands::{get_command, CommandBuilder};
+pub use commands::get_command;
 
 mod params;
 mod testing_directory;
diff --git a/src/jormungandr/testing/mjolnir/src/mjolnir_lib/fragment/batch/adversary/mod.rs b/src/jormungandr/testing/mjolnir/src/mjolnir_lib/fragment/batch/adversary/mod.rs
@@ -3,7 +3,6 @@ mod votes_only;
 
 use crate::mjolnir_lib::MjolnirError;
 use clap::Parser;
-pub use votes_only::VotesOnly;
 #[derive(Parser, Debug)]
 pub enum Adversary {
     VotesOnly(votes_only::VotesOnly),
diff --git a/src/jormungandr/testing/mjolnir/src/mjolnir_lib/fragment/batch/mod.rs b/src/jormungandr/testing/mjolnir/src/mjolnir_lib/fragment/batch/mod.rs
@@ -3,7 +3,6 @@ mod tx_only;
 
 use crate::mjolnir_lib::MjolnirError;
 use clap::Parser;
-pub use tx_only::TxOnly;
 #[derive(Parser, Debug)]
 pub enum Batch {
     /// Prints nodes related data, like stats,fragments etc.
diff --git a/src/jormungandr/testing/mjolnir/src/mjolnir_lib/fragment/standard/adversary/mod.rs b/src/jormungandr/testing/mjolnir/src/mjolnir_lib/fragment/standard/adversary/mod.rs
@@ -3,7 +3,6 @@ mod votes_only;
 
 use crate::mjolnir_lib::MjolnirError;
 use clap::Parser;
-pub use votes_only::VotesOnly;
 
 #[derive(Parser, Debug)]
 pub enum Adversary {
diff --git a/src/jormungandr/testing/mjolnir/src/mjolnir_lib/fragment/standard/mod.rs b/src/jormungandr/testing/mjolnir/src/mjolnir_lib/fragment/standard/mod.rs
@@ -3,10 +3,7 @@ mod all;
 mod tx_only;
 
 use crate::mjolnir_lib::MjolnirError;
-pub use adversary::Adversary;
-pub use all::AllFragments;
 use clap::Parser;
-pub use tx_only::TxOnly;
 #[derive(Parser, Debug)]
 pub enum Standard {
     /// Put load on endpoint using transaction fragments only.
diff --git a/src/jormungandr/testing/thor/src/fragment/mod.rs b/src/jormungandr/testing/thor/src/fragment/mod.rs
@@ -4,7 +4,7 @@ pub use self::{
     initial_certificates::{signed_delegation_cert, signed_stake_pool_cert, vote_plan_cert},
     persistent_log::{write_into_persistent_log, PersistentLogViewer},
     sender::{BlockDateGenerator, FragmentSender, FragmentSenderError},
-    setup::{DummySyncNode, FragmentSenderSetup, FragmentSenderSetupBuilder, VerifyStrategy},
+    setup::{DummySyncNode, FragmentSenderSetup, FragmentSenderSetupBuilder},
     verifier::{ExitStrategy as VerifyExitStrategy, FragmentVerifier, FragmentVerifierError},
 };
 use crate::{
diff --git a/src/vit-testing/mainnet-lib/src/cardano_node/in_memory.rs b/src/vit-testing/mainnet-lib/src/cardano_node/in_memory.rs
@@ -118,7 +118,7 @@ impl Drop for InMemoryNode {
 #[cfg(test)]
 mod tests {
     use crate::{Block0, CardanoWallet, InMemoryNode};
-    use cardano_serialization_lib::utils::BigNum;
+use cardano_serialization_lib::BigNum;
     use futures_util::StreamExt;
     use pharos::{Channel, Observable};
 
diff --git a/src/vit-testing/mainnet-lib/src/network/wallet_state/template/actor.rs b/src/vit-testing/mainnet-lib/src/network/wallet_state/template/actor.rs
@@ -221,7 +221,7 @@ impl TryFrom<RepresentativeBuilder> for Actor {
         } else {
             Err(Error::CannotBuildActor {
                 name: builder.name.clone(),
-                details: "no voting ke defined for external representative".to_string(),
+                details: "no voting key defined for external representative".to_string(),
             })
         }
     }
@@ -269,6 +269,7 @@ mod tests {
                     target: vec![("bob", 1), ("alice", 1)].into(),
                     slotno: 1,
                 })
+                .with_ada(0)
                 .try_into()
                 .unwrap(),
             delegator("david")
@@ -285,14 +286,14 @@ mod tests {
             actors[0]
         );
         assert_eq!(
-            actors[0],
+            actors[1],
             Actor::ExternalRep {
                 name: "bob".to_string(),
                 voting_key: String::new()
             }
         );
         assert_eq!(
-            actors[0],
+            actors[2],
             Actor::GeneratedDelegator {
                 name: "clarice".to_string(),
                 registration: Registration {
@@ -303,7 +304,7 @@ mod tests {
             }
         );
         assert_eq!(
-            actors[0],
+            actors[3],
             Actor::ExternalDelegator {
                 name: "david".to_string(),
                 address: "testadd".to_string()
diff --git a/src/vit-testing/mainnet-lib/src/network/wallet_state/template/external_providers.rs b/src/vit-testing/mainnet-lib/src/network/wallet_state/template/external_providers.rs
@@ -3,7 +3,8 @@ use crate::network::wallet_state::template::Error;
 use crate::wallet_state::MainnetWalletState;
 use crate::CardanoWallet;
 use async_trait::async_trait;
-use cardano_serialization_lib::{Address, BigNum, Coin, Value};
+use cardano_serialization_lib::Address;
+use rand::Rng;
 
 /// Trait for retrieving information about address registrations from network
 #[async_trait]
diff --git a/src/vit-testing/mainnet-lib/src/network/wallet_state/template/mod.rs b/src/vit-testing/mainnet-lib/src/network/wallet_state/template/mod.rs
@@ -4,8 +4,8 @@ mod external_providers;
 
 use super::MainnetWalletState;
 use crate::CardanoWallet;
-pub use actor::{delegator, registration, representative, Actor};
-pub use arbitrary::{generate_arbitrary_delegator, Error as ArbitraryError};
+pub use actor::{Actor, delegator, registration, representative};
+pub use arbitrary::generate_arbitrary_delegator;
 use chain_crypto::PublicKeyFromStrError;
 pub use external_providers::{DummyExternalProvider, ExternalProvider};
 use jormungandr_lib::crypto::account::Identifier;
@@ -98,7 +98,7 @@ pub enum Error {
     Arbitrary(#[from] arbitrary::Error),
     /// Arbitrary error
     #[error(transparent)]
-    CannotParseAddress(#[from] cardano_serialization_lib::error::JsError),
+    CannotParseAddress(#[from] cardano_serialization_lib::JsError),
 }
 
 #[cfg(test)]
diff --git a/src/vit-testing/mainnet-lib/src/wallet/mod.rs b/src/vit-testing/mainnet-lib/src/wallet/mod.rs
@@ -7,7 +7,7 @@ pub use crate::wallet::registration::{
     REGISTRATION_SIGNATURE_METADATA_IDX,
 };
 use cardano_serialization_lib::{
-    BaseAddress, NetworkInfo, PrivateKey, PublicKey, RewardAddress, StakeCredential,
+    BaseAddress, Credential, NetworkInfo, PrivateKey, PublicKey, RewardAddress,
 };
 use cardano_serialization_lib::Transaction;
 use chain_addr::Discrimination;
@@ -61,14 +61,14 @@ impl CardanoWallet {
 
     /// Stake address based on stake public key
     #[must_use]
-    pub fn stake_credential(&self) -> StakeCredential {
-        StakeCredential::from_keyhash(&self.stake_key.to_public().hash())
+    pub fn stake_credential(&self) -> Credential {
+        Credential::from_keyhash(&self.stake_key.to_public().hash())
     }
 
     /// Payment address based on stake public key
     #[must_use]
-    pub fn payment_credential(&self) -> StakeCredential {
-        StakeCredential::from_keyhash(&self.payment_key.to_public().hash())
+    pub fn payment_credential(&self) -> Credential {
+        Credential::from_keyhash(&self.payment_key.to_public().hash())
     }
 
     /// Cardano stake public key
diff --git a/src/vit-testing/valgrind/src/data.rs b/src/vit-testing/valgrind/src/data.rs
@@ -8,7 +8,6 @@ pub use vit_servicing_station_lib::{
     db::models::funds::Fund, db::models::proposals::Proposal,
     v0::endpoints::service_version::ServiceVersion as VitVersion,
 };
-pub use wallet_core::{Choice, Value};
 
 pub trait ProposalExtension {
     fn chain_proposal_id_as_str(&self) -> String;

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`mod configuration;`
`2`		`-pub use chain_impl_mockchain::chaintypes::ConsensusVersion;`
`3`	`2`	`pub use configuration::{BlockchainBuilder, BlockchainConfiguration};`
`4`	`3`	`use jormungandr_lib::crypto::hash::Hash;`
`5`	`4`	`use serde::Deserialize;`