fix: Rust 1.89 clippy warnings

internal/mithril-dmq/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "mithril-dmq"
 description = "Mechanisms to publish and consume messages of a 'Decentralized Message Queue network' through a DMQ node"
-version = "0.1.6"
+version = "0.1.7"
 authors.workspace = true
 documentation.workspace = true
 edition.workspace = true

internal/mithril-dmq/src/consumer/pallas.rs

@@ -51,7 +51,7 @@ impl<M: TryFromBytes + Debug> DmqConsumerPallas<M> {
     }
 
     /// Gets the cached `DmqClient`, creating a new one if it does not exist.
-    async fn get_client(&self) -> StdResult<MutexGuard<Option<DmqClient>>> {
+    async fn get_client(&self) -> StdResult<MutexGuard<'_, Option<DmqClient>>> {
         {
             // Run this in a separate block to avoid dead lock on the Mutex
             let client_lock = self.client.lock().await;

internal/mithril-persistence/Cargo.toml

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

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

@@ -317,7 +317,7 @@ mod tests {
             .read::<i64, _>(0)
     }
 
-    fn create_db_checker(connection: &ConnectionThreadSafe) -> DatabaseVersionChecker {
+    fn create_db_checker(connection: &ConnectionThreadSafe) -> DatabaseVersionChecker<'_> {
         DatabaseVersionChecker::new(
             discard_logger(),
             ApplicationNodeType::Aggregator,

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

@@ -8,7 +8,7 @@ use crate::sqlite::{EntityCursor, Query, SqliteConnection, Transaction};
 /// Extension trait for the [SqliteConnection] type.
 pub trait ConnectionExtensions {
     /// Begin a transaction on the connection.
-    fn begin_transaction(&self) -> StdResult<Transaction>;
+    fn begin_transaction(&self) -> StdResult<Transaction<'_>>;
 
     /// Execute the given sql query and return the value of the first cell read.
     fn query_single_cell<Q: AsRef<str>, T: ReadableWithIndex>(
@@ -18,7 +18,7 @@ pub trait ConnectionExtensions {
     ) -> StdResult<T>;
 
     /// Fetch entities from the database using the given query.
-    fn fetch<Q: Query>(&self, query: Q) -> StdResult<EntityCursor<Q::Entity>>;
+    fn fetch<Q: Query>(&self, query: Q) -> StdResult<EntityCursor<'_, Q::Entity>>;
 
     /// Fetch the first entity from the database returned using the given query.
     fn fetch_first<Q: Query>(&self, query: Q) -> StdResult<Option<Q::Entity>> {
@@ -39,7 +39,7 @@ pub trait ConnectionExtensions {
 }
 
 impl ConnectionExtensions for SqliteConnection {
-    fn begin_transaction(&self) -> StdResult<Transaction> {
+    fn begin_transaction(&self) -> StdResult<Transaction<'_>> {
         Ok(Transaction::begin(self)?)
     }
 
@@ -54,7 +54,7 @@ impl ConnectionExtensions for SqliteConnection {
         statement.read::<T, _>(0).with_context(|| "Read query error")
     }
 
-    fn fetch<Q: Query>(&self, query: Q) -> StdResult<EntityCursor<Q::Entity>> {
+    fn fetch<Q: Query>(&self, query: Q) -> StdResult<EntityCursor<'_, Q::Entity>> {
         let (condition, params) = query.filters().expand();
         let sql = query.get_definition(&condition);
         let cursor = prepare_statement(self, &sql)?.into_iter().bind(&params[..])?;

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

@@ -47,7 +47,7 @@ impl SqliteConnectionPool {
     }
 
     /// Get a connection from the pool
-    pub fn connection(&self) -> StdResult<ResourcePoolItem<SqlitePooledConnection>> {
+    pub fn connection(&self) -> StdResult<ResourcePoolItem<'_, SqlitePooledConnection>> {
         let timeout = Duration::from_millis(1000);
         let connection = self.connection_pool.acquire_resource(timeout)?;
 

mithril-aggregator/Cargo.toml

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

mithril-aggregator/src/dependency_injection/builder/support/sqlite.rs

@@ -53,10 +53,10 @@ impl DependenciesBuilder {
             let _ = connection.execute("pragma analysis_limit=400; pragma optimize;");
         }
 
-        if let Some(pool) = &self.sqlite_connection_cardano_transaction_pool {
-            if let Ok(connection) = pool.connection() {
-                let _ = connection.execute("pragma analysis_limit=400; pragma optimize;");
-            }
+        if let Some(pool) = &self.sqlite_connection_cardano_transaction_pool
+            && let Ok(connection) = pool.connection()
+        {
+            let _ = connection.execute("pragma analysis_limit=400; pragma optimize;");
         }
     }
 

mithril-aggregator/src/file_uploaders/cloud_uploader/api.rs

@@ -46,15 +46,14 @@ impl CloudUploader {
 impl FileUploader for CloudUploader {
     async fn upload_without_retry(&self, file_path: &Path) -> StdResult<FileUri> {
         let remote_file_path = self.remote_folder.join(get_file_name(file_path)?);
-        if !self.allow_overwrite {
-            if let Some(file_uri) = self
+        if !self.allow_overwrite
+            && let Some(file_uri) = self
                 .cloud_backend_uploader
                 .file_exists(&remote_file_path)
                 .await
                 .with_context(|| "checking if file exists in cloud")?
-            {
-                return Ok(file_uri);
-            }
+        {
+            return Ok(file_uri);
         }
 
         let file_uri = self

mithril-aggregator/src/http_server/validators/prover_transactions_hash_validator.rs

@@ -96,7 +96,7 @@ mod tests {
         for invalid_char in ["g", "x", ";", " ", "à"].iter() {
             let hash = format!("{}{}", "a".repeat(63), invalid_char);
             let error = ProverTransactionsHashValidator::default()
-                .validate(&[hash.clone()])
+                .validate(std::slice::from_ref(&hash))
                 .expect_err("Should return an error");
             assert_eq!(
                 error,

mithril-aggregator/src/services/aggregator_client.rs

@@ -379,41 +379,6 @@ impl RemoteCertificateRetriever for AggregatorHTTPClient {
     }
 }
 
-#[cfg(test)]
-pub(crate) mod dumb {
-    use tokio::sync::RwLock;
-
-    use mithril_common::test::double::Dummy;
-
-    use super::*;
-
-    /// This aggregator client is intended to be used by test services.
-    /// It actually does not communicate with an aggregator host but mimics this behavior.
-    /// It is driven by a Tester that controls the data it can return, and it can return its internal state for testing.
-    pub struct DumbAggregatorClient {
-        epoch_settings: RwLock<Option<LeaderAggregatorEpochSettings>>,
-    }
-
-    impl Default for DumbAggregatorClient {
-        fn default() -> Self {
-            Self {
-                epoch_settings: RwLock::new(Some(LeaderAggregatorEpochSettings::dummy())),
-            }
-        }
-    }
-
-    #[async_trait]
-    impl LeaderAggregatorClient for DumbAggregatorClient {
-        async fn retrieve_epoch_settings(
-            &self,
-        ) -> StdResult<Option<LeaderAggregatorEpochSettings>> {
-            let epoch_settings = self.epoch_settings.read().await.clone();
-
-            Ok(epoch_settings)
-        }
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use http::response::Builder as HttpResponseBuilder;

mithril-aggregator/src/services/certifier/buffered_certifier.rs

@@ -131,16 +131,15 @@ impl CertifierService for BufferedCertifierService {
             .create_open_message(signed_entity_type, protocol_message)
             .await;
 
-        if creation_result.is_ok() {
-            if let Err(error) = self
+        if creation_result.is_ok()
+            && let Err(error) = self
                 .try_register_buffered_signatures_to_current_open_message(signed_entity_type)
                 .await
-            {
-                warn!(self.logger, "Failed to register buffered signatures to the new open message";
-                    "signed_entity_type" => ?signed_entity_type,
-                    "error" => ?error
-                );
-            }
+        {
+            warn!(self.logger, "Failed to register buffered signatures to the new open message";
+                "signed_entity_type" => ?signed_entity_type,
+                "error" => ?error
+            );
         }
 
         creation_result

mithril-aggregator/src/services/message.rs

@@ -621,7 +621,7 @@ mod tests {
         async fn get_certificate() {
             let genesis_certificate = fake_data::genesis_certificate("genesis_hash");
             let service = MessageServiceBuilder::new()
-                .with_certificates(&[genesis_certificate.clone()])
+                .with_certificates(std::slice::from_ref(&genesis_certificate))
                 .build()
                 .await;
 
@@ -705,7 +705,7 @@ mod tests {
             let message: SnapshotMessage = record.clone().try_into().unwrap();
 
             let service = MessageServiceBuilder::new()
-                .with_signed_entity_records(&[record.clone()])
+                .with_signed_entity_records(std::slice::from_ref(&record))
                 .build()
                 .await;
 
@@ -778,7 +778,7 @@ mod tests {
             let message: CardanoDatabaseSnapshotMessage = record.clone().try_into().unwrap();
 
             let service = MessageServiceBuilder::new()
-                .with_signed_entity_records(&[record.clone()])
+                .with_signed_entity_records(std::slice::from_ref(&record))
                 .build()
                 .await;
 
@@ -869,7 +869,7 @@ mod tests {
             let message: MithrilStakeDistributionMessage = record.clone().try_into().unwrap();
 
             let service = MessageServiceBuilder::new()
-                .with_signed_entity_records(&[record.clone()])
+                .with_signed_entity_records(std::slice::from_ref(&record))
                 .build()
                 .await;
 
@@ -949,7 +949,7 @@ mod tests {
             let message: CardanoTransactionSnapshotMessage = record.clone().try_into().unwrap();
 
             let service = MessageServiceBuilder::new()
-                .with_signed_entity_records(&[record.clone()])
+                .with_signed_entity_records(std::slice::from_ref(&record))
                 .build()
                 .await;
 
@@ -1028,7 +1028,7 @@ mod tests {
             let message: CardanoStakeDistributionMessage = record.clone().try_into().unwrap();
 
             let service = MessageServiceBuilder::new()
-                .with_signed_entity_records(&[record.clone()])
+                .with_signed_entity_records(std::slice::from_ref(&record))
                 .build()
                 .await;
 
@@ -1066,7 +1066,7 @@ mod tests {
             let message: CardanoStakeDistributionMessage = record.clone().try_into().unwrap();
 
             let service = MessageServiceBuilder::new()
-                .with_signed_entity_records(&[record.clone()])
+                .with_signed_entity_records(std::slice::from_ref(&record))
                 .build()
                 .await;
 

mithril-aggregator/src/services/stake_distribution.rs

@@ -118,7 +118,7 @@ impl Default for UpdateToken {
 }
 
 impl UpdateToken {
-    pub fn update(&self, epoch: Epoch) -> StdResult<MutexGuard<()>> {
+    pub fn update(&self, epoch: Epoch) -> StdResult<MutexGuard<'_, ()>> {
         let update_semaphore = self.is_busy.try_lock().map_err(|_| {
             let last_updated_epoch = self.busy_on_epoch.read().unwrap();
 

mithril-aggregator/src/store/epoch_settings_storer.rs

@@ -1,7 +1,9 @@
+#[cfg(test)]
 use std::collections::HashMap;
 
 use async_trait::async_trait;
 use mithril_common::StdResult;
+#[cfg(test)]
 use tokio::sync::RwLock;
 
 use mithril_common::entities::{Epoch, ProtocolParameters};
@@ -56,18 +58,20 @@ pub trait EpochSettingsStorer:
     }
 }
 
+#[cfg(test)]
 pub struct FakeEpochSettingsStorer {
     pub epoch_settings: RwLock<HashMap<Epoch, AggregatorEpochSettings>>,
 }
 
+#[cfg(test)]
 impl FakeEpochSettingsStorer {
-    #[cfg(test)]
     pub fn new(data: Vec<(Epoch, AggregatorEpochSettings)>) -> Self {
         let epoch_settings = RwLock::new(data.into_iter().collect());
         Self { epoch_settings }
     }
 }
 
+#[cfg(test)]
 #[async_trait]
 impl ProtocolParametersRetriever for FakeEpochSettingsStorer {
     async fn get_protocol_parameters(&self, epoch: Epoch) -> StdResult<Option<ProtocolParameters>> {
@@ -78,6 +82,7 @@ impl ProtocolParametersRetriever for FakeEpochSettingsStorer {
     }
 }
 
+#[cfg(test)]
 #[async_trait]
 impl EpochSettingsStorer for FakeEpochSettingsStorer {
     async fn save_epoch_settings(
@@ -97,6 +102,7 @@ impl EpochSettingsStorer for FakeEpochSettingsStorer {
     }
 }
 
+#[cfg(test)]
 #[async_trait]
 impl EpochPruningTask for FakeEpochSettingsStorer {
     fn pruned_data(&self) -> &'static str {