chore: Apply Clippy lint unnecessary_get_then_check

Author: jbencin

stackslib/src/chainstate/stacks/block.rs

@@ -444,14 +444,14 @@ impl StacksBlock {
         let mut txids = HashMap::new();
         for (i, tx) in txs.iter().enumerate() {
             let txid = tx.txid();
-            if txids.get(&txid).is_some() {
+            if txids.contains_key(&txid) {
                 warn!(
                     "Duplicate tx {}: at index {} and {}",
                     txid,
                     txids.get(&txid).unwrap(),
                     i
                 );
-                test_debug!("{:?}", &tx);
+                test_debug!("{tx:?}");
                 return false;
             }
             txids.insert(txid, i);

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

@@ -2857,7 +2857,7 @@ pub fn mine_invalid_token_transfers_block(
     );
     builder.force_mine_tx(clarity_tx, &tx1).unwrap();
 
-    if miner.spent_at_nonce.get(&1).is_none() {
+    if !miner.spent_at_nonce.contains_key(&1) {
         miner.spent_at_nonce.insert(1, 11111);
     }
 
@@ -2871,7 +2871,7 @@ pub fn mine_invalid_token_transfers_block(
     );
     builder.force_mine_tx(clarity_tx, &tx2).unwrap();
 
-    if miner.spent_at_nonce.get(&2).is_none() {
+    if !miner.spent_at_nonce.contains_key(&2) {
         miner.spent_at_nonce.insert(2, 22222);
     }
 

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

@@ -214,7 +214,7 @@ impl TestMinerTrace {
         let mut num_blocks = 0;
         for p in self.points.iter() {
             for miner_id in p.stacks_blocks.keys() {
-                if p.stacks_blocks.get(miner_id).is_some() {
+                if p.stacks_blocks.contains_key(miner_id) {
                     num_blocks += 1;
                 }
             }
@@ -227,7 +227,7 @@ impl TestMinerTrace {
         let mut num_sortitions = 0;
         for p in self.points.iter() {
             for miner_id in p.fork_snapshots.keys() {
-                if p.fork_snapshots.get(miner_id).is_some() {
+                if p.fork_snapshots.contains_key(miner_id) {
                     num_sortitions += 1;
                 }
             }

stackslib/src/core/tests/mod.rs

@@ -1266,7 +1266,7 @@ fn test_iterate_candidates_concurrent_write_lock() {
     assert_eq!(all_addr_nonces.len(), expected_addr_nonces.len());
 
     for (addr, nonce) in all_addr_nonces {
-        assert!(expected_addr_nonces.get(&addr).is_some());
+        assert!(expected_addr_nonces.contains_key(&addr));
         assert_eq!(nonce, 24);
     }
 }

stackslib/src/net/inv/nakamoto.rs

@@ -241,7 +241,7 @@ impl InvGenerator {
         tenure_id_consensus_hash: &ConsensusHash,
     ) -> Result<Option<InvTenureInfo>, NetError> {
         let tip_block_id = StacksBlockId::new(tip_block_ch, tip_block_bh);
-        if self.processed_tenures.get(&tip_block_id).is_none() {
+        if !self.processed_tenures.contains_key(&tip_block_id) {
             // this tip has no known table.
             // does it have an ancestor with a table? If so, then move its ancestor's table to this
             // tip. Otherwise, make a new table.

stackslib/src/net/relay.rs

@@ -406,7 +406,7 @@ impl RelayerStats {
         // look up ASNs
         let mut asns = HashMap::new();
         for nk in neighbors.iter() {
-            if asns.get(nk).is_none() {
+            if !asns.contains_key(nk) {
                 match PeerDB::asn_lookup(conn, &nk.addrbytes)? {
                     Some(asn) => asns.insert((*nk).clone(), asn),
                     None => asns.insert((*nk).clone(), 0),
@@ -1150,7 +1150,7 @@ impl Relayer {
 
         for (anchored_block_hash, (relayers, mblocks_map)) in new_microblocks.into_iter() {
             for (_, mblock) in mblocks_map.into_iter() {
-                if mblocks_data.get(&anchored_block_hash).is_none() {
+                if !mblocks_data.contains_key(&anchored_block_hash) {
                     mblocks_data.insert(anchored_block_hash.clone(), vec![]);
                 }
 

stackslib/src/net/tests/download/nakamoto.rs

@@ -1182,7 +1182,7 @@ fn test_tenure_start_end_from_inventory() {
         for (i, wt) in wanted_tenures.iter().enumerate() {
             if i >= (rc_len - 1).into() {
                 // nothing here
-                assert!(available.get(&wt.tenure_id_consensus_hash).is_none());
+                assert!(!available.contains_key(&wt.tenure_id_consensus_hash));
                 continue;
             }
 

stackslib/src/net/tests/httpcore.rs

@@ -767,11 +767,11 @@ fn test_http_response_type_codec() {
         match preamble {
             StacksHttpPreamble::Response(ref mut req) => {
                 assert_eq!(req.headers.len(), 5);
-                assert!(req.headers.get("access-control-allow-headers").is_some());
-                assert!(req.headers.get("access-control-allow-methods").is_some());
-                assert!(req.headers.get("access-control-allow-origin").is_some());
-                assert!(req.headers.get("server").is_some());
-                assert!(req.headers.get("date").is_some());
+                assert!(req.headers.contains_key("access-control-allow-headers"));
+                assert!(req.headers.contains_key("access-control-allow-methods"));
+                assert!(req.headers.contains_key("access-control-allow-origin"));
+                assert!(req.headers.contains_key("server"));
+                assert!(req.headers.contains_key("date"));
                 req.headers.clear();
             }
             StacksHttpPreamble::Request(_) => {

stackslib/src/net/tests/mempool/mod.rs

@@ -307,7 +307,7 @@ fn test_mempool_sync_2_peers() {
     // peer 2 has none of the old ones
     for tx in peer_2_mempool_txs {
         assert_eq!(&tx.tx, txs.get(&tx.tx.txid()).unwrap());
-        assert!(old_txs.get(&tx.tx.txid()).is_none());
+        assert!(!old_txs.contains_key(&tx.tx.txid()));
     }
 }
 

stackslib/src/net/tests/neighbors.rs

@@ -581,7 +581,7 @@ fn test_step_walk_1_neighbor_bootstrapping() {
                     assert_eq!(w.result.replaced_neighbors.len(), 0);
 
                     // peer 2 never gets added to peer 1's frontier
-                    assert!(w.frontier.get(&neighbor_2.addr).is_none());
+                    assert!(!w.frontier.contains_key(&neighbor_2.addr));
                 }
                 None => {}
             };
@@ -597,7 +597,7 @@ fn test_step_walk_1_neighbor_bootstrapping() {
             i += 1;
         }
 
-        debug!("Completed walk round {} step(s)", i);
+        debug!("Completed walk round {i} step(s)");
 
         // peer 1 contacted peer 2
         let stats_1 = peer_1
@@ -673,7 +673,7 @@ fn test_step_walk_1_neighbor_behind() {
                     assert_eq!(w.result.replaced_neighbors.len(), 0);
 
                     // peer 1 never gets added to peer 2's frontier
-                    assert!(w.frontier.get(&neighbor_1.addr).is_none());
+                    assert!(!w.frontier.contains_key(&neighbor_1.addr));
                 }
                 None => {}
             };