Merge pull request input-output-hk#1749 from input-output-hk/jpraynau…

…d/fix-clippy-warning-rust-1.79.0 fix: clippy warnings with Rust `1.79.0`
txpipe · Jun 14, 2024 · 93c0a5e · 93c0a5e
2 parents 8fa65dc + 9518778
commit 93c0a5e
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
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.6"
+version = "0.2.7"
 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/store/adapter/memory_adapter.rs b/internal/mithril-persistence/src/store/adapter/memory_adapter.rs
@@ -17,10 +17,7 @@ where
 {
     /// MemoryAdapter factory
     pub fn new(data: Option<Vec<(K, V)>>) -> Result<Self, AdapterError> {
-        let data = match data {
-            None => Vec::new(),
-            Some(v) => v,
-        };
+        let data = data.unwrap_or_default();
         let mut values = HashMap::new();
         let mut index = Vec::new();
 

diff --git a/mithril-aggregator/Cargo.toml b/mithril-aggregator/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mithril-aggregator"
-version = "0.5.20"
+version = "0.5.21"
 description = "A Mithril Aggregator server"
 authors = { workspace = true }
 edition = { workspace = true }

diff --git a/mithril-aggregator/src/store/verification_key_store.rs b/mithril-aggregator/src/store/verification_key_store.rs
@@ -61,10 +61,13 @@ impl VerificationKeyStorer for VerificationKeyStore {
         epoch: Epoch,
         signer: SignerWithStake,
     ) -> StdResult<Option<SignerWithStake>> {
-        let mut signers = match self.adapter.read().await.get_record(&epoch).await? {
-            Some(s) => s,
-            None => HashMap::new(),
-        };
+        let mut signers = self
+            .adapter
+            .read()
+            .await
+            .get_record(&epoch)
+            .await?
+            .unwrap_or_default();
         let prev_signer = signers.insert(signer.party_id.to_owned(), signer.clone());
         self.adapter
             .write()