build: update rust to 1.79 (#1231)

* set rust 1.79 in .rust-toolchain * set rust 1.79 in actions * set nightly June 10th * fix linter warnings * fix: set nightly Feb 29th
cloudwalk · Jun 25, 2024 · 1e96dd0 · 1e96dd0
1 parent a97bc12
commit 1e96dd0
Show file tree

Hide file tree

Showing 18 changed files with 18 additions and 20 deletions.
diff --git a/.github/workflows/_setup-e2e.yml b/.github/workflows/_setup-e2e.yml
@@ -25,7 +25,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up Rust
-        run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.75
+        run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.79
 
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2

diff --git a/.github/workflows/build-binary.yml b/.github/workflows/build-binary.yml
@@ -28,7 +28,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up Rust
-        run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.75
+        run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.79
 
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2

diff --git a/.github/workflows/check-features.yml b/.github/workflows/check-features.yml
@@ -36,7 +36,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up Rust
-        run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.75
+        run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.79
 
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2

diff --git a/.github/workflows/comment-tag-report.yml b/.github/workflows/comment-tag-report.yml
@@ -18,7 +18,7 @@ jobs:
               uses: actions/checkout@v4
 
             - name: Set up Rust
-              run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+              run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.79
 
             - name: Setup Ruby
               uses: ruby/setup-ruby@v1

diff --git a/.github/workflows/doc-test.yml b/.github/workflows/doc-test.yml
@@ -32,7 +32,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up Rust
-        run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.75
+        run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.79
 
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2

diff --git a/.github/workflows/docs-release.yml b/.github/workflows/docs-release.yml
@@ -30,7 +30,7 @@ jobs:
 
       - name: Set up Rust Nightly and Rust Docs
         run: |
-          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly-2024-01-01
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly-2024-02-29
           rustup component add rust-docs
 
       - name: Rust Cache
@@ -51,7 +51,7 @@ jobs:
 
       - name: Generate docs
         run: |
-          just doc -2024-01-01
+          just doc -2024-02-29
           echo "<meta http-equiv='refresh' content='0; URL=./stratus/'>" >> target/doc/index.html
           chmod -c -R +rX target/doc/
 

diff --git a/.github/workflows/e2e-consensus.yml b/.github/workflows/e2e-consensus.yml
@@ -57,7 +57,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up Rust
-        run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.75
+        run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.79
 
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2

diff --git a/.github/workflows/e2e-contracts-rocks.yml b/.github/workflows/e2e-contracts-rocks.yml
@@ -44,7 +44,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up Rust
-        run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.75
+        run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.79
 
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2

diff --git a/.github/workflows/e2e-contracts.yml b/.github/workflows/e2e-contracts.yml
@@ -44,7 +44,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up Rust
-        run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.75
+        run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.79
 
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2

diff --git a/.github/workflows/e2e-relayer.yml b/.github/workflows/e2e-relayer.yml
@@ -42,7 +42,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up Rust
-        run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.75
+        run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.79
 
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2

diff --git a/.github/workflows/int-test.yml b/.github/workflows/int-test.yml
@@ -40,7 +40,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up Rust
-        run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.75
+        run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.79
 
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2

diff --git a/.github/workflows/lint-check.yml b/.github/workflows/lint-check.yml
@@ -40,7 +40,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up Rust Nightly
-        run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly-2024-01-01
+        run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly-2024-02-29
 
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2
@@ -59,7 +59,7 @@ jobs:
         uses: extractions/setup-just@v2
 
       - name: Just lint-check
-        run: just lint-check -2024-01-01
+        run: just lint-check -2024-02-29
 
   e2e_lint:
     name: E2E Lint

diff --git a/.github/workflows/outdated.yml b/.github/workflows/outdated.yml
@@ -18,7 +18,7 @@ jobs:
               uses: actions/checkout@v4
 
             - name: Set up Rust
-              run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+              run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.79
 
             - name: Set up Just
               uses: extractions/setup-just@v2

diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -40,7 +40,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up Rust
-        run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.75
+        run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.79
 
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
-channel = "1.75"
+channel = "1.79"
 targets = []
 profile = "default"
diff --git a/src/eth/consensus/server.rs b/src/eth/consensus/server.rs
@@ -161,8 +161,6 @@ mod tests {
     use std::net::SocketAddr;
 
     use tokio::sync::broadcast;
-    use tokio::sync::Mutex;
-    use tonic::Request;
 
     use super::*;
     use crate::eth::consensus::BlockEntry;

diff --git a/src/eth/rpc/rpc_context.rs b/src/eth/rpc/rpc_context.rs
@@ -18,6 +18,7 @@ pub struct RpcContext {
 
     // services
     pub executor: Arc<Executor>,
+    #[allow(dead_code)] // HACK this was triggered in Rust 1.79
     pub miner: Arc<BlockMiner>,
     pub storage: Arc<StratusStorage>,
     pub consensus: Arc<Consensus>,

diff --git a/src/eth/storage/rocks/rocks_state.rs b/src/eth/storage/rocks/rocks_state.rs
@@ -602,7 +602,6 @@ where
 
 #[cfg(test)]
 mod tests {
-    use std::collections::HashSet;
     use std::fs;
 
     use fake::Fake;