Merge pull request #6188 from kantai/feat/clippy-stackslib

Feat: Add clippy stackslib, pass indexing_slicing

Author: kantai

.cargo/config.toml

@@ -2,6 +2,7 @@
 stacks-node = "run --package stacks-node --"
 fmt-stacks = "fmt -- --config group_imports=StdExternalCrate,imports_granularity=Module"
 clippy-stacks = "clippy -p stx-genesis -p libstackerdb -p stacks-signer -p pox-locking -p clarity -p libsigner -p stacks-common --no-deps --tests --all-features -- -D warnings -A clippy::uninlined-format-args"
+clippy-stackslib = "clippy -p stackslib --no-deps -- -Aclippy::all -Wclippy::indexing_slicing"
 
 # Uncomment to improve performance slightly, at the cost of portability
 #   * Note that native binaries may not run on CPUs that are different from the build machine

stacks-common/src/types/chainstate.rs

@@ -64,29 +64,24 @@ impl TrieHash {
             return TrieHash::from_empty_data();
         }
 
-        let mut tmp = [0u8; 32];
-
         let mut hasher = Sha512_256::new();
         hasher.update(data);
-        tmp.copy_from_slice(hasher.finalize().as_slice());
-
-        TrieHash(tmp)
+        let out = hasher.finalize().into();
+        TrieHash(out)
     }
 
     pub fn from_data_array<B: AsRef<[u8]>>(data: &[B]) -> TrieHash {
         if data.is_empty() {
             return TrieHash::from_empty_data();
         }
 
-        let mut tmp = [0u8; 32];
-
         let mut hasher = Sha512_256::new();
 
         for item in data.iter() {
             hasher.update(item);
         }
-        tmp.copy_from_slice(hasher.finalize().as_slice());
-        TrieHash(tmp)
+        let out = hasher.finalize().into();
+        TrieHash(out)
     }
 
     /// Convert to a String that can be used in e.g. sqlite
@@ -493,9 +488,8 @@ impl BurnchainHeaderHash {
     }
 
     pub fn to_bitcoin_hash(&self) -> Sha256dHash {
-        let bytes = self.0.iter().rev().copied().collect::<Vec<_>>();
-        let mut buf = [0u8; 32];
-        buf.copy_from_slice(&bytes[0..32]);
+        let mut buf = self.0;
+        buf.reverse();
         Sha256dHash(buf)
     }
 

stacks-common/src/types/mod.rs

@@ -762,6 +762,12 @@ impl<L: PartialEq + Eq> Ord for StacksEpoch<L> {
 #[derive(Clone, Debug, Default, Deserialize, PartialEq, Eq)]
 pub struct EpochList<L: Clone>(Vec<StacksEpoch<L>>);
 
+impl<L: Clone> From<Vec<StacksEpoch<L>>> for EpochList<L> {
+    fn from(value: Vec<StacksEpoch<L>>) -> Self {
+        Self(value)
+    }
+}
+
 impl<L: Clone> EpochList<L> {
     pub fn new(epochs: &[StacksEpoch<L>]) -> EpochList<L> {
         EpochList(epochs.to_vec())
@@ -804,8 +810,8 @@ impl<L: Clone> EpochList<L> {
         self.0.push(epoch);
     }
 
-    pub fn to_vec(&self) -> Vec<StacksEpoch<L>> {
-        self.0.clone()
+    pub fn to_vec(self) -> Vec<StacksEpoch<L>> {
+        self.0
     }
 }
 

stacks-common/src/types/net.rs

@@ -73,13 +73,8 @@ impl<'de> Deserialize<'de> for PeerAddress {
 
 impl PeerAddress {
     pub fn from_slice(bytes: &[u8]) -> Option<PeerAddress> {
-        if bytes.len() != 16 {
-            return None;
-        }
-
-        let mut bytes16 = [0u8; 16];
-        bytes16.copy_from_slice(&bytes[0..16]);
-        Some(PeerAddress(bytes16))
+        let bytes16: &[u8; 16] = bytes.try_into().ok()?;
+        Some(PeerAddress(*bytes16))
     }
 
     /// Is this an IPv4 address?
@@ -98,9 +93,7 @@ impl PeerAddress {
         {
             return None;
         }
-        let mut ret = [0u8; 4];
-        ret.copy_from_slice(&self.0[12..16]);
-        Some(ret)
+        Some([self[12], self[13], self[14], self[15]])
     }
 
     /// Return the bit representation of this peer address as an IPv4 address, in network byte

stacks-common/src/util/hash.rs

@@ -172,9 +172,8 @@ const MERKLE_PATH_NODE_TAG: u8 = 0x01;
 impl Hash160 {
     pub fn from_sha256(sha256_hash: &[u8; 32]) -> Hash160 {
         let mut rmd = Ripemd160::new();
-        let mut ret = [0u8; 20];
         rmd.update(sha256_hash);
-        ret.copy_from_slice(rmd.finalize().as_slice());
+        let ret = rmd.finalize().into();
         Hash160(ret)
     }
 
@@ -183,7 +182,7 @@ impl Hash160 {
     pub fn from_data(data: &[u8]) -> Hash160 {
         let sha2_result = Sha256::digest(data);
         let ripe_160_result = Ripemd160::digest(sha2_result.as_slice());
-        Hash160::from(ripe_160_result.as_slice())
+        Hash160(ripe_160_result.into())
     }
 
     pub fn from_node_public_key(pubkey: &Secp256k1PublicKey) -> Hash160 {
@@ -197,16 +196,16 @@ impl Hash160 {
 
 impl Sha512Sum {
     pub fn from_data(data: &[u8]) -> Sha512Sum {
-        Sha512Sum::from(Sha512::digest(data).as_slice())
+        Sha512Sum(Sha512::digest(data).into())
     }
 }
 
 impl Sha512Trunc256Sum {
     pub fn from_data(data: &[u8]) -> Sha512Trunc256Sum {
-        Sha512Trunc256Sum::from(Sha512_256::digest(data).as_slice())
+        Sha512Trunc256Sum(Sha512_256::digest(data).into())
     }
     pub fn from_hasher(hasher: Sha512_256) -> Sha512Trunc256Sum {
-        Sha512Trunc256Sum::from(hasher.finalize().as_slice())
+        Sha512Trunc256Sum(hasher.finalize().into())
     }
 }
 
@@ -216,12 +215,11 @@ impl MerkleHashFunc for Hash160 {
     }
 
     fn from_tagged_data(tag: u8, data: &[u8]) -> Hash160 {
-        let mut tmp = [0u8; 32];
         let mut sha2 = Sha256::new();
         sha2.update([tag]);
         sha2.update(data);
-        tmp.copy_from_slice(sha2.finalize().as_slice());
-        Hash160::from_sha256(&tmp)
+        let sha2_bytes = sha2.finalize().into();
+        Hash160::from_sha256(&sha2_bytes)
     }
 
     fn bits(&self) -> &[u8] {
@@ -235,14 +233,12 @@ impl MerkleHashFunc for Sha256Sum {
     }
 
     fn from_tagged_data(tag: u8, data: &[u8]) -> Sha256Sum {
-        let mut tmp = [0u8; 32];
-
         let mut sha2 = Sha256::new();
         sha2.update([tag]);
         sha2.update(data);
-        tmp.copy_from_slice(sha2.finalize().as_slice());
+        let out = sha2.finalize().into();
 
-        Sha256Sum(tmp)
+        Sha256Sum(out)
     }
 
     fn bits(&self) -> &[u8] {
@@ -256,19 +252,15 @@ impl MerkleHashFunc for DoubleSha256 {
     }
 
     fn from_tagged_data(tag: u8, data: &[u8]) -> DoubleSha256 {
-        let mut tmp = [0u8; 32];
-        let mut tmp2 = [0u8; 32];
-
         let mut sha2_1 = Sha256::new();
         sha2_1.update([tag]);
         sha2_1.update(data);
-        tmp.copy_from_slice(sha2_1.finalize().as_slice());
 
         let mut sha2_2 = Sha256::new();
-        sha2_2.update(tmp);
-        tmp2.copy_from_slice(sha2_2.finalize().as_slice());
+        sha2_2.update(sha2_1.finalize().as_slice());
+        let ret = sha2_2.finalize().into();
 
-        DoubleSha256(tmp2)
+        DoubleSha256(ret)
     }
 
     fn bits(&self) -> &[u8] {
@@ -282,15 +274,12 @@ impl MerkleHashFunc for Sha512Trunc256Sum {
     }
 
     fn from_tagged_data(tag: u8, data: &[u8]) -> Sha512Trunc256Sum {
-        use sha2::Digest;
-        let mut tmp = [0u8; 32];
-
         let mut sha2 = Sha512_256::new();
         sha2.update([tag]);
         sha2.update(data);
-        tmp.copy_from_slice(sha2.finalize().as_slice());
+        let ret = sha2.finalize().into();
 
-        Sha512Trunc256Sum(tmp)
+        Sha512Trunc256Sum(ret)
     }
 
     fn bits(&self) -> &[u8] {
@@ -588,7 +577,7 @@ where
 // borrowed from Andrew Poelstra's rust-bitcoin library
 /// Convert a hexadecimal-encoded string to its corresponding bytes
 pub fn hex_bytes(s: &str) -> Result<Vec<u8>, HexError> {
-    let mut v = vec![];
+    let mut v = Vec::with_capacity(s.len() / 2);
     let mut iter = s.chars().pair();
     // Do the parsing
     iter.by_ref()

stackslib/src/blockstack_cli.rs

@@ -520,6 +520,7 @@ fn parse_postcondition_mode(
     }
 }
 
+#[allow(clippy::indexing_slicing)]
 fn handle_contract_publish(
     args_slice: &[String],
     version: TransactionVersion,
@@ -580,6 +581,7 @@ fn handle_contract_publish(
     Ok(to_hex(&signed_tx_bytes))
 }
 
+#[allow(clippy::indexing_slicing)]
 fn handle_contract_call(
     args_slice: &[String],
     version: TransactionVersion,
@@ -674,6 +676,7 @@ fn handle_contract_call(
     Ok(to_hex(&signed_tx_bytes))
 }
 
+#[allow(clippy::indexing_slicing)]
 fn handle_token_transfer(
     args_slice: &[String],
     version: TransactionVersion,
@@ -736,6 +739,7 @@ fn handle_token_transfer(
     Ok(to_hex(&signed_tx_bytes))
 }
 
+#[allow(clippy::indexing_slicing)]
 fn generate_secret_key(args: &[String], version: TransactionVersion) -> Result<String, CliError> {
     if !args.is_empty() && args[0] == "-h" {
         return Err(CliError::Message(format!("USAGE:\n {}", GENERATE_USAGE)));
@@ -767,6 +771,7 @@ fn generate_secret_key(args: &[String], version: TransactionVersion) -> Result<S
     ))
 }
 
+#[allow(clippy::indexing_slicing)]
 fn get_addresses(args: &[String], version: TransactionVersion) -> Result<String, CliError> {
     if (!args.is_empty() && args[0] == "-h") || args.len() != 1 {
         return Err(CliError::Message(format!("USAGE:\n {}", ADDRESSES_USAGE)));
@@ -806,6 +811,7 @@ fn get_addresses(args: &[String], version: TransactionVersion) -> Result<String,
     ))
 }
 
+#[allow(clippy::indexing_slicing)]
 fn decode_transaction(args: &[String], _version: TransactionVersion) -> Result<String, CliError> {
     if (!args.is_empty() && args[0] == "-h") || args.len() != 1 {
         return Err(CliError::Message(format!(
@@ -844,6 +850,7 @@ fn decode_transaction(args: &[String], _version: TransactionVersion) -> Result<S
     }
 }
 
+#[allow(clippy::indexing_slicing)]
 fn decode_header(args: &[String], _version: TransactionVersion) -> Result<String, CliError> {
     if (!args.is_empty() && args[0] == "-h") || args.len() != 1 {
         return Err(CliError::Message(format!(
@@ -883,6 +890,7 @@ fn decode_header(args: &[String], _version: TransactionVersion) -> Result<String
     }
 }
 
+#[allow(clippy::indexing_slicing)]
 fn decode_block(args: &[String], _version: TransactionVersion) -> Result<String, CliError> {
     if (!args.is_empty() && args[0] == "-h") || args.len() != 1 {
         return Err(CliError::Message(format!(
@@ -920,6 +928,7 @@ fn decode_block(args: &[String], _version: TransactionVersion) -> Result<String,
     }
 }
 
+#[allow(clippy::indexing_slicing)]
 fn decode_microblock(args: &[String], _version: TransactionVersion) -> Result<String, CliError> {
     if (!args.is_empty() && args[0] == "-h") || args.len() != 1 {
         return Err(CliError::Message(format!(
@@ -959,6 +968,7 @@ fn decode_microblock(args: &[String], _version: TransactionVersion) -> Result<St
     }
 }
 
+#[allow(clippy::indexing_slicing)]
 fn decode_microblocks(args: &[String], _version: TransactionVersion) -> Result<String, CliError> {
     if (!args.is_empty() && args[0] == "-h") || args.len() != 1 {
         return Err(CliError::Message(format!(