Merge pull request #2613 from input-output-hk/dlachaume/2582/upgrade-to-rust-2024-edition

Upgrade to Rust `2024` edition

Author: dlachaume

CHANGELOG.md

@@ -23,6 +23,8 @@ As a minor extension, we have adopted a slightly different versioning convention
 
 - Abstracted the implementation of KES signature and verification to allow multiple and reusable implementations.
 
+- Upgrade the Rust edition of the repository from 2021 to 2024
+
 - **UNSTABLE** :
   - Support for DMQ signature publisher in the signer and signature consumer in the aggregator.
 

Cargo.lock

@@ -40,7 +40,7 @@ members = [
 [workspace.package]
 authors = ["[email protected]", "[email protected]"]
 documentation = "https://mithril.network/doc"
-edition = "2021"
+edition = "2024"
 homepage = "https://mithril.network"
 license = "Apache-2.0"
 repository = "https://github.com/input-output-hk/mithril/"

Cargo.toml

@@ -108,12 +108,7 @@ impl Party {
         }
         let closed_reg = key_reg.close();
 
-        let signer = self
-            .initializer
-            .clone()
-            .unwrap()
-            .new_signer(closed_reg)
-            .unwrap();
+        let signer = self.initializer.clone().unwrap().new_signer(closed_reg).unwrap();
         self.signer = Some(signer);
         self.clerk = Some(ProtocolClerk::from_signer(self.signer.as_ref().unwrap()));
     }
@@ -446,12 +441,7 @@ impl ProtocolDemonstrator for Demonstrator {
                     Err(err) => return Err(err),
                 }
                 let msig = party.get_aggregate(message).unwrap();
-                match self
-                    .verifier
-                    .as_ref()
-                    .unwrap()
-                    .verify_message(message, msig)
-                {
+                match self.verifier.as_ref().unwrap().verify_message(message, msig) {
                     Ok(_) => (),
                     Err(err) => return Err(err),
                 }

demo/protocol-demo/src/demonstrator.rs

@@ -3,7 +3,7 @@ use mithril_stm::{
     StmVerificationKeyPoP,
 };
 
-use blake2::{digest::consts::U32, Blake2b};
+use blake2::{Blake2b, digest::consts::U32};
 
 // Protocol types alias
 type D = Blake2b<U32>;

demo/protocol-demo/src/types.rs

@@ -1,7 +1,7 @@
 [package]
 name = "client-cardano-database-v2"
 description = "Mithril client Cardano database example"
-version = "0.0.9"
+version = "0.0.10"
 authors = ["[email protected]", "[email protected]"]
 documentation = "https://mithril.network/doc"
 edition = "2021"

examples/client-cardano-database-v2/Cargo.toml

@@ -70,14 +70,9 @@ async fn main() -> MithrilResult<()> {
         .hash
         .as_ref();
 
-    let cardano_database_snapshot =
-        client
-            .cardano_database_v2()
-            .get(latest_hash)
-            .await?
-            .ok_or(anyhow!(
-                "A Cardano database should exist for hash '{latest_hash}'"
-            ))?;
+    let cardano_database_snapshot = client.cardano_database_v2().get(latest_hash).await?.ok_or(
+        anyhow!("A Cardano database should exist for hash '{latest_hash}'"),
+    )?;
 
     let unpacked_dir = work_dir.join("unpack");
     std::fs::create_dir(&unpacked_dir).unwrap();

examples/client-cardano-database-v2/src/main.rs

@@ -1,7 +1,7 @@
 [package]
 name = "client-cardano-database"
 description = "Mithril client Cardano database example"
-version = "0.1.33"
+version = "0.1.34"
 authors = ["[email protected]", "[email protected]"]
 documentation = "https://mithril.network/doc"
 edition = "2021"

examples/client-cardano-database/Cargo.toml

@@ -78,10 +78,7 @@ async fn main() -> MithrilResult<()> {
     let unpacked_dir = work_dir.join("unpack");
     std::fs::create_dir(&unpacked_dir).unwrap();
 
-    let certificate = client
-        .certificate()
-        .verify_chain(&snapshot.certificate_hash)
-        .await?;
+    let certificate = client.certificate().verify_chain(&snapshot.certificate_hash).await?;
 
     client
         .cardano_database()
@@ -240,9 +237,7 @@ impl FeedbackReceiver for IndicatifFeedbackReceiver {
 }
 
 fn get_temp_dir() -> MithrilResult<PathBuf> {
-    let dir = std::env::temp_dir()
-        .join("mithril_examples")
-        .join("client_snapshot");
+    let dir = std::env::temp_dir().join("mithril_examples").join("client_snapshot");
 
     if dir.exists() {
         std::fs::remove_dir_all(&dir).with_context(|| format!("Could not remove dir {dir:?}"))?;

examples/client-cardano-database/src/main.rs

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-cardano-node-chain"
-version = "0.1.2"
+version = "0.1.3"
 authors.workspace = true
 documentation.workspace = true
 edition.workspace = true

examples/client-wasm-nodejs/package-lock.json

@@ -2,8 +2,8 @@ use serde::{Deserialize, Serialize};
 use std::{fmt::Display, path::PathBuf, sync::Arc};
 use thiserror::Error;
 
-use mithril_common::entities::CardanoNetwork;
 use mithril_common::StdResult;
+use mithril_common::entities::CardanoNetwork;
 
 use crate::chain_observer::ChainObserver;
 use crate::test::double::FakeChainObserver;