Code review comments part 2

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

Author: jferrant

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

@@ -9913,7 +9913,7 @@ pub mod test {
             {
                 let mut debug_reader = LogReader::from_reader(&mut mblock_ptr);
                 let next_mblock = StacksMicroblock::consensus_deserialize(&mut debug_reader)
-                    .map_err(|e| {
+                    .unwrap_or_else(|e| {
                         panic!(
                             "Failed to decode microblock {}: {e:?}\nBytes consumed:\n{}",
                             mblocks.len(),
@@ -9924,8 +9924,7 @@ pub mod test {
                                 .collect::<Vec<_>>()
                                 .join("\n")
                         );
-                    })
-                    .unwrap();
+                    });
                 mblocks.push(next_mblock);
             }
             if mblock_ptr.is_empty() {

stackslib/src/net/connection.rs

@@ -1620,35 +1620,26 @@ mod test {
         let mut drained = false;
         let mut total_bytes = 0;
         while !drained {
-            match shared_state.lock() {
-                Ok(ref mut conn) => {
-                    // in the foreground, get the messages
-                    let nr = match conn.recv_data(&mut read) {
-                        Ok(cnt) => {
-                            if cnt == 0 {
-                                thread::yield_now();
-                            }
-
-                            cnt
-                        }
-                        Err(e) => {
-                            if let net_error::PermanentlyDrained = e {
-                                drained = true;
-                                0
-                            } else {
-                                panic!("{e:?}");
-                            }
-                        }
-                    };
-
-                    if nr > 0 {
-                        test_debug!("Received {nr} bytes");
-                        total_bytes += nr;
+            let mut conn = shared_state.lock().unwrap_or_else(|e| panic!("{e:?}"));
+            // in the foreground, get the messages
+            let nr = match conn.recv_data(&mut read) {
+                Ok(cnt) => {
+                    if cnt == 0 {
+                        thread::yield_now();
                     }
+
+                    cnt
                 }
-                Err(e) => {
-                    panic!("{e:?}");
+                Err(net_error::PermanentlyDrained) => {
+                    drained = true;
+                    0
                 }
+                Err(e) => panic!("{e:?}"),
+            };
+
+            if nr > 0 {
+                test_debug!("Received {nr} bytes");
+                total_bytes += nr;
             }
         }
 
@@ -1783,14 +1774,11 @@ mod test {
                     // in the foreground, get the messages
                     let nr = match conn.recv_data(&mut read) {
                         Ok(cnt) => cnt,
-                        Err(e) => {
-                            if let net_error::PermanentlyDrained = e {
-                                drained = true;
-                                0
-                            } else {
-                                panic!("{e:?}");
-                            }
+                        Err(net_error::PermanentlyDrained) => {
+                            drained = true;
+                            0
                         }
+                        Err(e) => panic!("{e:?}"),
                     };
 
                     if nr > 0 {

stackslib/src/net/server.rs

@@ -1046,18 +1046,11 @@ mod test {
                 match http_response_bytes_res {
                     Ok(http_response_bytes) => {
                         // should be a PeerInfo
-                        let response = match StacksHttp::parse_response(
+                        let response = StacksHttp::parse_response(
                             "GET",
                             "/v2/info",
                             &http_response_bytes,
-                        ) {
-                            Ok(res) => res,
-                            Err(e) => {
-                                panic!(
-                                    "Failed to parse /v2/info response from:\n{http_response_bytes:?}\n{e:?}"
-                                );
-                            }
-                        };
+                        ).unwrap_or_else(|e| panic!("Failed to parse /v2/info response from:\n{http_response_bytes:?}\n{e:?}"));
                         *have_success.borrow_mut() = true;
                         true
                     }

stackslib/src/net/tests/httpcore.rs

@@ -731,12 +731,9 @@ fn test_http_response_type_codec() {
             .unwrap();
 
         http.set_response_handler(request_verb, request_path);
-        let (mut preamble, offset) = match http.read_preamble(&bytes) {
-            Ok((p, o)) => (p, o),
-            Err(e) => {
-                panic!("first 4096 bytes:\n{bytes:?}\nerror: {e:?}");
-            }
-        };
+        let (mut preamble, offset) = http
+            .read_preamble(&bytes)
+            .unwrap_or_else(|e| panic!("first 4096 bytes:\n{bytes:?}\nerror: {e:?}"));
 
         test_debug!(
             "{request_verb} {request_path}: read preamble of {offset} bytes\n{preamble:?}\n",

testnet/stacks-node/src/tests/nakamoto_integrations.rs

@@ -10693,10 +10693,7 @@ fn test_tenure_extend_from_flashblocks() {
         .collect();
     let initial_balances: Vec<_> = account_keys
         .iter()
-        .map(|privk| {
-            let address = to_addr(privk);
-            (address, 1_000_000)
-        })
+        .map(|privk| (to_addr(privk), 1_000_000))
         .collect();
 
     let deployer_sk = account_keys.pop().unwrap();