Fix or disable the new clippy::question_mark lint (#2946)

Co-authored-by: Conrado Gouvea <conrado@zfnd.org>

zebra-consensus/src/block/check.rs

@@ -189,12 +189,10 @@ pub fn merkle_root_validity(
     block: &Block,
     transaction_hashes: &[transaction::Hash],
 ) -> Result<(), BlockError> {
-    if block
+    // TODO: deduplicate zebra-chain and zebra-consensus errors (#2908)
+    block
         .check_transaction_network_upgrade_consistency(network)
-        .is_err()
-    {
-        return Err(BlockError::WrongTransactionConsensusBranchId);
-    }
+        .map_err(|_| BlockError::WrongTransactionConsensusBranchId)?;
 
     let merkle_root = transaction_hashes.iter().cloned().collect();
 

zebrad/src/components/sync/status/tests.rs

@@ -129,6 +129,8 @@ proptest! {
             loop {
                 update_events.acquire().await.forget();
 
+                // The refactor suggested by clippy is harder to read and understand.
+                #[allow(clippy::question_mark)]
                 if status.wait_until_close_to_tip().await.is_err() {
                     return Ok(());
                 }