Merge branch 'develop' into fix/clippy-ci-stacks-lib-collapsible-else-if

Author: jferrant

clarity/src/vm/representations.rs

@@ -84,6 +84,7 @@ guarded_string!(
 );
 
 impl StacksMessageCodec for ClarityName {
+    #[allow(clippy::needless_as_bytes)] // as_bytes isn't necessary, but verbosity is preferable in the codec impls
     fn consensus_serialize<W: Write>(&self, fd: &mut W) -> Result<(), codec_error> {
         // ClarityName can't be longer than vm::representations::MAX_STRING_LEN, which itself is
         // a u8, so we should be good here.
@@ -124,6 +125,7 @@ impl StacksMessageCodec for ClarityName {
 }
 
 impl StacksMessageCodec for ContractName {
+    #[allow(clippy::needless_as_bytes)] // as_bytes isn't necessary, but verbosity is preferable in the codec impls
     fn consensus_serialize<W: Write>(&self, fd: &mut W) -> Result<(), codec_error> {
         if self.as_bytes().len() < CONTRACT_MIN_NAME_LENGTH
             || self.as_bytes().len() > CONTRACT_MAX_NAME_LENGTH

libsigner/src/v0/messages.rs

@@ -283,6 +283,7 @@ pub struct PeerInfo {
 }
 
 impl StacksMessageCodec for PeerInfo {
+    #[allow(clippy::needless_as_bytes)] // as_bytes isn't necessary, but verbosity is preferable in the codec impls
     fn consensus_serialize<W: Write>(&self, fd: &mut W) -> Result<(), CodecError> {
         write_next(fd, &self.burn_block_height)?;
         write_next(fd, self.stacks_tip_consensus_hash.as_bytes())?;

pox-locking/src/events.rs

@@ -20,10 +20,10 @@ use clarity::vm::costs::LimitedCostTracker;
 use clarity::vm::errors::Error as ClarityError;
 use clarity::vm::types::{PrincipalData, QualifiedContractIdentifier, ResponseData, TupleData};
 use clarity::vm::Value;
-#[cfg(test)]
+#[cfg(any(test, feature = "testing"))]
 use slog::slog_debug;
 use slog::slog_error;
-#[cfg(test)]
+#[cfg(any(test, feature = "testing"))]
 use stacks_common::debug;
 use stacks_common::types::StacksEpochId;
 use stacks_common::{error, test_debug};

pox-locking/src/events_24.rs

@@ -19,10 +19,10 @@ use clarity::vm::contexts::GlobalContext;
 use clarity::vm::errors::Error as ClarityError;
 use clarity::vm::types::{PrincipalData, QualifiedContractIdentifier, TupleData};
 use clarity::vm::Value;
-#[cfg(test)]
+#[cfg(any(test, feature = "testing"))]
 use slog::slog_debug;
 use slog::slog_error;
-#[cfg(test)]
+#[cfg(any(test, feature = "testing"))]
 use stacks_common::debug;
 use stacks_common::{error, test_debug};
 

stackslib/src/burnchains/affirmation.rs

@@ -937,7 +937,7 @@ fn inner_find_heaviest_block_commit_ptr(
 pub fn find_heaviest_block_commit<B: BurnchainHeaderReader>(
     burnchain_tx: &BurnchainDBTransaction,
     indexer: &B,
-    prepare_phase_ops: &Vec<Vec<LeaderBlockCommitOp>>,
+    prepare_phase_ops: &[Vec<LeaderBlockCommitOp>],
     anchor_threshold: u32,
 ) -> Result<Option<(LeaderBlockCommitOp, Vec<Vec<bool>>, u64, u64)>, DBError> {
     let (pox_anchor_ptr, ancestors) =

stackslib/src/burnchains/bitcoin/bits.rs

@@ -150,7 +150,7 @@ impl BitcoinMessageHandler for BitcoinBlockDownloader {
             None => panic!("No block header set"),
             Some(ref ipc_header) => {
                 let block_hash = ipc_header.block_header.header.bitcoin_hash().clone();
-                indexer.send_getdata(&vec![block_hash]).map(|_r| true)
+                indexer.send_getdata(&[block_hash]).map(|_r| true)
             }
         }
     }
@@ -191,7 +191,7 @@ impl BitcoinMessageHandler for BitcoinBlockDownloader {
                     );
 
                     // try again
-                    indexer.send_getdata(&vec![ipc_header.block_header.header.bitcoin_hash()])?;
+                    indexer.send_getdata(&[ipc_header.block_header.header.bitcoin_hash()])?;
                     return Ok(true);
                 }
 
@@ -599,14 +599,14 @@ mod tests {
         })
     }
 
-    fn to_txid(inp: &Vec<u8>) -> Txid {
+    fn to_txid(inp: &[u8]) -> Txid {
         let mut ret = [0; 32];
         let bytes = &inp[..inp.len()];
         ret.copy_from_slice(bytes);
         Txid(ret)
     }
 
-    fn to_block_hash(inp: &Vec<u8>) -> BurnchainHeaderHash {
+    fn to_block_hash(inp: &[u8]) -> BurnchainHeaderHash {
         let mut ret = [0; 32];
         let bytes = &inp[..inp.len()];
         ret.copy_from_slice(bytes);

stackslib/src/burnchains/bitcoin/blocks.rs

@@ -3149,7 +3149,7 @@ mod test {
         assert_eq!(total_work_before, total_work_before_idempotent);
 
         // fake block headers for mainnet 40319-40320, which is on a difficulty adjustment boundary
-        let bad_headers = vec![
+        let bad_headers = [
             LoneBlockHeader {
                 header: BlockHeader {
                     version: 1,

stackslib/src/burnchains/bitcoin/indexer.rs

@@ -354,7 +354,7 @@ impl BitcoinIndexer {
     }
 
     /// Send a GetData message
-    pub fn send_getdata(&mut self, block_hashes: &Vec<Sha256dHash>) -> Result<(), btc_error> {
+    pub fn send_getdata(&mut self, block_hashes: &[Sha256dHash]) -> Result<(), btc_error> {
         assert!(!block_hashes.is_empty());
         let getdata_invs = block_hashes
             .iter()

stackslib/src/burnchains/bitcoin/network.rs

@@ -524,7 +524,7 @@ impl SpvClient {
     /// * headers must be contiguous
     fn validate_header_integrity(
         start_height: u64,
-        headers: &Vec<LoneBlockHeader>,
+        headers: &[LoneBlockHeader],
         check_txcount: bool,
     ) -> Result<(), btc_error> {
         if headers.is_empty() {