Merge pull request #2 from agunde406/fix-lint

Fix lint and clippy errors for Rust 1.75.0

libsawtooth/src/families/sabre/addressing.rs

@@ -1,3 +1,4 @@
+// Copyright 2024 Bitwise IO, Inc.
 // Copyright 2018 Cargill Incorporated
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use std::fmt::Write;
+
 use sha2::{Digest, Sha512};
 
 use crate::transact::handler::ApplyError;
@@ -28,8 +31,10 @@ const CONTRACT_PREFIX: &str = "00ec02";
 pub fn hash(to_hash: &str, num: usize) -> Result<String, ApplyError> {
     let temp = Sha512::digest(to_hash.as_bytes())
         .iter()
-        .map(|b| format!("{:02x}", b))
-        .collect::<String>();
+        .fold(String::new(), |mut output, b| {
+            let _ = write!(output, "{b:02X}");
+            output
+        });
     let hash = match temp.get(..num) {
         Some(x) => x,
         None => {

libsawtooth/src/families/sabre/handler.rs

@@ -1,3 +1,4 @@
+// Copyright 2024 Bitwise IO, Inc.
 // Copyright 2018 Cargill Incorporated
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,6 +15,8 @@
 
 //! Provides a Sawtooth Transaction Handler for executing Sabre transactions.
 
+use std::fmt::Write;
+
 use sha2::{Digest, Sha512};
 
 use crate::transact::handler::{ApplyError, TransactionContext, TransactionHandler};
@@ -240,10 +243,13 @@ fn create_contract(
 
     state.set_contract(name, version, contract)?;
 
-    let contract_sha512 = Sha512::digest(payload.contract())
-        .iter()
-        .map(|b| format!("{:02x}", b))
-        .collect::<String>();
+    let contract_sha512 =
+        Sha512::digest(payload.contract())
+            .iter()
+            .fold(String::new(), |mut output, b| {
+                let _ = write!(output, "{b:02X}");
+                output
+            });
 
     let contract_registry_version = VersionBuilder::new()
         .with_version(version.into())

libsawtooth/src/journal/chain.rs

@@ -1,4 +1,5 @@
 /*
+ * Copyright 2024 Bitwise IO, Inc.
  * Copyright 2018 Intel Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -244,7 +245,7 @@ impl ChainControllerState {
             chain_head.block(),
             new_block.block()
         );
-        if let Some(prior_heads_successor) = result.new_chain.get(0) {
+        if let Some(prior_heads_successor) = result.new_chain.first() {
             if prior_heads_successor.header().previous_block_id()
                 != chain_head.block().header_signature()
             {

libsawtooth/src/journal/validation_rule_enforcer.rs

@@ -1,4 +1,5 @@
 /*
+ * Copyright 2024 Bitwise IO, Inc.
  * Copyright 2018 Intel Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -264,7 +265,7 @@ impl FromStr for Rule {
             // Example: "NofX:2,intkey" means only 2 intkey transactions are allowed per block.
             "NofX" => {
                 let limit = rule_args
-                    .get(0)
+                    .first()
                     .ok_or_else(|| RuleParseError("found NofX rule with no arguments".into()))?
                     .trim()
                     .parse()
@@ -291,7 +292,7 @@ impl FromStr for Rule {
             // transaction.
             "XatY" => {
                 let family_name = rule_args
-                    .get(0)
+                    .first()
                     .ok_or_else(|| RuleParseError("found XatY rule with no arguments".into()))?
                     .trim()
                     .to_string();

libsawtooth/src/store/mod.rs

@@ -1,3 +1,4 @@
+// Copyright 2024 Bitwise IO, Inc.
 // Copyright 2021 Cargill Incorporated
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,4 +17,5 @@ mod error;
 #[cfg(feature = "diesel")]
 pub(crate) mod pool;
 
+#[cfg(feature = "artifact")]
 pub use error::StoreError;

libsawtooth/src/transact/mod.rs

@@ -71,7 +71,6 @@
 //! Transact provides optional support for smart contract engines implemented for Sawtooth through
 //! the `sawtooth-compat` feature.
 
-
 #[cfg(feature = "transact-context")]
 mod collections;
 #[cfg(feature = "transact-context")]

libsawtooth/src/transact/state/merkle/sql/store/operations/prune_entries.rs

@@ -1,4 +1,5 @@
 /*
+ * Copyright 2024 Bitwise IO, Inc.
  * Copyright 2021 Cargill Incorporated
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -187,7 +188,7 @@ where
     }
 
     let parent = addition_changelog
-        .get(0)
+        .first()
         .and_then(|entry| entry.parent_state_root.clone());
 
     let change_additions = addition_changelog
@@ -206,9 +207,7 @@ where
         .load::<MerkleRadixChangeLogDeletion>(conn)?
         .into_iter()
         .fold(HashMap::new(), |mut acc, successor| {
-            let hashes = acc
-                .entry(successor.successor_state_root)
-                .or_insert_with(Vec::new);
+            let hashes: &mut Vec<String> = acc.entry(successor.successor_state_root).or_default();
             hashes.push(successor.deletion);
             acc
         });

libsawtooth/src/transact/workload/batch_gen.rs

@@ -1,4 +1,5 @@
 /*
+ * Copyright 2024 Bitwise IO, Inc.
  * Copyright 2021 Cargill Incorporated
  * Copyright 2017 Intel Corporation
  *
@@ -150,7 +151,7 @@ impl<'a> Iterator for BatchListFeeder<'a> {
             Err(err) => return Some(Err(BatchingError::InternalError(err))),
         };
 
-        batches.get(0).map(|b| Ok(b.clone()))
+        batches.first().map(|b| Ok(b.clone()))
     }
 }