Merge branch 'main' into patch-1

.github/workflows/memcheck.yml

@@ -35,7 +35,7 @@ jobs:
         shell: bash
         run: sudo apt-get install -y ripgrep
 
-      - name: Build sn bins
+      - name: Build binaries
         run: cargo build --release --bins 
         timeout-minutes: 30
 

.github/workflows/merge.yml

@@ -27,12 +27,8 @@ jobs:
           toolchain: nightly
           # we need rustfmt here while we have a build step
           components: rustfmt
-
       - name: Install cargo-udeps
-        # TODO: (2023-07-03) This is a non-released version from udeps, which includes a bug fix:
-        # https://github.com/est31/cargo-udeps/issues/180
-        # Change this when this is released.
-        run: cargo install --git=https://github.com/est31/cargo-udeps.git --rev=f7a4705 --locked
+        run: cargo install cargo-udeps --locked
       - name: Run cargo-udeps
         run: cargo +nightly udeps --all-targets
 
@@ -97,6 +93,10 @@ jobs:
           toolchain: stable
 
       - uses: Swatinem/rust-cache@v2
+
+      - name: Run CLI tests
+        timeout-minutes: 25
+        run: cargo test --release --package sn_cli
 
       - name: Run testnet tests
         timeout-minutes: 25
@@ -144,7 +144,7 @@ jobs:
           toolchain: stable
       - uses: Swatinem/rust-cache@v2
 
-      - name: Build node and client
+      - name: Build binaries
         run: cargo build --release --bin safenode --bin safe --bin faucet
         timeout-minutes: 30
 
@@ -235,8 +235,8 @@ jobs:
           toolchain: stable
       - uses: Swatinem/rust-cache@v2
 
-      - name: Build node
-        run: cargo build --release --bin safenode
+      - name: Build binaries
+        run: cargo build --release --bin safenode --bin faucet
         timeout-minutes: 30
 
       - name: Build gossipsub testing executable
@@ -282,7 +282,7 @@ jobs:
 
       - uses: Swatinem/rust-cache@v2
 
-      - name: Build safe bins
+      - name: Build binaries
         run: cargo build --release --features=local-discovery --bin safenode --bin faucet
         timeout-minutes: 30
 
@@ -359,7 +359,7 @@ jobs:
 
       - uses: Swatinem/rust-cache@v2
 
-      - name: Build safe bins
+      - name: Build binaries
         run: cargo build --release --features local-discovery --bin safenode --bin faucet
         timeout-minutes: 30
 
@@ -466,7 +466,7 @@ jobs:
 
         - uses: Swatinem/rust-cache@v2
 
-        - name: Build safe bins
+        - name: Build binaries
           run: cargo build --release --features local-discovery --bin safenode --bin faucet
           timeout-minutes: 30
 

.github/workflows/nightly.yml

@@ -28,7 +28,7 @@ jobs:
       - uses: Swatinem/rust-cache@v2
         continue-on-error: true
 
-      - name: Build node and client
+      - name: Build binaries
         run: cargo build --release --bin safenode --bin safe --bin faucet
         timeout-minutes: 30
 
@@ -120,6 +120,10 @@ jobs:
         run: cargo test --release --lib --bins --no-run 
         timeout-minutes: 30
 
+      - name: Run CLI tests
+        timeout-minutes: 25
+        run: cargo test --release --package sn_cli
+
       - name: Run testnet tests
         timeout-minutes: 25
         run: cargo test --release --package sn_testnet
@@ -171,8 +175,8 @@ jobs:
           toolchain: stable
       - uses: Swatinem/rust-cache@v2
 
-      - name: Build node
-        run: cargo build --release --bin safenode
+      - name: Build binaries
+        run: cargo build --release --bin safenode --bin faucet
         timeout-minutes: 30
 
       - name: Build gossipsub testing executable
@@ -217,7 +221,7 @@ jobs:
       - uses: Swatinem/rust-cache@v2
         continue-on-error: true
 
-      - name: Build safe bins
+      - name: Build binaries
         run: cargo build --release --features=local-discovery --bin safenode --bin faucet
         timeout-minutes: 30
 
@@ -302,7 +306,7 @@ jobs:
       - uses: Swatinem/rust-cache@v2
         continue-on-error: true
 
-      - name: Build safe bins
+      - name: Build binaries
         run: cargo build --release --features local-discovery --bin safenode --bin faucet
         timeout-minutes: 30
 
@@ -408,7 +412,7 @@ jobs:
         - uses: Swatinem/rust-cache@v2
           continue-on-error: true
 
-        - name: Build safe bins
+        - name: Build binaries
           run: cargo build --release --features local-discovery --bin safenode --bin faucet
           timeout-minutes: 30