Fix Rust 1.83 clippy warnings

CHANGELOG.md

@@ -22,6 +22,8 @@ As a minor extension, we have adopted a slightly different versioning convention
 
 - Add a one line shell installation script for the Mithril nodes.
 
+- Update to Rust `1.83`.
+
 - **UNSTABLE** Cardano database incremental certification:
 
   - Implement the new signed entity type `CardanoDatabase`.

internal/mithril-metric/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-metric"
-version = "0.1.2"
+version = "0.1.3"
 description = "Common tools to expose metrics."
 authors = { workspace = true }
 edition = { workspace = true }

internal/mithril-metric/src/helper.rs

@@ -88,12 +88,13 @@ macro_rules! build_metrics_service {
 }
 
 #[cfg(test)]
-pub mod test_tools {
+pub(crate) mod test_tools {
     use std::{io, sync::Arc};
 
     use slog::{Drain, Logger};
     use slog_async::Async;
     use slog_term::{CompactFormat, PlainDecorator};
+
     pub struct TestLogger;
 
     impl TestLogger {

internal/mithril-metric/src/lib.rs

@@ -10,6 +10,3 @@ mod server;
 pub use metric::*;
 pub use server::MetricsServer;
 pub use server::MetricsServiceExporter;
-
-#[cfg(test)]
-pub use helper::test_tools::TestLogger;

internal/mithril-persistence/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-persistence"
-version = "0.2.37"
+version = "0.2.38"
 description = "Common types, interfaces, and utilities to persist data for Mithril nodes."
 authors = { workspace = true }
 edition = { workspace = true }

internal/mithril-persistence/src/database/mod.rs

@@ -17,7 +17,7 @@ pub use version_checker::{DatabaseVersionChecker, SqlMigration};
 pub type DbVersion = i64;
 
 #[cfg(test)]
-pub mod test_helper {
+pub(crate) mod test_helper {
     use sqlite::ConnectionThreadSafe;
 
     use mithril_common::StdResult;

internal/mithril-persistence/src/sqlite/condition.rs

@@ -362,9 +362,10 @@ mod tests {
 
     #[test]
     fn expression_get_all_default() {
-        impl GetAllCondition for String {}
+        struct Expression;
+        impl GetAllCondition for Expression {}
 
-        let expression = String::get_all_condition();
+        let expression = Expression::get_all_condition();
         let (sql, params) = expression.expand();
 
         assert_eq!("true".to_string(), sql);

internal/mithril-persistence/src/sqlite/cursor.rs

@@ -20,7 +20,7 @@ impl<'a, T> EntityCursor<'a, T> {
     }
 }
 
-impl<'a, T> Iterator for EntityCursor<'a, T>
+impl<T> Iterator for EntityCursor<'_, T>
 where
     T: SqLiteEntity,
 {

mithril-aggregator/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-aggregator"
-version = "0.5.115"
+version = "0.5.116"
 description = "A Mithril Aggregator server"
 authors = { workspace = true }
 edition = { workspace = true }

mithril-aggregator/src/database/record/certificate.rs

@@ -69,15 +69,15 @@ pub struct CertificateRecord {
 
 #[cfg(test)]
 impl CertificateRecord {
-    pub fn dummy_genesis(id: &str, epoch: Epoch) -> Self {
+    pub(crate) fn dummy_genesis(id: &str, epoch: Epoch) -> Self {
         Self {
             parent_certificate_id: None,
             signature: fake_keys::genesis_signature()[0].to_owned(),
             ..Self::dummy(id, "", epoch, SignedEntityType::genesis(epoch))
         }
     }
 
-    pub fn dummy_db_snapshot(
+    pub(crate) fn dummy_db_snapshot(
         id: &str,
         parent_id: &str,
         epoch: Epoch,
@@ -94,16 +94,7 @@ impl CertificateRecord {
         )
     }
 
-    pub fn dummy_msd(id: &str, parent_id: &str, epoch: Epoch) -> Self {
-        Self::dummy(
-            id,
-            parent_id,
-            epoch,
-            SignedEntityType::MithrilStakeDistribution(epoch),
-        )
-    }
-
-    pub fn dummy(
+    pub(crate) fn dummy(
         id: &str,
         parent_id: &str,
         epoch: Epoch,

mithril-aggregator/src/dependency_injection/containers.rs

@@ -303,7 +303,7 @@ impl DependencyContainer {
 }
 
 #[cfg(test)]
-pub mod tests {
+pub(crate) mod tests {
     use crate::{dependency_injection::DependenciesBuilder, Configuration, DependencyContainer};
 
     pub async fn initialize_dependencies() -> DependencyContainer {

mithril-aggregator/src/lib.rs

@@ -61,7 +61,7 @@ pub use tools::{
 };
 
 #[cfg(test)]
-pub use dependency_injection::tests::initialize_dependencies;
+pub(crate) use dependency_injection::tests::initialize_dependencies;
 
 // Memory allocator (to handle properly memory fragmentation)
 #[cfg(all(not(target_env = "msvc"), feature = "jemallocator"))]

mithril-aggregator/src/services/cardano_transactions_importer.rs

@@ -251,7 +251,7 @@ mod tests {
     }
 
     impl CardanoTransactionsImporter {
-        pub fn new_for_test(
+        pub(crate) fn new_for_test(
             scanner: Arc<dyn BlockScanner>,
             transaction_store: Arc<dyn TransactionStore>,
         ) -> Self {

mithril-aggregator/src/services/epoch_service.rs

@@ -516,7 +516,7 @@ impl EpochService for MithrilEpochService {
 }
 
 #[cfg(test)]
-pub struct FakeEpochService {
+pub(crate) struct FakeEpochService {
     epoch_data: Option<EpochData>,
     computed_epoch_data: Option<ComputedEpochData>,
     inform_epoch_error: bool,
@@ -525,7 +525,7 @@ pub struct FakeEpochService {
 }
 
 #[cfg(test)]
-pub struct FakeEpochServiceBuilder {
+pub(crate) struct FakeEpochServiceBuilder {
     pub cardano_era: CardanoEra,
     pub mithril_era: SupportedEra,
     pub epoch: Epoch,
@@ -662,6 +662,7 @@ impl FakeEpochService {
         }
     }
 
+    #[allow(dead_code)]
     pub fn toggle_errors(
         &mut self,
         inform_epoch: bool,

mithril-aggregator/src/signer_registerer.rs

@@ -63,7 +63,7 @@ pub struct SignerRegistrationRound {
 
 #[cfg(test)]
 impl SignerRegistrationRound {
-    pub fn dummy(epoch: Epoch, stake_distribution: StakeDistribution) -> Self {
+    pub(crate) fn dummy(epoch: Epoch, stake_distribution: StakeDistribution) -> Self {
         Self {
             epoch,
             stake_distribution,
@@ -146,7 +146,7 @@ impl MithrilSignerRegisterer {
     }
 
     #[cfg(test)]
-    pub async fn get_current_round(&self) -> Option<SignerRegistrationRound> {
+    pub(crate) async fn get_current_round(&self) -> Option<SignerRegistrationRound> {
         self.current_round.read().await.as_ref().cloned()
     }
 }

mithril-common/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-common"
-version = "0.4.89"
+version = "0.4.90"
 description = "Common types, interfaces, and utilities for Mithril nodes."
 authors = { workspace = true }
 edition = { workspace = true }

mithril-common/src/chain_observer/cli_observer.rs

@@ -165,7 +165,7 @@ impl CardanoCliRunner {
         command
     }
 
-    fn post_config_command<'a>(&'a self, command: &'a mut Command) -> &mut Command {
+    fn post_config_command<'a>(&'a self, command: &'a mut Command) -> &'a mut Command {
         match self.network {
             CardanoNetwork::MainNet => command.arg("--mainnet"),
             CardanoNetwork::DevNet(magic) => command.args(vec![
@@ -331,7 +331,7 @@ impl CardanoCliChainObserver {
 
     // This is the only way I found to tell the compiler the correct types
     // and lifetimes for the function `double`.
-    fn parse_string<'a>(&'a self, string: &'a str) -> IResult<&str, f64> {
+    fn parse_string<'a>(&'a self, string: &'a str) -> IResult<&'a str, f64> {
         nom::number::complete::double(string)
     }
 

mithril-common/src/crypto_helper/codec.rs

@@ -68,7 +68,7 @@ pub fn encode_bech32(human_readable_part: &str, data: &[u8]) -> StdResult<String
 }
 
 #[cfg(test)]
-pub mod tests {
+mod tests {
     use hex::FromHex;
     use serde::{Deserialize, Serialize};
 

mithril-common/src/crypto_helper/merkle_tree.rs

@@ -426,12 +426,12 @@ impl<S: MKTreeStorer> MKTree<S> {
                 .map(|(leaf_position, _leaf)| *leaf_position)
                 .collect(),
         )?;
-        return Ok(MKProof {
+        Ok(MKProof {
             inner_root: Arc::new(self.compute_root()?),
             inner_leaves,
             inner_proof_size: proof.mmr_size(),
             inner_proof_items: proof.proof_items().to_vec(),
-        });
+        })
     }
 }
 

mithril-common/src/test_utils/apispec.rs

@@ -67,25 +67,28 @@ impl<'a> APISpec<'a> {
     }
 
     /// Sets the path to specify/check.
-    pub fn path(&'a mut self, path: &'a str) -> &mut APISpec {
+    pub fn path(&'a mut self, path: &'a str) -> &'a mut APISpec<'a> {
         self.path = Some(path);
         self
     }
 
     /// Sets the method to specify/check.
-    pub fn method(&'a mut self, method: &'a str) -> &mut APISpec {
+    pub fn method(&'a mut self, method: &'a str) -> &'a mut APISpec<'a> {
         self.method = Some(method);
         self
     }
 
     /// Sets the content type to specify/check, note that it defaults to "application/json".
-    pub fn content_type(&'a mut self, content_type: &'a str) -> &mut APISpec {
+    pub fn content_type(&'a mut self, content_type: &'a str) -> &'a mut APISpec<'a> {
         self.content_type = Some(content_type);
         self
     }
 
     /// Validates if a request is valid
-    fn validate_request(&'a self, request_body: &impl Serialize) -> Result<&APISpec, String> {
+    fn validate_request(
+        &'a self,
+        request_body: &impl Serialize,
+    ) -> Result<&'a APISpec<'a>, String> {
         let path = self.path.unwrap();
         let method = self.method.unwrap().to_lowercase();
         let content_type = self.content_type.unwrap();
@@ -104,7 +107,7 @@ impl<'a> APISpec<'a> {
         &'a self,
         path: &str,
         operation_object: &Value,
-    ) -> Result<&APISpec, String> {
+    ) -> Result<&'a APISpec<'a>, String> {
         let fake_base_url = "http://0.0.0.1";
         let url = Url::parse(&format!("{}{}", fake_base_url, path)).unwrap();
 
@@ -130,7 +133,7 @@ impl<'a> APISpec<'a> {
         &'a self,
         response: &Response<Bytes>,
         expected_status_code: &StatusCode,
-    ) -> Result<&APISpec, String> {
+    ) -> Result<&'a APISpec<'a>, String> {
         if expected_status_code.as_u16() != response.status().as_u16() {
             return Err(format!(
                 "expected status code {} but was {}",
@@ -143,7 +146,7 @@ impl<'a> APISpec<'a> {
     }
 
     /// Validates if a response is valid
-    fn validate_response(&'a self, response: &Response<Bytes>) -> Result<&APISpec, String> {
+    fn validate_response(&'a self, response: &Response<Bytes>) -> Result<&'a APISpec<'a>, String> {
         let body = response.body();
         let status = response.status();
 
@@ -207,7 +210,11 @@ impl<'a> APISpec<'a> {
     }
 
     /// Validates conformity of a value against a schema
-    fn validate_conformity(&'a self, value: &Value, schema: &Value) -> Result<&APISpec, String> {
+    fn validate_conformity(
+        &'a self,
+        value: &Value,
+        schema: &Value,
+    ) -> Result<&'a APISpec<'a>, String> {
         match schema {
             Null => match value {
                 Null => Ok(self),

mithril-common/src/test_utils/certificate_chain_builder.rs

@@ -481,7 +481,7 @@ impl<'a> CertificateChainBuilder<'a> {
     }
 }
 
-impl<'a> Default for CertificateChainBuilder<'a> {
+impl Default for CertificateChainBuilder<'_> {
     fn default() -> Self {
         Self::new()
     }

mithril-common/src/test_utils/mod.rs

@@ -30,7 +30,7 @@ pub use fixture_builder::{MithrilFixtureBuilder, StakeDistributionGenerationMeth
 pub use mithril_fixture::{MithrilFixture, SignerFixture};
 pub use temp_dir::*;
 #[cfg(test)]
-pub use utils::*;
+pub(crate) use utils::*;
 
 /// Compare two json strings ignoring keys order
 #[macro_export]