Fix approx_constant, assertions_on_constants, assign_op_pattern, and bool_assert_comparison throughout stacks-core

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

Author: jferrant

clarity/src/vm/tests/assets.rs

@@ -212,7 +212,7 @@ fn test_native_stx_ops(epoch: StacksEpochId, mut env_factory: TopLevelMemoryEnvi
     .unwrap();
 
     assert!(is_err_code(&result, 3));
-    assert_eq!(asset_map.to_table().len(), 0);
+    assert!(asset_map.to_table().is_empty());
 
     let (result, asset_map, _events) = execute_transaction(
         &mut owned_env,
@@ -224,7 +224,7 @@ fn test_native_stx_ops(epoch: StacksEpochId, mut env_factory: TopLevelMemoryEnvi
     .unwrap();
 
     assert!(is_err_code(&result, 3));
-    assert_eq!(asset_map.to_table().len(), 0);
+    assert!(asset_map.to_table().is_empty());
 
     // test 2: from = to
 
@@ -238,7 +238,7 @@ fn test_native_stx_ops(epoch: StacksEpochId, mut env_factory: TopLevelMemoryEnvi
     .unwrap();
 
     assert!(is_err_code(&result, 2));
-    assert_eq!(asset_map.to_table().len(), 0);
+    assert!(asset_map.to_table().is_empty());
 
     // test 3: sender is not tx-sender
 
@@ -252,7 +252,7 @@ fn test_native_stx_ops(epoch: StacksEpochId, mut env_factory: TopLevelMemoryEnvi
     .unwrap();
 
     assert!(is_err_code(&result, 4));
-    assert_eq!(asset_map.to_table().len(), 0);
+    assert!(asset_map.to_table().is_empty());
 
     let (result, asset_map, _events) = execute_transaction(
         &mut owned_env,
@@ -264,7 +264,7 @@ fn test_native_stx_ops(epoch: StacksEpochId, mut env_factory: TopLevelMemoryEnvi
     .unwrap();
 
     assert!(is_err_code(&result, 4));
-    assert_eq!(asset_map.to_table().len(), 0);
+    assert!(asset_map.to_table().is_empty());
 
     // test 4: amount > balance
 
@@ -278,7 +278,7 @@ fn test_native_stx_ops(epoch: StacksEpochId, mut env_factory: TopLevelMemoryEnvi
     .unwrap();
 
     assert!(is_err_code(&result, 1));
-    assert_eq!(asset_map.to_table().len(), 0);
+    assert!(asset_map.to_table().is_empty());
 
     let (result, asset_map, _events) = execute_transaction(
         &mut owned_env,
@@ -290,7 +290,7 @@ fn test_native_stx_ops(epoch: StacksEpochId, mut env_factory: TopLevelMemoryEnvi
     .unwrap();
 
     assert!(is_err_code(&result, 1));
-    assert_eq!(asset_map.to_table().len(), 0);
+    assert!(asset_map.to_table().is_empty());
 
     // test 5: overflow
     //  NOTE: this tested behavior is no longer reachable: the total liquid ustx supply
@@ -569,7 +569,7 @@ fn test_simple_token_system(
     .unwrap();
     assert!(!is_committed(&result));
 
-    assert_eq!(asset_map.to_table().len(), 0);
+    assert!(asset_map.to_table().is_empty());
 
     let (result, asset_map, _events) = execute_transaction(
         &mut owned_env,
@@ -597,7 +597,7 @@ fn test_simple_token_system(
     .unwrap();
 
     assert!(is_err_code(&result, 1));
-    assert_eq!(asset_map.to_table().len(), 0);
+    assert!(asset_map.to_table().is_empty());
 
     let (result, asset_map, _events) = execute_transaction(
         &mut owned_env,
@@ -609,7 +609,7 @@ fn test_simple_token_system(
     .unwrap();
 
     assert!(is_err_code(&result, 2));
-    assert_eq!(asset_map.to_table().len(), 0);
+    assert!(asset_map.to_table().is_empty());
 
     let err = execute_transaction(
         &mut owned_env,
@@ -635,7 +635,7 @@ fn test_simple_token_system(
     .unwrap();
 
     assert_eq!(result, Value::UInt(1000));
-    assert_eq!(asset_map.to_table().len(), 0);
+    assert!(asset_map.to_table().is_empty());
 
     let (result, asset_map, _events) = execute_transaction(
         &mut owned_env,
@@ -647,7 +647,7 @@ fn test_simple_token_system(
     .unwrap();
 
     assert_eq!(result, Value::UInt(9200));
-    assert_eq!(asset_map.to_table().len(), 0);
+    assert!(asset_map.to_table().is_empty());
 
     let (result, asset_map, _events) = execute_transaction(
         &mut owned_env,
@@ -814,7 +814,7 @@ fn test_simple_token_system(
     .unwrap();
 
     assert!(!is_committed(&result));
-    assert_eq!(asset_map.to_table().len(), 0);
+    assert!(asset_map.to_table().is_empty());
 }
 
 #[apply(test_epochs)]
@@ -1126,7 +1126,7 @@ fn test_simple_naming_system(
     )
     .unwrap();
     assert!(is_err_code(&result, 0));
-    assert_eq!(asset_map.to_table().len(), 0);
+    assert!(asset_map.to_table().is_empty());
 
     let (result, asset_map, _events) = execute_transaction(
         &mut owned_env,
@@ -1157,7 +1157,7 @@ fn test_simple_naming_system(
     .unwrap();
 
     assert!(is_err_code(&result, 1));
-    assert_eq!(asset_map.to_table().len(), 0);
+    assert!(asset_map.to_table().is_empty());
 
     let (result, asset_map, _events) = execute_transaction(
         &mut owned_env,
@@ -1169,7 +1169,7 @@ fn test_simple_naming_system(
     .unwrap();
 
     assert!(is_committed(&result));
-    assert_eq!(asset_map.to_table().len(), 0);
+    assert!(asset_map.to_table().is_empty());
 
     // let's transfer name
 
@@ -1183,7 +1183,7 @@ fn test_simple_naming_system(
     .unwrap();
 
     assert!(is_err_code(&result, 3));
-    assert_eq!(asset_map.to_table().len(), 0);
+    assert!(asset_map.to_table().is_empty());
 
     let (result, asset_map, _events) = execute_transaction(
         &mut owned_env,
@@ -1195,7 +1195,7 @@ fn test_simple_naming_system(
     .unwrap();
 
     assert!(is_err_code(&result, 1));
-    assert_eq!(asset_map.to_table().len(), 0);
+    assert!(asset_map.to_table().is_empty());
 
     let (result, asset_map, _events) = execute_transaction(
         &mut owned_env,
@@ -1207,7 +1207,7 @@ fn test_simple_naming_system(
     .unwrap();
 
     assert!(is_err_code(&result, 2));
-    assert_eq!(asset_map.to_table().len(), 0);
+    assert!(asset_map.to_table().is_empty());
 
     let (result, asset_map, _events) = execute_transaction(
         &mut owned_env,
@@ -1314,7 +1314,7 @@ fn test_simple_naming_system(
     .unwrap();
 
     assert!(is_committed(&result));
-    assert_eq!(asset_map.to_table().len(), 0);
+    assert!(asset_map.to_table().is_empty());
 
     // p2 burning 8 (which belongs to p1) should succeed even though sender != tx_sender.
     let (result, asset_map, _events) = execute_transaction(
@@ -1375,7 +1375,7 @@ fn test_simple_naming_system(
     .unwrap();
 
     assert!(is_committed(&result));
-    assert_eq!(asset_map.to_table().len(), 0);
+    assert!(asset_map.to_table().is_empty());
 
     {
         let mut env = owned_env.get_exec_environment(None, None, &placeholder_context);

libsigner/src/tests/http.rs

@@ -338,7 +338,7 @@ fn test_run_http_request_no_body() {
         )
         .unwrap();
 
-        assert_eq!(result_chunked.len(), 0);
-        assert_eq!(result_plain.len(), 0);
+        assert!(result_chunked.is_empty());
+        assert!(result_plain.is_empty());
     }
 }

stacks-common/src/deps_common/httparse/mod.rs

@@ -939,7 +939,7 @@ mod tests {
             assert_eq!(req.method.unwrap(), "GET");
             assert_eq!(req.path.unwrap(), "/");
             assert_eq!(req.version.unwrap(), 1);
-            assert_eq!(req.headers.len(), 0);
+            assert!(req.headers.is_empty());
         }
     }
 
@@ -950,7 +950,7 @@ mod tests {
             assert_eq!(req.method.unwrap(), "GET");
             assert_eq!(req.path.unwrap(), "/thing?data=a");
             assert_eq!(req.version.unwrap(), 1);
-            assert_eq!(req.headers.len(), 0);
+            assert!(req.headers.is_empty());
         }
     }
 
@@ -961,7 +961,7 @@ mod tests {
             assert_eq!(req.method.unwrap(), "GET");
             assert_eq!(req.path.unwrap(), "/thing?data=a^");
             assert_eq!(req.version.unwrap(), 1);
-            assert_eq!(req.headers.len(), 0);
+            assert!(req.headers.is_empty());
         }
     }
 
@@ -1084,7 +1084,7 @@ mod tests {
             assert_eq!(req.method.unwrap(), "GET");
             assert_eq!(req.path.unwrap(), "/");
             assert_eq!(req.version.unwrap(), 1);
-            assert_eq!(req.headers.len(), 0);
+            assert!(req.headers.is_empty());
         }
     }
 
@@ -1095,7 +1095,7 @@ mod tests {
             assert_eq!(req.method.unwrap(), "GET");
             assert_eq!(req.path.unwrap(), "/");
             assert_eq!(req.version.unwrap(), 1);
-            assert_eq!(req.headers.len(), 0);
+            assert!(req.headers.is_empty());
         }
     }
 
@@ -1106,7 +1106,7 @@ mod tests {
             assert_eq!(req.method.unwrap(), "GET");
             assert_eq!(req.path.unwrap(), "/\\?wayne\\=5");
             assert_eq!(req.version.unwrap(), 1);
-            assert_eq!(req.headers.len(), 0);
+            assert!(req.headers.is_empty());
         }
     }
 

stacks-common/src/deps_common/httparse_tests/mod.rs

@@ -2283,7 +2283,7 @@ req! {
         assert_eq!(req.method.unwrap(), "GET");
         assert_eq!(req.path.unwrap(), "\\.\\./");
         assert_eq!(req.version.unwrap(), 1);
-        assert_eq!(req.headers.len(), 0);
+        assert!(req.headers.is_empty());
     }
 }
 

stacks-common/src/util/hash.rs

@@ -816,7 +816,7 @@ mod test {
             vec![127, 0, 0, 1]
         );
 
-        assert_eq!(bin_bytes("").unwrap().len(), 0);
+        assert!(bin_bytes("").unwrap().is_empty());
         assert!(bin_bytes("2").is_err());
     }
 }

stacks-common/src/util/pipe.rs

@@ -103,7 +103,7 @@ impl PipeRead {
     }
 
     fn fill_buf(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        assert_eq!(self.buf.len(), 0);
+        assert!(self.buf.is_empty());
         assert_eq!(self.i, 0);
 
         let mut copied = 0;
@@ -429,16 +429,14 @@ mod test {
 
                 let nw = match pipe_write.write(&buf[i..(i + span)]) {
                     Ok(sz) => sz,
-                    Err(e) => match e.kind() {
-                        io::ErrorKind::BrokenPipe => {
+                    Err(e) => {
+                        if let io::ErrorKind::BrokenPipe = e.kind() {
                             broken_pipe = true;
                             0
+                        } else {
+                            panic!("unwrapped err: {e:?}");
                         }
-                        _ => {
-                            assert!(false, "unwrapped err: {:?}", &e);
-                            unreachable!();
-                        }
-                    },
+                    }
                 };
 
                 i += span;
@@ -449,7 +447,7 @@ mod test {
                 assert_eq!(i, buf.len());
             }
 
-            test_debug!("producer exit; wrote {} bytes", i);
+            test_debug!("producer exit; wrote {i} bytes");
         });
 
         let consumer = thread::spawn(move || {
@@ -462,27 +460,23 @@ mod test {
 
                 let nr = match pipe_read.read(&mut next_bytes[..]) {
                     Ok(sz) => sz,
-                    Err(e) => match e.kind() {
-                        io::ErrorKind::BrokenPipe => {
+                    Err(e) => {
+                        if let io::ErrorKind::BrokenPipe = e.kind() {
                             test_debug!("Read pipe broke");
                             broken_pipe = true;
                             0
+                        } else {
+                            panic!("unwrapped err: {e:?}");
                         }
-                        _ => {
-                            assert!(false, "unwrapped err: {:?}", &e);
-                            unreachable!();
-                        }
-                    },
+                    }
                 };
 
                 input.extend_from_slice(&next_bytes[0..nr]);
 
-                test_debug!("Read buffer added {} bytes (now {})", nr, input.len());
+                test_debug!("Read buffer added {nr} bytes (now {})", input.len());
                 assert!(
                     nr == span || input.len() == buf_compare.len(),
-                    "nr = {}, span = {}, input.len() = {}, buf_compare.len() = {}",
-                    nr,
-                    span,
+                    "nr = {nr}, span = {span}, input.len() = {}, buf_compare.len() = {}",
                     input.len(),
                     buf_compare.len()
                 );

stacks-common/src/util/secp256k1.rs

@@ -558,7 +558,7 @@ mod tests {
                 (_, _) => {
                     // either got a key when we didn't expect one, or didn't get a key when we did
                     // expect one.
-                    assert!(false, "Unexpected result: we either got a key when we didn't expect one, or didn't get a key when we did expect one.");
+                    panic!("Unexpected result: we either got a key when we didn't expect one, or didn't get a key when we did expect one.");
                 }
             }
         }

stacks-signer/src/signerdb.rs

@@ -1899,7 +1899,7 @@ mod tests {
         assert_eq!(pending_hash, Some(Sha512Trunc256Sum([0x03; 32])));
 
         let pendings = db.get_all_pending_block_validations().unwrap();
-        assert_eq!(pendings.len(), 0);
+        assert!(pendings.is_empty());
     }
 
     #[test]