chore: clippy fixes (#167)

* chore: clippy fixes

* fix: restore ambiguous conflict resolves

* chore: clippy warnings

* remove resolved comment

* tests: revery assert back to assert_eq

* type: EventMapGetRs => MapEventGetRs

* refactor: convert if chain to match

* chore: deny.toml

.github/workflows/rust-clippy.yml

@@ -1,7 +1,3 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
 # rust-clippy is a tool that runs a bunch of lints to catch common
 # mistakes in your Rust code and help improve your Rust code.
 # More details at https://github.com/rust-lang/rust-clippy
@@ -18,6 +14,13 @@ on:
   schedule:
     - cron: '29 19 * * 2'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+env:
+  CARGO_TERM_COLOR: always
+
 jobs:
   rust-clippy-analyze:
     name: Run rust-clippy analyzing
@@ -30,23 +33,31 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Install Rust toolchain
-        uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af #@v1
+      - uses: actions/cache@v3
+        id: cache-cargo
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: ${{ runner.os }}-cargo-
+
+      - name: Install Protoc
+        uses: arduino/setup-protoc@v3
         with:
-          profile: minimal
-          toolchain: stable
-          components: clippy
-          override: true
+          version: "25.1"
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Run rust-clippy
+        run: cargo clippy --all-targets --all-features -- -D warnings
 
       - name: Install required cargo
         run: cargo install clippy-sarif sarif-fmt
 
-      - name: Run rust-clippy
-        run:
-          cargo clippy
-          --all-features
-          --message-format=json | clippy-sarif | tee rust-clippy-results.sarif | sarif-fmt
-        continue-on-error: true
+      - name: Run rust-sarif
+        run: cargo clippy --all-features --message-format=json | 
+          clippy-sarif | tee rust-clippy-results.sarif | sarif-fmt
 
       - name: Upload analysis results to GitHub
         uses: github/codeql-action/upload-sarif@v3

.github/workflows/rust-fmt.yml

@@ -0,0 +1,39 @@
+name: rust-fmt analyze
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ "master" ]
+  schedule:
+    - cron: '29 19 * * 2'
+
+concurrency:
+  # One build per PR, branch or tag
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  rust-fmt-analyze:
+    name: Run rust-fmt analyzing
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+
+      - name: cargo fmt
+        run: cargo fmt --all -- --check

.github/workflows/rust.yml

@@ -2,30 +2,85 @@ name: Rust
 
 on:
   push:
-    branches: [ "master" ]
+    branches: ["master"]
+    paths-ignore:
+      - "docs/**"
+
   pull_request:
-    branches: [ "master" ]
+    branches: ["master"]
+    paths-ignore:
+      - "docs/**"
 
 env:
   CARGO_TERM_COLOR: always
 
 jobs:
-  build:
-
+  code-coverage:
     runs-on: ubuntu-latest
     env:
       CARGO_TERM_COLOR: always
     steps:
       - uses: actions/checkout@v4
-      - name: Install Rust
-        run: rustup update stable
+      - name: Install deps
+        run: |
+          sudo apt-get update
+          sudo apt install -y libsoxr-dev libopus-dev libssl-dev libfdk-aac-dev
+
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+
+      - name: Install Protoc
+        uses: arduino/setup-protoc@v3
+        with:
+          version: "25.1"
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Install cargo-llvm-cov
         uses: taiki-e/install-action@cargo-llvm-cov
+      - name: Running cargo test
+        run: cargo test --all-features --workspace
       - name: Generate code coverage
         run: cargo llvm-cov --all-features --workspace --lcov --output-path lcov.info
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
           files: lcov.info
-          fail_ci_if_error: false
+          fail_ci_if_error: false
+  cargo-deny:
+    name: cargo-deny
+
+    # TODO: remove this matrix when https://github.com/EmbarkStudios/cargo-deny/issues/324 is resolved
+    strategy:
+      fail-fast: false
+      matrix:
+        platform:
+          - x86_64-unknown-linux-gnu
+          # - x86_64-unknown-linux-musl
+          - aarch64-unknown-linux-gnu
+          # - arm-unknown-linux-gnueabihf
+          # - armv7-unknown-linux-gnueabihf
+          # - mips-unknown-linux-gnu
+          # - mips64-unknown-linux-gnuabi64
+          # - mips64el-unknown-linux-gnuabi64
+          # - mipsel-unknown-linux-gnu
+          # - aarch64-unknown-linux-musl
+          - x86_64-apple-darwin
+          - aarch64-apple-darwin
+          # - x86_64-pc-windows-gnu
+          # - x86_64-pc-windows-msvc
+
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: EmbarkStudios/cargo-deny-action@v1
+        with:
+          command: check
+          log-level: error
+          arguments: --all-features --target ${{ matrix.platform }}

Cargo.toml

@@ -25,4 +25,4 @@ clap = { version = "4.4", features = ["derive", "env"] }
 mockall = "0.12.1"
 num_enum = "0.7.2"
 convert-enum = "0.1.0"
-sans-io-runtime = "0.1.0"
+sans-io-runtime = { version = "0.1.0", default-features = false }

bin/src/main.rs

@@ -1,3 +1,5 @@
+#![allow(clippy::bool_assert_comparison)]
+
 use atm0s_sdn::secure::StaticKeyAuthorization;
 use atm0s_sdn::services::visualization;
 use atm0s_sdn::{

deny.toml

@@ -0,0 +1,61 @@
+[graph]
+
+targets = [
+]
+all-features = false
+no-default-features = false
+[output]
+feature-depth = 1
+
+[advisories]
+ignore = [
+]
+
+[licenses]
+unlicensed = "allow"
+allow = [
+    "Apache-2.0",
+    "BSD-2-Clause",
+    "BSD-3-Clause",
+    "ISC",
+    "MIT",
+    "Unicode-DFS-2016",
+    "WTFPL",
+
+]
+confidence-threshold = 0.8
+exceptions = [
+]
+
+
+[licenses.private]
+ignore = false
+registries = [
+    #"https://sekretz.com/registry
+]
+
+[bans]
+multiple-versions = "warn"
+wildcards = "allow"
+highlight = "all"
+workspace-default-features = "allow"
+external-default-features = "allow"
+allow = [
+]
+deny = [
+]
+
+skip = [
+]
+skip-tree = [
+]
+[sources]
+unknown-registry = "warn"
+unknown-git = "warn"
+allow-registry = ["https://github.com/rust-lang/crates.io-index"]
+allow-git = []
+
+[sources.allow-org]
+github = [""]
+gitlab = [""]
+bitbucket = [""]

packages/core/identity/src/conn_id.rs

@@ -121,11 +121,7 @@ impl Hash for ConnId {
 impl PartialOrd<Self> for ConnId {
     fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
         //compare both session and direction
-        if self.session == other.session {
-            self.direction.partial_cmp(&other.direction)
-        } else {
-            self.session.partial_cmp(&other.session)
-        }
+        Some(self.cmp(other))
     }
 }
 

packages/core/identity/src/lib.rs

@@ -1,3 +1,5 @@
+#![allow(clippy::bool_assert_comparison)]
+
 mod conn_id;
 mod node_addr;
 mod node_id;

packages/core/identity/src/node_id.rs

@@ -77,23 +77,23 @@ impl NodeIdType for NodeId {
     fn layer(&self, index: u8) -> u8 {
         assert!(index <= 3);
 
-        (*self >> 8 * index) as u8
+        (*self >> (8 * index)) as u8
     }
 
     fn build(geo1: u8, geo2: u8, group: u8, index: u8) -> Self {
-        ((geo1 as u32) << 8 * 3) | ((geo2 as u32) << 8 * 2) | ((group as u32) << 8) | (index as u32)
+        ((geo1 as u32) << (8 * 3)) | ((geo2 as u32) << (8 * 2)) | ((group as u32) << 8) | (index as u32)
     }
 
     fn build2(zone_id: u16, group: u8, index: u8) -> Self {
         ((zone_id as u32) << 16) | ((group as u32) << 8) | (index as u32)
     }
 
     fn geo1(&self) -> u8 {
-        (*self >> 8 * 3) as u8
+        (*self >> (8 * 3)) as u8
     }
 
     fn geo2(&self) -> u8 {
-        (*self >> 8 * 2) as u8
+        (*self >> (8 * 2)) as u8
     }
 
     fn group(&self) -> u8 {

packages/core/router/src/core/router.rs

@@ -455,8 +455,8 @@ mod tests {
 
             for i in 0..100 {
                 let key: u32 = rand::random();
-                let next_a = router_a.closest_node(key, &vec![]);
-                let next_b = router_b.closest_node(key, &vec![]);
+                let next_a = router_a.closest_node(key, &[]);
+                let next_b = router_b.closest_node(key, &[]);
                 match (next_a, next_b) {
                     (Some(a), Some(b)) => {
                         panic!("Step {}, Wrong with key {} => {:?} {:?}", i, key, a, b);

packages/core/router/src/core/table/metric.rs

@@ -47,9 +47,9 @@ impl Metric {
     pub fn score(&self) -> u32 {
         let based_score = self.latency as u32 + (self.hops.len() as u32 * HOP_PLUS_RTT as u32);
         if self.bandwidth >= BANDWIDTH_LIMIT {
-            return based_score;
+            based_score
         } else {
-            return based_score + BANDWIDTH_SCORE_PENALTY;
+            based_score + BANDWIDTH_SCORE_PENALTY
         }
     }
 

packages/core/router/src/core/table/path.rs

@@ -9,7 +9,7 @@ pub struct Path(pub ConnId, pub Metric);
 
 impl PartialOrd for Path {
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        self.1.partial_cmp(&other.1)
+        Some(self.cmp(other))
     }
 }
 

packages/core/router/src/lib.rs

@@ -1,3 +1,5 @@
+#![allow(clippy::bool_assert_comparison)]
+
 use atm0s_sdn_identity::{NodeId, NodeIdType};
 pub mod core;
 pub mod shadow;
@@ -21,9 +23,9 @@ impl ServiceBroadcastLevel {
     }
 }
 
-impl Into<u8> for ServiceBroadcastLevel {
-    fn into(self) -> u8 {
-        match self {
+impl From<ServiceBroadcastLevel> for u8 {
+    fn from(val: ServiceBroadcastLevel) -> Self {
+        match val {
             ServiceBroadcastLevel::Global => 0,
             ServiceBroadcastLevel::Geo1 => 1,
             ServiceBroadcastLevel::Geo2 => 2,

packages/core/utils/src/lib.rs

@@ -1,3 +1,5 @@
+#![allow(clippy::bool_assert_comparison)]
+
 pub mod error_handle;
 pub mod hash;
 pub mod init_array;

packages/network/src/base/control.rs

@@ -38,6 +38,7 @@ pub struct NeighboursControl {
 }
 
 impl NeighboursControl {
+    #[allow(clippy::result_unit_err)]
     pub fn validate(&self, now: u64, auth: &dyn Authorization) -> Result<NeighboursControlCmds, ()> {
         auth.validate(self.from, &self.cmd, &self.signature).ok_or(())?;
         let (ts, cmd) = bincode::DefaultOptions::new().with_limit(1499).deserialize::<(u64, NeighboursControlCmds)>(&self.cmd).map_err(|_| ())?;