Merge pull request #5652 from stacks-network/fix/clippy-ci-stacks-lib-bind-instead-of-map

Fix clippy::bind_instead_of_map, clippy::map_flatten, clippy::*map_identity throughout stackslib

Author: jferrant

stackslib/src/burnchains/bitcoin/blocks.rs

@@ -150,9 +150,7 @@ impl BitcoinMessageHandler for BitcoinBlockDownloader {
             None => panic!("No block header set"),
             Some(ref ipc_header) => {
                 let block_hash = ipc_header.block_header.header.bitcoin_hash().clone();
-                indexer
-                    .send_getdata(&vec![block_hash])
-                    .and_then(|_r| Ok(true))
+                indexer.send_getdata(&vec![block_hash]).map(|_r| true)
             }
         }
     }

stackslib/src/burnchains/bitcoin/indexer.rs

@@ -458,7 +458,7 @@ impl BitcoinIndexer {
         }
         spv_client
             .run(self)
-            .and_then(|_r| Ok(spv_client.end_block_height.unwrap()))
+            .map(|_r| spv_client.end_block_height.unwrap())
     }
 
     #[cfg(test)]

stackslib/src/burnchains/bitcoin/network.rs

@@ -127,16 +127,16 @@ impl BitcoinIndexer {
         // classify the message here, so we can pass it along to the handler explicitly
         match message {
             btc_message::NetworkMessage::Version(..) => {
-                return self.handle_version(message).and_then(|_r| Ok(true));
+                return self.handle_version(message).map(|_r| true);
             }
             btc_message::NetworkMessage::Verack => {
-                return self.handle_verack(message).and_then(|_r| Ok(true));
+                return self.handle_verack(message).map(|_r| true);
             }
             btc_message::NetworkMessage::Ping(..) => {
-                return self.handle_ping(message).and_then(|_r| Ok(true));
+                return self.handle_ping(message).map(|_r| true);
             }
             btc_message::NetworkMessage::Pong(..) => {
-                return self.handle_pong(message).and_then(|_r| Ok(true));
+                return self.handle_pong(message).map(|_r| true);
             }
             _ => match handler {
                 Some(custom_handler) => custom_handler.handle_message(self, message),

stackslib/src/burnchains/bitcoin/spv.rs

@@ -274,7 +274,7 @@ impl SpvClient {
         tx.execute("UPDATE db_config SET version = ?1", &[version])
             .map_err(db_error::SqliteError)
             .map_err(|e| e.into())
-            .and_then(|_| Ok(()))
+            .map(|_| ())
     }
 
     #[cfg(test)]
@@ -354,7 +354,7 @@ impl SpvClient {
     pub fn is_initialized(&self) -> Result<(), btc_error> {
         fs::metadata(&self.headers_path)
             .map_err(btc_error::FilesystemError)
-            .and_then(|_m| Ok(()))
+            .map(|_m| ())
     }
 
     /// Get the block range to scan
@@ -762,7 +762,7 @@ impl SpvClient {
 
         tx.execute(sql, args)
             .map_err(|e| btc_error::DBError(db_error::SqliteError(e)))
-            .and_then(|_x| Ok(()))
+            .map(|_x| ())
     }
 
     /// Initialize the block headers file with the genesis block hash.
@@ -1231,7 +1231,7 @@ impl BitcoinMessageHandler for SpvClient {
 
         indexer.runtime.last_getheaders_send_time = get_epoch_time_secs();
         self.send_next_getheaders(indexer, start_height)
-            .and_then(|_r| Ok(true))
+            .map(|_r| true)
     }
 
     /// Trait message handler
@@ -1298,7 +1298,7 @@ impl BitcoinMessageHandler for SpvClient {
                     );
                 }
                 self.send_next_getheaders(indexer, block_height)
-                    .and_then(|_| Ok(true))
+                    .map(|_| true)
             }
             x => Err(btc_error::UnhandledMessage(x)),
         }

stackslib/src/burnchains/tests/affirmation.rs

@@ -413,7 +413,7 @@ pub fn make_reward_cycle_with_vote(
             new_commits.push(commits.clone());
             commits
                 .into_iter()
-                .filter_map(|cmt| cmt)
+                .flatten()
                 .map(|cmt| BlockstackOperationType::LeaderBlockCommit(cmt))
                 .collect()
         };

stackslib/src/chainstate/burn/db/sortdb.rs

@@ -3936,7 +3936,7 @@ impl SortitionDBConn<'_> {
             tip,
             reward_cycle_id,
         )
-        .and_then(|(reward_cycle_info, _anchor_sortition_id)| Ok(reward_cycle_info))
+        .map(|(reward_cycle_info, _anchor_sortition_id)| reward_cycle_info)
     }
 
     /// Get the prepare phase start sortition ID of a reward cycle.  This is the first prepare
@@ -4048,25 +4048,23 @@ impl SortitionDB {
     }
 
     fn parse_last_anchor_block_hash(s: Option<String>) -> Option<BlockHeaderHash> {
-        s.map(|s| {
+        s.and_then(|s| {
             if s.is_empty() {
                 None
             } else {
                 Some(BlockHeaderHash::from_hex(&s).expect("BUG: Bad BlockHeaderHash stored in DB"))
             }
         })
-        .flatten()
     }
 
     fn parse_last_anchor_block_txid(s: Option<String>) -> Option<Txid> {
-        s.map(|s| {
+        s.and_then(|s| {
             if s.is_empty() {
                 None
             } else {
                 Some(Txid::from_hex(&s).expect("BUG: Bad Txid stored in DB"))
             }
         })
-        .flatten()
     }
 
     /// Mark a Stacks block snapshot as valid again, but update its memoized canonical Stacks tip

stackslib/src/chainstate/burn/operations/leader_key_register.rs

@@ -72,7 +72,7 @@ impl LeaderKeyRegisterOp {
     /// Interpret the first 20 bytes of the key registration's memo field as the Hash160 of
     ///  of the public key that will sign this miner's nakamoto blocks.
     pub fn interpret_nakamoto_signing_key(&self) -> Option<Hash160> {
-        self.memo.get(0..20).map(Hash160::from_bytes).flatten()
+        self.memo.get(0..20).and_then(Hash160::from_bytes)
     }
 
     /// Set the miner public key hash160 for block-signing

stackslib/src/chainstate/burn/sortition.rs

@@ -731,8 +731,7 @@ impl BlockSnapshot {
                 winning_block.key_vtxindex.into(),
                 &parent_snapshot.sortition_id,
             )?
-            .map(|key_op| key_op.interpret_nakamoto_signing_key())
-            .flatten();
+            .and_then(|key_op| key_op.interpret_nakamoto_signing_key());
 
         Ok(BlockSnapshot {
             block_height,

stackslib/src/chainstate/coordinator/mod.rs

@@ -2411,11 +2411,11 @@ impl<
             // burnchain has not yet advanced to epoch 3.0
             return self
                 .handle_new_epoch2_burnchain_block(&mut HashSet::new())
-                .and_then(|block_hash_opt| {
+                .map(|block_hash_opt| {
                     if let Some(block_hash) = block_hash_opt {
-                        Ok(NewBurnchainBlockStatus::WaitForPox2x(block_hash))
+                        NewBurnchainBlockStatus::WaitForPox2x(block_hash)
                     } else {
-                        Ok(NewBurnchainBlockStatus::Ready)
+                        NewBurnchainBlockStatus::Ready
                     }
                 });
         }
@@ -2444,12 +2444,12 @@ impl<
 
         // proceed to process sortitions in epoch 3.0
         self.handle_new_nakamoto_burnchain_block()
-            .and_then(|can_proceed| {
+            .map(|can_proceed| {
                 if can_proceed {
-                    Ok(NewBurnchainBlockStatus::Ready)
+                    NewBurnchainBlockStatus::Ready
                 } else {
                     // missing PoX anchor block, but unlike in 2.x, we don't know what it is!
-                    Ok(NewBurnchainBlockStatus::WaitForPoxNakamoto)
+                    NewBurnchainBlockStatus::WaitForPoxNakamoto
                 }
             })
     }

stackslib/src/chainstate/nakamoto/miner.rs

@@ -596,7 +596,7 @@ impl NakamotoBlockBuilder {
             tenure_info.coinbase_tx.clone(),
         ]
         .into_iter()
-        .filter_map(|x| x)
+        .flatten()
         .collect();
 
         // TODO: update this mempool check to prioritize signer vote transactions over other transactions