CRC: cleanup

Signed-off-by: Jacinta Ferrant <[email protected]>

Author: jferrant

stackslib/src/chainstate/stacks/db/blocks.rs

@@ -10020,8 +10020,9 @@ pub mod test {
         let block_hashes: Vec<BlockHeaderHash> = blocks.iter().map(|b| b.block_hash()).collect();
         let header_hashes_all: Vec<(ConsensusHash, Option<BlockHeaderHash>)> = consensus_hashes
             .iter()
-            .zip(block_hashes.iter())
-            .map(|(burn, block)| ((*burn).clone(), Some((*block).clone())))
+            .cloned()
+            .zip(block_hashes.iter().cloned())
+            .map(|(burn, block)| (burn, Some(block)))
             .collect();
 
         // nothing is stored, so our inventory should be empty

stackslib/src/chainstate/stacks/tests/mod.rs

@@ -967,10 +967,8 @@ pub fn get_last_microblock_header(
     miner: &TestMiner,
     parent_block_opt: Option<&StacksBlock>,
 ) -> Option<StacksMicroblockHeader> {
-    let last_microblocks_opt = match parent_block_opt {
-        Some(block) => node.get_microblock_stream(miner, &block.block_hash()),
-        None => None,
-    };
+    let last_microblocks_opt =
+        parent_block_opt.and_then(|block| node.get_microblock_stream(miner, &block.block_hash()));
 
     let last_microblock_header_opt = match last_microblocks_opt {
         Some(last_microblocks) => {

stackslib/src/net/api/gettenure.rs

@@ -191,7 +191,7 @@ impl HttpRequest for RPCNakamotoTenureRequestHandler {
             .map(|last_block_id_hex| StacksBlockId::from_hex(last_block_id_hex))
             .transpose()
             .map_err(|e| {
-                Error::DecodeError(format!("Failed to parse stop= query parameter: {:?}", &e))
+                Error::DecodeError(format!("Failed to parse stop= query parameter: {e:?}"))
             })?;
 
         self.last_block_id = last_block_id;

stackslib/src/net/p2p.rs

@@ -2280,13 +2280,10 @@ impl PeerNetwork {
 
     /// Get stats for a neighbor
     pub fn get_neighbor_stats(&self, nk: &NeighborKey) -> Option<NeighborStats> {
-        match self.events.get(nk) {
-            None => None,
-            Some(eid) => match self.peers.get(eid) {
-                None => None,
-                Some(convo) => Some(convo.stats.clone()),
-            },
-        }
+        self.events
+            .get(nk)
+            .and_then(|eid| self.peers.get(eid))
+            .map(|convo| convo.stats.clone())
     }
 
     /// Update peer connections as a result of a peer graph walk.

stackslib/src/net/tests/convergence.rs

@@ -861,10 +861,7 @@ fn dump_peers(peers: &Vec<TestPeer>) {
         }
 
         let all_neighbors = PeerDB::get_all_peers(peers[i].network.peerdb.conn()).unwrap();
-        let num_allowed = all_neighbors.iter().fold(0, |mut sum, n2| {
-            sum += if n2.allowed < 0 { 1 } else { 0 };
-            sum
-        });
+        let num_allowed = all_neighbors.iter().filter(|n2| n2.allowed < 0).count();
         test_debug!("Neighbor {} (all={}, outbound={}) (total neighbors = {}, total allowed = {}): outbound={:?} all={:?}", i, neighbor_index.len(), outbound_neighbor_index.len(), all_neighbors.len(), num_allowed, &outbound_neighbor_index, &neighbor_index);
     }
     test_debug!("\n");