diff --git a/.github/workflows/_setup-e2e.yml b/.github/workflows/_setup-e2e.yml index bc9ae5250..df2e60652 100644 --- 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 index 6c88cc262..b9bc40a74 100644 --- 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 index c24f32cc9..9e0ad297b 100644 --- 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 index 87ef6094c..8fb09d8d4 100644 --- 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 index 665283be4..386c013cf 100644 --- 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 index cc3f7119d..c0902b4d9 100644 --- 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 "" >> target/doc/index.html chmod -c -R +rX target/doc/ diff --git a/.github/workflows/e2e-consensus.yml b/.github/workflows/e2e-consensus.yml index 2628c572c..a3af6e00a 100644 --- 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 index 701c243b5..6c7d2dabc 100644 --- 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 index ceeeae703..885851677 100644 --- 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 index 14d2e60b3..08dbe2885 100644 --- 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 index fd3f90636..6ff197916 100644 --- 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 index 30f61b3e0..0defd7ccb 100644 --- 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 index 8675c3c1a..a7adc2711 100644 --- 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 index c1f04b352..c95d3cb2d 100644 --- 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 index a079446ab..6dd5ea7f7 100644 --- 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 index 0e1f3861b..37ad10580 100644 --- 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 index 8b7dd4001..99359e41d 100644 --- 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, + #[allow(dead_code)] // HACK this was triggered in Rust 1.79 pub miner: Arc, pub storage: Arc, pub consensus: Arc, diff --git a/src/eth/storage/rocks/rocks_state.rs b/src/eth/storage/rocks/rocks_state.rs index d89fd3414..ccafb880f 100644 --- 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;