Merge branch 'develop' of https://github.com/stacks-network/stacks-core into fix/clippy-ci-stacks-lib-needless-borrow

Author: jferrant

clarity/src/vm/docs/mod.rs

@@ -2732,9 +2732,7 @@ fn make_all_api_reference() -> ReferenceAPIs {
 #[allow(clippy::expect_used)]
 pub fn make_json_api_reference() -> String {
     let api_out = make_all_api_reference();
-    serde_json::to_string(&api_out)
-        .expect("Failed to serialize documentation")
-        .to_string()
+    serde_json::to_string(&api_out).expect("Failed to serialize documentation")
 }
 
 #[cfg(test)]

pox-locking/src/events.rs

@@ -545,7 +545,6 @@ fn create_event_info_data_code(
                     "#,
                     delegate_to = opt
                         .data
-                        .clone()
                         .map(|boxed_value| *boxed_value)
                         .unwrap()
                         .expect_tuple()

stacks-common/src/util/tests.rs

@@ -94,6 +94,6 @@ impl<T: Default + Clone> TestFlag<T> {
     /// assert_eq!(test_flag.get(), 123);
     /// ```
     pub fn get(&self) -> T {
-        self.0.lock().unwrap().clone().unwrap_or_default().clone()
+        self.0.lock().unwrap().clone().unwrap_or_default()
     }
 }

stacks-signer/src/signerdb.rs

@@ -1235,7 +1235,7 @@ mod tests {
             .unwrap()
             .expect("Unable to get block from db");
 
-        assert_eq!(BlockInfo::from(block_proposal_1.clone()), block_info);
+        assert_eq!(BlockInfo::from(block_proposal_1), block_info);
 
         // Test looking up a block with an unknown hash
         let block_info = db
@@ -1250,7 +1250,7 @@ mod tests {
             .unwrap()
             .expect("Unable to get block from db");
 
-        assert_eq!(BlockInfo::from(block_proposal_2.clone()), block_info);
+        assert_eq!(BlockInfo::from(block_proposal_2), block_info);
     }
 
     #[test]
@@ -1677,12 +1677,11 @@ mod tests {
                 &StacksPrivateKey::new(),
             )),
         };
-        let tenure_change_tx_payload =
-            TransactionPayload::TenureChange(tenure_change_payload.clone());
+        let tenure_change_tx_payload = TransactionPayload::TenureChange(tenure_change_payload);
         let tenure_change_tx = StacksTransaction::new(
             TransactionVersion::Testnet,
             TransactionAuth::from_p2pkh(&StacksPrivateKey::new()).unwrap(),
-            tenure_change_tx_payload.clone(),
+            tenure_change_tx_payload,
         );
 
         let consensus_hash_1 = ConsensusHash([0x01; 20]);

stackslib/src/burnchains/affirmation.rs

@@ -1182,7 +1182,7 @@ pub fn update_pox_affirmation_maps<B: BurnchainHeaderReader>(
     let (prepare_ops, pox_anchor_block_info_opt) =
         find_pox_anchor_block(&tx, reward_cycle, indexer, burnchain)?;
 
-    if let Some((anchor_block, descendancy)) = pox_anchor_block_info_opt.clone() {
+    if let Some((anchor_block, descendancy)) = pox_anchor_block_info_opt {
         debug!(
             "PoX anchor block elected in reward cycle {} for reward cycle {} is {}",
             reward_cycle,

stackslib/src/burnchains/bitcoin/indexer.rs

@@ -1343,11 +1343,9 @@ mod test {
         let mut spv_client_reorg =
             SpvClient::new(path_2, 0, None, BitcoinNetworkType::Regtest, true, false).unwrap();
 
-        spv_client
-            .insert_block_headers_after(0, headers_1.clone())
-            .unwrap();
+        spv_client.insert_block_headers_after(0, headers_1).unwrap();
         spv_client_reorg
-            .insert_block_headers_after(0, headers_2.clone())
+            .insert_block_headers_after(0, headers_2)
             .unwrap();
 
         spv_client.update_chain_work().unwrap();
@@ -1521,11 +1519,9 @@ mod test {
         let mut spv_client_reorg =
             SpvClient::new(path_2, 0, None, BitcoinNetworkType::Regtest, true, false).unwrap();
 
-        spv_client
-            .insert_block_headers_after(0, headers_1.clone())
-            .unwrap();
+        spv_client.insert_block_headers_after(0, headers_1).unwrap();
         spv_client_reorg
-            .insert_block_headers_after(0, headers_2.clone())
+            .insert_block_headers_after(0, headers_2)
             .unwrap();
 
         assert_eq!(spv_client.read_block_headers(0, 10).unwrap().len(), 4);
@@ -3338,7 +3334,7 @@ mod test {
 
         // put these bad headers into the "main" chain
         spv_client
-            .insert_block_headers_after(40318, bad_headers.clone())
+            .insert_block_headers_after(40318, bad_headers)
             .unwrap();
 
         // *now* calculate main chain work
@@ -3485,9 +3481,7 @@ mod test {
         )
         .unwrap();
 
-        spv_client
-            .test_write_block_headers(0, headers.clone())
-            .unwrap();
+        spv_client.test_write_block_headers(0, headers).unwrap();
         assert_eq!(spv_client.get_highest_header_height().unwrap(), 2);
 
         let mut indexer = BitcoinIndexer::new(
@@ -3518,7 +3512,7 @@ mod test {
 
         let should_keep_running = Arc::new(AtomicBool::new(true));
         let mut indexer = BitcoinIndexer::new(
-            BitcoinIndexerConfig::test_default(db_path.to_string()),
+            BitcoinIndexerConfig::test_default(db_path),
             BitcoinIndexerRuntime::new(BitcoinNetworkType::Mainnet),
             Some(should_keep_running.clone()),
         );

stackslib/src/burnchains/bitcoin/spv.rs

@@ -1627,7 +1627,7 @@ mod test {
             .unwrap();
         assert_eq!(spv_client.read_block_headers(1, 10).unwrap(), headers);
 
-        let mut all_headers = vec![genesis_regtest_header.clone()];
+        let mut all_headers = vec![genesis_regtest_header];
         all_headers.append(&mut headers.clone());
 
         assert_eq!(spv_client.read_block_headers(0, 10).unwrap(), all_headers);
@@ -1650,9 +1650,7 @@ mod test {
         }
 
         // should succeed
-        spv_client
-            .insert_block_headers_before(9, headers.clone())
-            .unwrap();
+        spv_client.insert_block_headers_before(9, headers).unwrap();
     }
 
     #[test]
@@ -1771,10 +1769,7 @@ mod test {
         ];
 
         // should fail
-        if let btc_error::InvalidPoW = spv_client
-            .handle_headers(40317, bad_headers.clone())
-            .unwrap_err()
-        {
+        if let btc_error::InvalidPoW = spv_client.handle_headers(40317, bad_headers).unwrap_err() {
         } else {
             panic!("Bad PoW headers accepted");
         }

stackslib/src/burnchains/tests/affirmation.rs

@@ -621,7 +621,7 @@ fn test_parent_block_commits() {
     // orphan
     assert_eq!(parent_commits.len(), all_ops_with_orphan.len() - 1);
 
-    let mut all_ops_with_same_parent = all_ops.clone();
+    let mut all_ops_with_same_parent = all_ops;
     for ops in all_ops_with_same_parent.iter_mut() {
         for opdata in ops.iter_mut() {
             opdata.parent_block_ptr = 3;
@@ -948,7 +948,7 @@ fn test_find_heaviest_block_commit() {
     //             X------- 4,0
     //
     //             X------------ 5,0
-    let mut all_ops_no_majority = filtered_ops.clone();
+    let mut all_ops_no_majority = filtered_ops;
     all_ops_no_majority[0][0].parent_block_ptr = 2;
     all_ops_no_majority[0][0].parent_vtxindex = 10;
     all_ops_no_majority[0][0].burn_fee = 0;
@@ -1153,7 +1153,7 @@ fn test_find_heaviest_parent_commit_many_commits() {
     // 1,0 <-- 2,0 <--- 3,0 <--- 4,0 <--- 5,0
     //  \
     //   `---- 2,1 <--- 3,1 <--- 4,1 <--- 5,1 (winner)
-    let mut all_ops_no_majority = filtered_ops.clone();
+    let mut all_ops_no_majority = filtered_ops;
 
     // 3,0
     all_ops_no_majority[0][0].parent_block_ptr = 2;

stackslib/src/burnchains/tests/burnchain.rs

@@ -428,16 +428,12 @@ fn test_process_block_ops() {
         ],
         vec![
             BlockstackOperationType::LeaderBlockCommit(block_commit_1.clone()),
-            BlockstackOperationType::LeaderBlockCommit(block_commit_2.clone()),
+            BlockstackOperationType::LeaderBlockCommit(block_commit_2),
             BlockstackOperationType::LeaderBlockCommit(block_commit_3.clone()),
         ],
     ];
 
-    let block_124_winners = vec![
-        block_commit_1.clone(),
-        block_commit_3.clone(),
-        block_commit_1.clone(),
-    ];
+    let block_124_winners = vec![block_commit_1.clone(), block_commit_3, block_commit_1];
 
     let mut db = SortitionDB::connect_test(first_block_height, &first_burn_hash).unwrap();
 

stackslib/src/burnchains/tests/db.rs

@@ -147,7 +147,7 @@ fn test_store_and_fetch() {
         &BurnchainHeaderHash::sentinel()
     );
 
-    let headers = vec![first_block_header.clone()];
+    let headers = vec![first_block_header];
     let canon_hash = BurnchainHeaderHash([1; 32]);
 
     let canonical_block =
@@ -1094,7 +1094,7 @@ fn test_classify_delegate_stx() {
 
     let canonical_block =
         BurnchainBlock::Bitcoin(BitcoinBlock::new(500, &canon_hash, &first_bhh, vec![], 485));
-    let mut headers = vec![first_block_header.clone(), canonical_block.header().clone()];
+    let mut headers = vec![first_block_header, canonical_block.header()];
 
     let ops = burnchain_db
         .store_new_burnchain_block(
@@ -1287,8 +1287,8 @@ fn test_classify_delegate_stx() {
         360,
     ));
 
-    headers.push(block_0.header().clone());
-    headers.push(block_1.header().clone());
+    headers.push(block_0.header());
+    headers.push(block_1.header());
 
     test_debug!("store ops ({}) for block 0", ops_0_length);
     let processed_ops_0 = burnchain_db