refacto: remove feature random

sfauvel · sfauvel · commit dc2c10ac6295 · 2025-02-04T17:02:58.000+01:00
diff --git a/mithril-client/Cargo.toml b/mithril-client/Cargo.toml
@@ -69,7 +69,6 @@ reqwest = { version = "0.12.12", default-features = false, features = [
 httpmock = "0.7.0"
 indicatif = { version = "0.17.9", features = ["tokio"] }
 mithril-common = { path = "../mithril-common", version = "=0.4", default-features = false, features = [
-    "random",
     "test_tools",
 ] }
 mockall = "0.13.1"
diff --git a/mithril-common/Cargo.toml b/mithril-common/Cargo.toml
@@ -56,7 +56,7 @@ pallas-network = { version = "0.32.0", optional = true }
 pallas-primitives = { version = "0.32.0", optional = true }
 pallas-traverse = { version = "0.32.0", optional = true }
 rand_chacha = "0.3.1"
-rand_core = "0.6.4"
+rand_core = { version = "0.6.4", features = ["getrandom"] }
 rayon = "1.10.0"
 reqwest = { version = "0.12.12", optional = true }
 semver = "1.0.24"
@@ -81,7 +81,6 @@ wasm-bindgen = "0.2.99"
 criterion = { version = "0.5.1", features = ["html_reports", "async_tokio"] }
 mockall = "0.13.1"
 pallas-crypto = "0.32.0"
-rand_core = { version = "0.6.4", features = ["getrandom"] }
 reqwest = { version = "0.12.12", features = ["json"] }
 slog-async = "2.8.0"
 slog-term = "2.9.1"
@@ -94,8 +93,7 @@ mithril-build-script = { path = "../internal/mithril-build-script", version = "=
 default = ["rug-backend"]
 
 # Full feature set
-full = ["random", "fs", "test_tools"]
-random = ["rand_core/getrandom"]
+full = ["fs", "test_tools"]
 fs = [
     "tokio/fs",
     "tokio/process",
@@ -116,7 +114,7 @@ num-integer-backend = ["mithril-stm/num-integer-backend"]
 # Disable signer certification, to be used only for tests
 allow_skip_signer_certification = []
 # Enable all tests tools
-test_tools = ["apispec", "test_http_server", "random"]
+test_tools = ["apispec", "test_http_server"]
 # Enable tools to helps validate conformity to an OpenAPI specification
 apispec = ["dep:glob", "dep:jsonschema", "dep:warp", "dep:reqwest"]
 test_http_server = ["dep:warp"]
diff --git a/mithril-common/src/chain_observer/mod.rs b/mithril-common/src/chain_observer/mod.rs
@@ -10,7 +10,7 @@ pub use model::{
     ChainAddress, TxDatum, TxDatumBuilder, TxDatumError, TxDatumFieldTypeName, TxDatumFieldValue,
 };
 
-cfg_fs_random! {
+cfg_fs! {
     mod builder;
     mod cli_observer;
     mod pallas_observer;
diff --git a/mithril-common/src/chain_observer/model.rs b/mithril-common/src/chain_observer/model.rs
@@ -7,7 +7,7 @@ use thiserror::Error;
 
 use crate::{StdError, StdResult};
 
-cfg_fs_random! {
+cfg_fs! {
     use serde::Deserialize;
     use anyhow::Context;
     use pallas_codec::minicbor::{Decode, Decoder, decode};
diff --git a/mithril-common/src/crypto_helper/cardano/mod.rs b/mithril-common/src/crypto_helper/cardano/mod.rs
@@ -1,13 +1,10 @@
 mod codec;
+mod cold_key;
 mod key_certification;
 mod opcert;
 
 pub use codec::*;
 pub use key_certification::*;
 pub use opcert::*;
 
-cfg_random! {
-    mod cold_key;
-
-    pub use cold_key::*;
-}
+pub use cold_key::*;
diff --git a/mithril-common/src/crypto_helper/era.rs b/mithril-common/src/crypto_helper/era.rs
@@ -1,6 +1,4 @@
 use ed25519_dalek::{Signer, SigningKey};
-#[cfg(feature = "random")]
-use rand_chacha::rand_core;
 use rand_chacha::rand_core::{CryptoRng, RngCore, SeedableRng};
 use rand_chacha::ChaCha20Rng;
 use serde::{Deserialize, Serialize};
@@ -49,8 +47,7 @@ impl EraMarkersSigner {
         Self::create_test_signer(rng)
     }
 
-    #[cfg(any(test, feature = "random"))]
-    #[cfg_attr(docsrs, doc(cfg(feature = "random")))]
+    #[cfg(test)]
     /// [EraMarkersSigner] non deterministic
     pub fn create_non_deterministic_signer() -> Self {
         let rng = rand_core::OsRng;
@@ -118,29 +115,28 @@ mod tests {
             .expect("Decoding golden secret key should not fail");
     }
 
-    cfg_random! {
-        #[test]
-        fn test_generate_test_deterministic_keypair() {
-            let signer = EraMarkersSigner::create_deterministic_signer();
-            let verifier = signer.create_verifier();
-            let signer_2 = EraMarkersSigner::create_deterministic_signer();
-            let verifier_2 = signer.create_verifier();
-            assert_eq!(signer.secret_key.to_bytes(), signer_2.secret_key.to_bytes());
-            assert_eq!(
-                verifier.verification_key.as_bytes(),
-                verifier_2.verification_key.as_bytes()
-            );
-
-            println!(
-                "Deterministic Verification Key={}",
-                verifier.verification_key.to_json_hex().unwrap()
-            );
-            println!(
-                "Deterministic Secret Key=={}",
-                signer.secret_key.to_json_hex().unwrap()
-            );
-        }
+    #[test]
+    fn test_generate_test_deterministic_keypair() {
+        let signer = EraMarkersSigner::create_deterministic_signer();
+        let verifier = signer.create_verifier();
+        let signer_2 = EraMarkersSigner::create_deterministic_signer();
+        let verifier_2 = signer.create_verifier();
+        assert_eq!(signer.secret_key.to_bytes(), signer_2.secret_key.to_bytes());
+        assert_eq!(
+            verifier.verification_key.as_bytes(),
+            verifier_2.verification_key.as_bytes()
+        );
+
+        println!(
+            "Deterministic Verification Key={}",
+            verifier.verification_key.to_json_hex().unwrap()
+        );
+        println!(
+            "Deterministic Secret Key=={}",
+            signer.secret_key.to_json_hex().unwrap()
+        );
     }
+
     #[test]
     fn test_generate_test_non_deterministic_keypair() {
         let signer = EraMarkersSigner::create_non_deterministic_signer();
diff --git a/mithril-common/src/crypto_helper/genesis.rs b/mithril-common/src/crypto_helper/genesis.rs
@@ -1,8 +1,6 @@
 use crate::{StdError, StdResult};
 use anyhow::anyhow;
 use ed25519_dalek::{Signer, SigningKey};
-#[cfg(feature = "random")]
-use rand_chacha::rand_core;
 use rand_chacha::rand_core::{CryptoRng, RngCore, SeedableRng};
 use rand_chacha::ChaCha20Rng;
 use serde::{Deserialize, Serialize};
@@ -39,12 +37,10 @@ impl ProtocolGenesisSigner {
         Self::create_test_genesis_signer(rng)
     }
 
-    cfg_random! {
-        /// [ProtocolGenesisSigner] non deterministic
-        pub fn create_non_deterministic_genesis_signer() -> Self {
-            let rng = rand_core::OsRng;
-            Self::create_test_genesis_signer(rng)
-        }
+    /// [ProtocolGenesisSigner] non deterministic
+    pub fn create_non_deterministic_genesis_signer() -> Self {
+        let rng = rand_core::OsRng;
+        Self::create_test_genesis_signer(rng)
     }
 
     /// Get the [ProtocolGenesisSecretKey]
@@ -135,21 +131,19 @@ mod tests {
         );
     }
 
-    cfg_random! {
-        #[test]
-        fn test_generate_test_non_deterministic_genesis_keypair() {
-            let genesis_signer = ProtocolGenesisSigner::create_non_deterministic_genesis_signer();
-            let genesis_verifier = genesis_signer.create_genesis_verifier();
-
-            println!(
-                "Non Deterministic Genesis Verification Key={}",
-                genesis_verifier.verification_key.to_json_hex().unwrap()
-            );
-            println!(
-                "Non Deterministic Genesis Secret Key=={}",
-                genesis_signer.secret_key.to_json_hex().unwrap()
-            );
-        }
+    #[test]
+    fn test_generate_test_non_deterministic_genesis_keypair() {
+        let genesis_signer = ProtocolGenesisSigner::create_non_deterministic_genesis_signer();
+        let genesis_verifier = genesis_signer.create_genesis_verifier();
+
+        println!(
+            "Non Deterministic Genesis Verification Key={}",
+            genesis_verifier.verification_key.to_json_hex().unwrap()
+        );
+        println!(
+            "Non Deterministic Genesis Secret Key=={}",
+            genesis_signer.secret_key.to_json_hex().unwrap()
+        );
     }
 
     #[test]
diff --git a/mithril-common/src/crypto_helper/mod.rs b/mithril-common/src/crypto_helper/mod.rs
@@ -13,9 +13,7 @@ cfg_test_tools! {
     pub mod tests_setup;
 }
 
-cfg_random! {
-    pub use cardano::ColdKeyGenerator;
-}
+pub use cardano::ColdKeyGenerator;
 
 pub use cardano::{
     KESPeriod, OpCert, ProtocolInitializerErrorWrapper, ProtocolRegistrationErrorWrapper,
diff --git a/mithril-common/src/lib.rs b/mithril-common/src/lib.rs
@@ -20,26 +20,6 @@ macro_rules! cfg_fs {
     }
 }
 
-macro_rules! cfg_random {
-    ($($item:item)*) => {
-        $(
-            #[cfg(any(test, feature = "random"))]
-            #[cfg_attr(docsrs, doc(cfg(feature = "random")))]
-            $item
-        )*
-    }
-}
-
-macro_rules! cfg_fs_random {
-    ($($item:item)*) => {
-        $(
-            #[cfg(all(feature = "fs", feature = "random"))]
-            #[cfg_attr(docsrs, doc(all(feature = "fs", feature = "random")))]
-            $item
-        )*
-    }
-}
-
 macro_rules! cfg_test_tools {
     ($($item:item)*) => {
         $(
diff --git a/mithril-common/src/protocol/signer_builder.rs b/mithril-common/src/protocol/signer_builder.rs
@@ -123,19 +123,17 @@ impl SignerBuilder {
         ))
     }
 
-    cfg_random! {
-        /// Build non deterministic [SingleSigner] and [ProtocolInitializer] based on the registered parties.
-        pub fn build_single_signer(
-            &self,
-            signer_with_stake: SignerWithStake,
-            kes_secret_key_path: Option<&Path>,
-        ) -> StdResult<(SingleSigner, ProtocolInitializer)> {
-            self.build_single_signer_with_rng(
-                signer_with_stake,
-                kes_secret_key_path,
-                &mut rand_core::OsRng,
-            )
-        }
+    /// Build non deterministic [SingleSigner] and [ProtocolInitializer] based on the registered parties.
+    pub fn build_single_signer(
+        &self,
+        signer_with_stake: SignerWithStake,
+        kes_secret_key_path: Option<&Path>,
+    ) -> StdResult<(SingleSigner, ProtocolInitializer)> {
+        self.build_single_signer_with_rng(
+            signer_with_stake,
+            kes_secret_key_path,
+            &mut rand_core::OsRng,
+        )
     }
 
     /// Build deterministic [SingleSigner] and [ProtocolInitializer] based on the registered parties.
diff --git a/mithril-common/src/test_utils/fake_data.rs b/mithril-common/src/test_utils/fake_data.rs
@@ -41,31 +41,30 @@ pub fn protocol_parameters() -> entities::ProtocolParameters {
     entities::ProtocolParameters::new(k, m, phi_f)
 }
 
-cfg_random! {
-    /// Fake ProtocolInitializer
-    pub fn protocol_initializer<S: Into<String>>(
-        seed: S,
-        stake: entities::Stake,
-    ) -> crypto_helper::ProtocolInitializer {
-        use rand_chacha::ChaCha20Rng;
-        use rand_core::SeedableRng;
-
-        let protocol_parameters = protocol_parameters();
-        let seed: [u8; 32] = format!("{:<032}", seed.into()).as_bytes()[..32]
-            .try_into()
-            .unwrap();
-        let mut rng = ChaCha20Rng::from_seed(seed);
-        let kes_secret_key_path: Option<std::path::PathBuf> = None;
-        let kes_period = Some(0);
-
-        crypto_helper::ProtocolInitializer::setup(
-            protocol_parameters.into(),
-            kes_secret_key_path,
-            kes_period,
-            stake,
-            &mut rng,
-        ).unwrap()
-    }
+/// Fake ProtocolInitializer
+pub fn protocol_initializer<S: Into<String>>(
+    seed: S,
+    stake: entities::Stake,
+) -> crypto_helper::ProtocolInitializer {
+    use rand_chacha::ChaCha20Rng;
+    use rand_core::SeedableRng;
+
+    let protocol_parameters = protocol_parameters();
+    let seed: [u8; 32] = format!("{:<032}", seed.into()).as_bytes()[..32]
+        .try_into()
+        .unwrap();
+    let mut rng = ChaCha20Rng::from_seed(seed);
+    let kes_secret_key_path: Option<std::path::PathBuf> = None;
+    let kes_period = Some(0);
+
+    crypto_helper::ProtocolInitializer::setup(
+        protocol_parameters.into(),
+        kes_secret_key_path,
+        kes_period,
+        stake,
+        &mut rng,
+    )
+    .unwrap()
 }
 
 /// Fake CertificatePending
diff --git a/mithril-test-lab/mithril-aggregator-fake/Cargo.toml b/mithril-test-lab/mithril-aggregator-fake/Cargo.toml
@@ -27,7 +27,6 @@ tracing-subscriber = "0.3.19"
 [dev-dependencies]
 mithril-common = { "path" = "../../mithril-common", features = [
     "test_tools",
-    "random",
 ] }
 reqwest = "0.12.12"
 warp = "0.3.7"

Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,7 @@ cfg_test_tools! {`
`13`	`13`	`pub mod tests_setup;`
`14`	`14`	`}`
`15`	`15`
`16`		`-cfg_random! {`
`17`		`- pub use cardano::ColdKeyGenerator;`
`18`		`-}`
	`16`	`+pub use cardano::ColdKeyGenerator;`
`19`	`17`
`20`	`18`	`pub use cardano::{`
`21`	`19`	`KESPeriod, OpCert, ProtocolInitializerErrorWrapper, ProtocolRegistrationErrorWrapper,`