Merge pull request #2608 from input-output-hk/dlachaume/transitioning-to-rust-2024-edition

dlachaume · web-flow · commit b3b070293043 · 2025-06-26T12:39:35.000+02:00
Prepare project upgrade to Rust `2024` edition
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/internal/cardano-node/mithril-cardano-node-chain/Cargo.toml b/internal/cardano-node/mithril-cardano-node-chain/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mithril-cardano-node-chain"
-version = "0.1.1"
+version = "0.1.2"
 authors.workspace = true
 documentation.workspace = true
 edition.workspace = true
diff --git a/internal/cardano-node/mithril-cardano-node-chain/src/entities/datum.rs b/internal/cardano-node/mithril-cardano-node-chain/src/entities/datum.rs
@@ -178,7 +178,8 @@ mod test {
 
     fn dummy_tx_datum() -> TxDatum {
         let mut tx_datum_builder = TxDatumBuilder::new();
-        let tx_datum = tx_datum_builder
+
+        tx_datum_builder
             .add_field(TxDatumFieldValue::Bytes("bytes0".to_string()))
             .add_field(TxDatumFieldValue::Int(0))
             .add_field(TxDatumFieldValue::Int(1))
@@ -187,8 +188,7 @@ mod test {
             .add_field(TxDatumFieldValue::Int(2))
             .add_field(TxDatumFieldValue::Bytes("012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789".to_string()))
             .build()
-            .expect("tx_datum build should not fail");
-        tx_datum
+            .expect("tx_datum build should not fail")
     }
 
     #[test]
diff --git a/internal/mithril-doc-derive/Cargo.toml b/internal/mithril-doc-derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mithril-doc-derive"
-version = "0.1.18"
+version = "0.1.19"
 description = "An internal macro to support documentation generation."
 authors = { workspace = true }
 edition = { workspace = true }
diff --git a/internal/mithril-doc-derive/src/doc.rs b/internal/mithril-doc-derive/src/doc.rs
@@ -36,15 +36,13 @@ pub fn extract_doc_comment(attrs: &[syn::Attribute]) -> Vec<String> {
         })
         .skip_while(|s| is_blank(s))
         .flat_map(|s| {
-            let lines = s
-                .split('\n')
+            s.split('\n')
                 .map(|s| {
                     // remove one leading space no matter what
                     let s = s.strip_prefix(' ').unwrap_or(s);
                     s.to_owned()
                 })
-                .collect::<Vec<_>>();
-            lines
+                .collect::<Vec<_>>()
         })
         .collect();
 
diff --git a/internal/mithril-doc-derive/src/lib.rs b/internal/mithril-doc-derive/src/lib.rs
@@ -125,14 +125,12 @@ fn format_field(field: &syn::Field) -> FieldInfo {
         _ => true,
     };
 
-    let field_info = FieldInfo {
+    FieldInfo {
         name: field.ident.as_ref().unwrap().to_string(),
         doc,
         example,
         is_mandatory,
-    };
-
-    field_info
+    }
 }
 
 /// To extract doc from a struct.
diff --git a/internal/mithril-persistence/Cargo.toml b/internal/mithril-persistence/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mithril-persistence"
-version = "0.2.54"
+version = "0.2.55"
 description = "Common types, interfaces, and utilities to persist data for Mithril nodes."
 authors = { workspace = true }
 edition = { workspace = true }
diff --git a/internal/mithril-persistence/src/database/version_checker.rs b/internal/mithril-persistence/src/database/version_checker.rs
@@ -303,16 +303,15 @@ mod tests {
 
     fn get_table_whatever_column_count(connection: &SqliteConnection) -> i64 {
         let sql = "select count(*) as column_count from pragma_table_info('whatever');";
-        let column_count = connection
+
+        connection
             .prepare(sql)
             .unwrap()
             .iter()
             .next()
             .unwrap()
             .unwrap()
-            .read::<i64, _>(0);
-
-        column_count
+            .read::<i64, _>(0)
     }
 
     fn create_db_checker(connection: &ConnectionThreadSafe) -> DatabaseVersionChecker {
diff --git a/mithril-client-cli/Cargo.toml b/mithril-client-cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mithril-client-cli"
-version = "0.12.15"
+version = "0.12.16"
 description = "A Mithril Client"
 authors = { workspace = true }
 edition = { workspace = true }
diff --git a/mithril-client-cli/src/commands/cardano_stake_distribution/download.rs b/mithril-client-cli/src/commands/cardano_stake_distribution/download.rs
@@ -161,7 +161,7 @@ impl CardanoStakeDistributionDownloadCommand {
         client: &Client,
         unique_identifier: &str,
     ) -> MithrilResult<CardanoStakeDistribution> {
-        let cardano_stake_distribution = if Self::is_sha256_hash(unique_identifier) {
+        if Self::is_sha256_hash(unique_identifier) {
             client
                 .cardano_stake_distribution()
                 .get(unique_identifier)
@@ -212,9 +212,7 @@ impl CardanoStakeDistributionDownloadCommand {
                     "No Cardano stake distribution could be found for epoch: '{}'",
                     epoch
                 ))
-        };
-
-        cardano_stake_distribution
+        }
     }
 }
 
diff --git a/mithril-common/Cargo.toml b/mithril-common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mithril-common"
-version = "0.6.1"
+version = "0.6.2"
 description = "Common types, interfaces, and utilities for Mithril nodes."
 authors = { workspace = true }
 edition = { workspace = true }
diff --git a/mithril-common/src/certificate_chain/certificate_verifier.rs b/mithril-common/src/certificate_chain/certificate_verifier.rs
@@ -1104,9 +1104,8 @@ mod tests {
                         .to_owned()
                         .try_new_with_protocol_parameters(forged_protocol_parameters.clone())
                         .unwrap();
-                    let signature = s_adversary.protocol_signer.sign(signed_message.as_bytes());
 
-                    signature
+                    s_adversary.protocol_signer.sign(signed_message.as_bytes())
                 })
                 .collect::<Vec<_>>();
             let forged_clerk = ProtocolClerk::from_registration(
diff --git a/mithril-stm/Cargo.toml b/mithril-stm/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mithril-stm"
-version = "0.4.5"
+version = "0.4.6"
 edition = { workspace = true }
 authors = { workspace = true }
 homepage = { workspace = true }
diff --git a/mithril-stm/src/aggregate_signature/mod.rs b/mithril-stm/src/aggregate_signature/mod.rs
@@ -19,7 +19,7 @@ mod tests {
         test_runner::{RngAlgorithm::ChaCha, TestRng},
     };
     use rand_chacha::ChaCha20Rng;
-    use rand_core::SeedableRng;
+    use rand_core::{RngCore, SeedableRng};
 
     use crate::bls_multi_signature::VerificationKey;
     use crate::merkle_tree::BatchPath;
@@ -39,7 +39,7 @@ mod tests {
     fn setup_parties(params: StmParameters, stake: Vec<Stake>) -> Vec<StmSigner<D>> {
         let mut kr = KeyReg::init();
         let mut trng = TestRng::deterministic_rng(ChaCha);
-        let mut rng = ChaCha20Rng::from_seed(trng.gen());
+        let mut rng = ChaCha20Rng::from_seed(trng.random());
 
         #[allow(clippy::needless_collect)]
         let ps = stake
@@ -495,7 +495,7 @@ mod tests {
         stake: Vec<Stake>,
     ) -> (Vec<StmInitializer>, Vec<(VerificationKey, Stake)>) {
         let mut trng = TestRng::deterministic_rng(ChaCha);
-        let mut rng = ChaCha20Rng::from_seed(trng.gen());
+        let mut rng = ChaCha20Rng::from_seed(trng.random());
 
         let ps = stake
             .into_iter()
diff --git a/mithril-stm/src/bls_multi_signature/mod.rs b/mithril-stm/src/bls_multi_signature/mod.rs
@@ -92,7 +92,7 @@ mod tests {
     use blst::{blst_p1, blst_p2};
     use proptest::prelude::*;
     use rand_chacha::ChaCha20Rng;
-    use rand_core::SeedableRng;
+    use rand_core::{RngCore, SeedableRng};
 
     use crate::bls_multi_signature::helper::unsafe_helpers::{p1_affine_to_sig, p2_affine_to_vk};
     use crate::error::{MultiSignatureError, RegisterError};
