blockchain: Clippy some iterators.

This commit is contained in:
parazyd
2022-04-16 19:08:50 +02:00
parent aef76baff8
commit 624e48775a
5 changed files with 21 additions and 11 deletions

View File

@@ -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)?;

View File

@@ -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)?;

View File

@@ -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))

View File

@@ -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));

View File

@@ -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)?;