From 624e48775ae50c20216cb359063386c48dfdca7e Mon Sep 17 00:00:00 2001
From: parazyd <parazyd@dyne.org>
Date: Sat, 16 Apr 2022 19:08:50 +0200
Subject: [PATCH] blockchain: Clippy some iterators.

---
 src/blockchain2/blockstore.rs    |  4 ++--
 src/blockchain2/metadatastore.rs |  4 ++--
 src/blockchain2/nfstore.rs       | 11 ++++++++---
 src/blockchain2/rootstore.rs     |  9 +++++++--
 src/blockchain2/txstore.rs       |  4 ++--
 5 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/blockchain2/blockstore.rs b/src/blockchain2/blockstore.rs
index a91a1b048..1a8cfaf7e 100644
--- a/src/blockchain2/blockstore.rs
+++ b/src/blockchain2/blockstore.rs
@@ -69,8 +69,8 @@ impl BlockStore {
     /// Be careful as this will try to load everything in memory.
     pub fn get_all(&self) -> Result<Vec<Option<(blake3::Hash, Block)>>> {
         let mut blocks = vec![];
-        let mut iterator = self.0.into_iter().enumerate();
-        while let Some((_, r)) = iterator.next() {
+        let iterator = self.0.into_iter().enumerate();
+        for (_, r) in iterator {
             let (k, v) = r.unwrap();
             let hash_bytes: [u8; 32] = k.as_ref().try_into().unwrap();
             let block = deserialize(&v)?;
diff --git a/src/blockchain2/metadatastore.rs b/src/blockchain2/metadatastore.rs
index e61f1e532..62c0761f5 100644
--- a/src/blockchain2/metadatastore.rs
+++ b/src/blockchain2/metadatastore.rs
@@ -35,8 +35,8 @@ impl StreamletMetadataStore {
     /// Be careful as this will try to lead everything in memory.
     pub fn get_all(&self) -> Result<Vec<Option<(blake3::Hash, StreamletMetadata)>>> {
         let mut metadata = vec![];
-        let mut iterator = self.0.into_iter().enumerate();
-        while let Some((_, r)) = iterator.next() {
+        let iterator = self.0.into_iter().enumerate();
+        for (_, r) in iterator {
             let (k, v) = r.unwrap();
             let hash_bytes: [u8; 32] = k.as_ref().try_into().unwrap();
             let m = deserialize(&v)?;
diff --git a/src/blockchain2/nfstore.rs b/src/blockchain2/nfstore.rs
index 8f0f7afce..4c206efee 100644
--- a/src/blockchain2/nfstore.rs
+++ b/src/blockchain2/nfstore.rs
@@ -28,12 +28,17 @@ impl NullifierStore {
         Ok(())
     }
 
+    /// Check whether given nullifier is in the database
+    pub fn contains(&self, nullifier: &Nullifier) -> Result<bool> {
+        Ok(self.0.contains_key(serialize(nullifier))?)
+    }
+
     /// Retrieve all nullifiers.
-    /// Be careful as this will try to load everything im memory.
+    /// Be careful as this will try to load everything in memory.
     pub fn get_all(&self) -> Result<Vec<Option<Nullifier>>> {
         let mut nfs = vec![];
-        let mut iterator = self.0.into_iter().enumerate();
-        while let Some((_, r)) = iterator.next() {
+        let iterator = self.0.into_iter().enumerate();
+        for (_, r) in iterator {
             let (k, _) = r.unwrap();
             let nullifier = deserialize(&k)?;
             nfs.push(Some(nullifier))
diff --git a/src/blockchain2/rootstore.rs b/src/blockchain2/rootstore.rs
index 5dd73a166..617cf3027 100644
--- a/src/blockchain2/rootstore.rs
+++ b/src/blockchain2/rootstore.rs
@@ -28,12 +28,17 @@ impl RootStore {
         Ok(())
     }
 
+    /// Check whether given root is in the database
+    pub fn contains(&self, root: &MerkleNode) -> Result<bool> {
+        Ok(self.0.contains_key(serialize(root))?)
+    }
+
     /// Retrieve all merkle roots.
     /// Be careful as this will try to load everything in memory.
     pub fn get_all(&self) -> Result<Vec<Option<MerkleNode>>> {
         let mut roots = vec![];
-        let mut iterator = self.0.into_iter().enumerate();
-        while let Some((_, r)) = iterator.next() {
+        let iterator = self.0.into_iter().enumerate();
+        for (_, r) in iterator {
             let (k, _) = r.unwrap();
             let root = deserialize(&k)?;
             roots.push(Some(root));
diff --git a/src/blockchain2/txstore.rs b/src/blockchain2/txstore.rs
index 93f4b89fd..a49b8d36a 100644
--- a/src/blockchain2/txstore.rs
+++ b/src/blockchain2/txstore.rs
@@ -39,8 +39,8 @@ impl TxStore {
     /// Be careful as this will try to load everything in memory.
     pub fn get_all(&self) -> Result<Vec<Option<(blake3::Hash, Tx)>>> {
         let mut txs = vec![];
-        let mut iterator = self.0.into_iter().enumerate();
-        while let Some((_, r)) = iterator.next() {
+        let iterator = self.0.into_iter().enumerate();
+        for (_, r) in iterator {
             let (k, v) = r.unwrap();
             let hash_bytes: [u8; 32] = k.as_ref().try_into().unwrap();
             let tx = deserialize(&v)?;