Merge pull request #161 from rex4539/clippy

fix clippy warnings
zingolabs · Jan 20, 2025 · 72e8c42 · 72e8c42
2 parents ed7f1f0 + 85bf84a
commit 72e8c42
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/zaino-state/src/fetch.rs b/zaino-state/src/fetch.rs
@@ -397,7 +397,7 @@ impl ZcashIndexer for FetchServiceSubscriber {
             .get_subtrees_by_index(
                 pool,
                 start_index.0,
-                limit.and_then(|limit_index| Some(limit_index.0)),
+                limit.map(|limit_index| limit_index.0),
             )
             .await?
             .into())
@@ -1408,7 +1408,7 @@ impl LightWalletIndexer for FetchServiceSubscriber {
             .z_get_subtrees_by_index(
                 pool.to_string(),
                 NoteCommitmentSubtreeIndex(start_index),
-                limit.and_then(|limit| Some(NoteCommitmentSubtreeIndex(limit))),
+                limit.map(NoteCommitmentSubtreeIndex),
             )
             .await?;
         let fetch_service_clone = self.clone();
@@ -1756,12 +1756,12 @@ impl FetchServiceSubscriber {
                         u32::try_from(trees.orchard())?,
                     )?)
                 }
-                Err(e) => Err(e.into()),
+                Err(e) => Err(e),
             },
             Ok(GetBlock::Raw(_)) => Err(FetchServiceError::TonicStatusError(
                 tonic::Status::internal("Received raw block hex instead of block object."),
             )),
-            Err(e) => Err(e.into()),
+            Err(e) => Err(e),
         }
     }
 

diff --git a/zaino-state/src/mempool.rs b/zaino-state/src/mempool.rs
@@ -105,7 +105,7 @@ impl Mempool {
             loop {
                 match mempool.fetcher.get_blockchain_info().await {
                     Ok(chain_info) => {
-                        best_block_hash = chain_info.best_block_hash.clone();
+                        best_block_hash = chain_info.best_block_hash;
                         break;
                     }
                     Err(e) => {
@@ -120,7 +120,7 @@ impl Mempool {
             loop {
                 match mempool.fetcher.get_blockchain_info().await {
                     Ok(chain_info) => {
-                        check_block_hash = chain_info.best_block_hash.clone();
+                        check_block_hash = chain_info.best_block_hash;
                     }
                     Err(e) => {
                         status.store(StatusType::RecoverableError.into());
@@ -404,7 +404,7 @@ impl MempoolSubscriber {
                 Ok((StatusType::Syncing, self.get_mempool_and_update_seen()))
             }
             StatusType::Closing => Ok((StatusType::Closing, Vec::new())),
-            status => return Err(MempoolError::StatusError(StatusError(status))),
+            status => Err(MempoolError::StatusError(StatusError(status))),
         }
     }
 

diff --git a/zainod/src/config.rs b/zainod/src/config.rs
@@ -60,9 +60,9 @@ impl IndexerConfig {
             "Testnet" => Ok(zebra_chain::parameters::Network::new_default_testnet()),
             "Mainnet" => Ok(zebra_chain::parameters::Network::Mainnet),
             _ => {
-                return Err(IndexerError::ConfigError(
+                Err(IndexerError::ConfigError(
                     "Incorrect network name given.".to_string(),
-                ));
+                ))
             }
         }
     }