Fix clippy warnings in test code

Author: allanbrondum

.github/workflows/linter.yml

@@ -15,7 +15,6 @@ env:
 jobs:
   examples-rustfmt:
     name: Examples format
-    # Don't run on draft pull requests
     if: ${{ !github.event.pull_request.draft }}
     runs-on: ubuntu-latest
     steps:
@@ -29,21 +28,18 @@ jobs:
 
   rustfmt:
     name: Format
-    # Don't run on draft pull requests
     if: ${{ !github.event.pull_request.draft }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Format
-        working-directory: examples
         run: |
           rustup component add rustfmt
           cargo fmt -- --color=always --check    
 
   rustdoc:
     name: Lint docs
-    # Don't run on draft pull requests
     if: ${{ !github.event.pull_request.draft }}
     runs-on: ubuntu-latest
     steps:
@@ -56,6 +52,31 @@ jobs:
           rustup component add rust-docs
           RUSTDOCFLAGS="-D warnings" cargo doc --no-deps --all-features
 
+  clippy:
+    name: Clippy
+    if: ${{ !github.event.pull_request.draft }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+      - name: Clippy
+        run: |
+          rustup component add clippy
+          cargo clippy --color=always --all-targets --all-features -- -D warnings
+
+  test:
+    name: Test
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+      - name: Test
+        run: cargo test -- --skip io_tests # Skip the I/O tests in the testing library.
+
   # Run unit-tests for concordium-std compiled to wasm using cargo concordium test.
   std-internal-wasm-test:
     name: concordium-std internal wasm tests
@@ -66,13 +87,6 @@ jobs:
         uses: actions/checkout@v3
         with:
           submodules: recursive
-
-      - name: Install toolchain
-        uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: ${{ env.RUST_VERSION }}
-          target: wasm32-unknown-unknown
-
       - name: Run internal wasm unit test
         working-directory: concordium-std
         run: |
@@ -81,6 +95,14 @@ jobs:
           sudo mv /tmp/cargo-concordium /usr/bin/cargo-concordium
           cargo concordium test --only-unit-tests -- --features internal-wasm-test
 
+
+
+
+
+
+
+
+
   clippy-cis2:
     name: Clippy
     runs-on: ubuntu-latest
@@ -155,40 +177,7 @@ jobs:
           command: clippy
           args: --manifest-path ${{ matrix.lib-crates }} --target=${{ matrix.target }} --features=${{ matrix.features }} -- -D warnings
 
-  clippy-crypto-primitives:
-    name: Clippy concordium-std with crypto-primitives
-    runs-on: ubuntu-latest
-    needs: rustfmt
-    strategy:
-      matrix:
-        target:
-          - wasm32-unknown-unknown
-          - x86_64-unknown-linux-gnu
-
-        lib-crates:
-          - concordium-std/Cargo.toml
-
-        features:
-          - crypto-primitives
-
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v2
-        with:
-          submodules: recursive
-
-      - name: Install toolchain with clippy available
-        uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: ${{ env.RUST_VERSION }}
-          target: ${{ matrix.target }}
-          components: clippy
 
-      - name: Run cargo clippy
-        uses: actions-rs/cargo@v1
-        with:
-          command: clippy
-          args: --manifest-path ${{ matrix.lib-crates }} --target=${{ matrix.target }} --features=${{ matrix.features }} -- -D warnings
 
   clippy-wasm32-only:
     name: Clippy Wasm32

concordium-cis2/src/lib.rs

@@ -693,7 +693,7 @@ impl TryFrom<String> for TokenIdUnit {
     type Error = ParseError;
 
     fn try_from(s: String) -> Result<Self, Self::Error> {
-        if s == "" {
+        if s.is_empty() {
             Ok(Self())
         } else {
             Err(ParseError {})

concordium-std/src/state_btree.rs

@@ -1383,7 +1383,7 @@ mod wasm_test_btree {
             }
 
             for i in 1..root.keys.len() {
-                if &root.keys[i - 1] >= &root.keys[i] {
+                if root.keys[i - 1] >= root.keys[i] {
                     return Err(InvariantViolation::NodeKeysOutOfOrder);
                 }
             }
@@ -1440,7 +1440,7 @@ mod wasm_test_btree {
             K: Serialize + fmt::Debug + Ord,
         {
             let Some(root_node_id) = self.root else {
-                return format!("no root");
+                return "no root".to_string();
             };
             let mut string = String::new();
             let root: Node<M, K> = self.get_node(root_node_id);
@@ -1475,7 +1475,7 @@ mod wasm_test_btree {
             K: Ord,
         {
             for i in 1..self.keys.len() {
-                if &self.keys[i - 1] >= &self.keys[i] {
+                if self.keys[i - 1] >= self.keys[i] {
                     return Err(InvariantViolation::NodeKeysOutOfOrder);
                 }
             }
@@ -1667,7 +1667,7 @@ mod wasm_test_btree {
         for n in 0..500 {
             claim!(tree.insert(n));
         }
-        for n in (500..1000).into_iter().rev() {
+        for n in (500..1000).rev() {
             claim!(tree.insert(n));
         }
 
@@ -1729,7 +1729,7 @@ mod wasm_test_btree {
     fn test_btree_remove_only_key_higher_leaf_in_three_node() {
         let mut state_builder = StateBuilder::open(StateApi::open());
         let mut tree = state_builder.new_btree_set_degree::<2, _>();
-        for n in (0..4).into_iter().rev() {
+        for n in (0..4).rev() {
             tree.insert(n);
         }
         tree.remove(&3);
@@ -1752,7 +1752,7 @@ mod wasm_test_btree {
     fn test_btree_remove_from_higher_leaf_in_three_node_taking_from_sibling() {
         let mut state_builder = StateBuilder::open(StateApi::open());
         let mut tree = state_builder.new_btree_set_degree::<2, _>();
-        for n in (0..4).into_iter().rev() {
+        for n in (0..4).rev() {
             tree.insert(n);
         }
         claim!(tree.contains(&3));
@@ -1830,7 +1830,7 @@ mod wasm_test_btree {
     fn test_btree_remove_from_root_in_three_node_taking_key_from_lower_child() {
         let mut state_builder = StateBuilder::open(StateApi::open());
         let mut tree = state_builder.new_btree_set_degree::<2, _>();
-        for n in (0..4).into_iter().rev() {
+        for n in (0..4).rev() {
             tree.insert(n);
         }
         claim!(tree.contains(&2));
@@ -1843,11 +1843,11 @@ mod wasm_test_btree {
     fn test_btree_iter() {
         let mut state_builder = StateBuilder::open(StateApi::open());
         let mut tree = state_builder.new_btree_set_degree::<2, _>();
-        let keys: Vec<u32> = (0..15).into_iter().collect();
+        let keys: Vec<u32> = (0..15).collect();
         for &k in &keys {
             tree.insert(k);
         }
-        let iter_keys: Vec<u32> = tree.iter().map(|k| k.clone()).collect();
+        let iter_keys: Vec<u32> = tree.iter().map(|k| *k).collect();
         claim_eq!(keys, iter_keys);
     }
 
@@ -2064,6 +2064,7 @@ mod wasm_test_btree {
         }
 
         /// The different mutating operations to generate for the btree.
+        #[allow(clippy::enum_variant_names)]
         #[derive(Debug, Clone, Copy)]
         enum Operation {
             /// Insert a new key in the set.
@@ -2083,7 +2084,7 @@ mod wasm_test_btree {
             tree: &mut StateBTreeSet<u32, M>,
             mutations: &[(u32, Operation)],
         ) -> Result<(), String> {
-            for (k, op) in mutations.into_iter() {
+            for (k, op) in mutations.iter() {
                 if let Err(violation) = tree.check_invariants() {
                     return Err(format!("Invariant violated: {:?}", violation));
                 }
@@ -2115,14 +2116,13 @@ mod wasm_test_btree {
 
         impl Arbitrary for Operation {
             fn arbitrary(g: &mut Gen) -> Self {
-                g.choose(&[
+                *g.choose(&[
                     Self::InsertKeyNotPresent,
                     Self::InsertKeyPresent,
                     Self::RemoveKeyPresent,
                     Self::RemoveKeyNotPresent,
                 ])
                 .unwrap()
-                .clone()
             }
         }
 
@@ -2141,9 +2141,8 @@ mod wasm_test_btree {
                 while mutations.len() < g.size() {
                     let op: Operation = Operation::arbitrary(g);
                     match op {
-                        Operation::InsertKeyPresent if inserted_keys.len() > 0 => {
-                            let indexes: Vec<usize> =
-                                (0..inserted_keys.len()).into_iter().collect();
+                        Operation::InsertKeyPresent if !inserted_keys.is_empty() => {
+                            let indexes: Vec<usize> = (0..inserted_keys.len()).collect();
                             let k_index = g.choose(&indexes).unwrap();
                             let k = &inserted_keys[*k_index];
                             mutations.push((k.clone(), op));
@@ -2155,9 +2154,8 @@ mod wasm_test_btree {
                                 mutations.push((k, op));
                             }
                         }
-                        Operation::RemoveKeyPresent if inserted_keys.len() > 0 => {
-                            let indexes: Vec<usize> =
-                                (0..inserted_keys.len()).into_iter().collect();
+                        Operation::RemoveKeyPresent if !inserted_keys.is_empty() => {
+                            let indexes: Vec<usize> = (0..inserted_keys.len()).collect();
                             let k_index = g.choose(&indexes).unwrap();
                             let k = inserted_keys.remove(*k_index);
                             mutations.push((k, op));
@@ -2173,9 +2171,7 @@ mod wasm_test_btree {
                 }
 
                 Self {
-                    expected_keys: crate::collections::BTreeSet::from_iter(
-                        inserted_keys.into_iter(),
-                    ),
+                    expected_keys: crate::collections::BTreeSet::from_iter(inserted_keys),
                     mutations,
                 }
             }

concordium-std/src/test_env.rs

@@ -227,7 +227,7 @@ mod wasm_test {
         let event_size = unsafe { prims::get_event_size(0) };
 
         claim_eq!(store_status, 1);
-        claim_eq!(event_size, event_prim.len().try_into().unwrap_abort());
+        claim_eq!(event_size, i32::try_from(event_prim.len()).unwrap_abort());
 
         let mut buf = vec![0; event_prim.len()];
         let bytes_written = unsafe { prims::get_event(0, buf.as_mut_ptr()) };

concordium-std/src/traits.rs

@@ -5,11 +5,10 @@
 use crate::vec::Vec;
 use crate::{
     AccountSignatures, CallContractResult, CheckAccountSignatureResult, EntryRaw, ExchangeRates,
-    HashKeccak256, HashSha2256, HashSha3256, Key, OccupiedEntryRaw,
-    PublicKeyEcdsaSecp256k1, PublicKeyEd25519, QueryAccountBalanceResult,
-    QueryAccountPublicKeysResult, QueryContractBalanceResult, ReadOnlyCallContractResult,
-    SignatureEcdsaSecp256k1, SignatureEd25519, StateBuilder, TransferResult, UpgradeResult,
-    VacantEntryRaw,
+    HashKeccak256, HashSha2256, HashSha3256, Key, OccupiedEntryRaw, PublicKeyEcdsaSecp256k1,
+    PublicKeyEd25519, QueryAccountBalanceResult, QueryAccountPublicKeysResult,
+    QueryContractBalanceResult, ReadOnlyCallContractResult, SignatureEcdsaSecp256k1,
+    SignatureEd25519, StateBuilder, TransferResult, UpgradeResult, VacantEntryRaw,
     types::{LogError, StateError},
 };
 use crate::{QueryContractModuleReferenceResult, QueryContractNameResult};

concordium-std/src/types.rs

@@ -1,5 +1,5 @@
 use crate::{
-    cell::UnsafeCell, marker::PhantomData, num::NonZeroU32, Cursor, HasStateApi, Serial, Vec,
+    Cursor, HasStateApi, Serial, Vec, cell::UnsafeCell, marker::PhantomData, num::NonZeroU32,
 };
 use concordium_contracts_common::{
     AccountBalance, Amount, ModuleReference, OwnedContractName, ParseError,