From 91b254cfe28eb000cf3fa699af86bc5a76b80134 Mon Sep 17 00:00:00 2001 From: Francisco Moura Date: Tue, 7 May 2024 16:17:47 -0300 Subject: [PATCH] chore: Bump Rust to 1.78.0 Added general '-A clippy::mixed_attributes_style' to CI clippy execution to avoid linter warning on the automatically generated file 'iconsensus.rs' --- .github/workflows/build.yml | 2 +- build/docker-bake.hcl | 2 +- cmd/authority-claimer/rust-toolchain.toml | 2 +- cmd/authority-claimer/src/listener.rs | 8 -------- cmd/authority-claimer/src/sender.rs | 5 +---- cmd/authority-claimer/src/signer/mod.rs | 2 +- 6 files changed, 5 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9d5e22f9b..3bed37122 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -112,7 +112,7 @@ jobs: run: cargo fmt --all -- --check - name: Run linter - run: cargo clippy -- -A clippy::module_inception + run: cargo clippy -- -A clippy::module_inception -A clippy::mixed_attributes_style - name: Build binaries and tests run: cargo build --all-targets diff --git a/build/docker-bake.hcl b/build/docker-bake.hcl index 704a093fa..9eb669ff0 100644 --- a/build/docker-bake.hcl +++ b/build/docker-bake.hcl @@ -18,7 +18,7 @@ target "common" { context = ".." args = { BASE_IMAGE = "debian:bookworm-20240311-slim" - RUST_VERSION = "1.77.0" + RUST_VERSION = "1.78.0" GO_VERSION = "1.22.1" FOUNDRY_NIGHTLY_VERSION = "293fad73670b7b59ca901c7f2105bf7a29165a90" MACHINE_EMULATOR_VERSION = "0.16.1" diff --git a/cmd/authority-claimer/rust-toolchain.toml b/cmd/authority-claimer/rust-toolchain.toml index 83025f972..51985806f 100644 --- a/cmd/authority-claimer/rust-toolchain.toml +++ b/cmd/authority-claimer/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "1.77.0" +channel = "1.78.0" diff --git a/cmd/authority-claimer/src/listener.rs b/cmd/authority-claimer/src/listener.rs index 7612b8fcb..358979250 100644 --- a/cmd/authority-claimer/src/listener.rs +++ b/cmd/authority-claimer/src/listener.rs @@ -79,7 +79,6 @@ mod tests { }; use crate::test_fixtures::BrokerFixture; use backoff::ExponentialBackoffBuilder; - use snafu::Snafu; use std::time::Duration; use testcontainers::clients::Cli; @@ -87,13 +86,6 @@ mod tests { // Broker Mock // ------------------------------------------------------------------------------------------------ - #[derive(Clone, Debug, Snafu)] - pub enum MockError { - EndError, - InternalError, - MockError, - } - pub async fn setup_broker( docker: &Cli, should_fail: bool, diff --git a/cmd/authority-claimer/src/sender.rs b/cmd/authority-claimer/src/sender.rs index 0edc16f42..a5f4ed937 100644 --- a/cmd/authority-claimer/src/sender.rs +++ b/cmd/authority-claimer/src/sender.rs @@ -5,7 +5,7 @@ use crate::{ contracts::iconsensus::{IConsensus, InputRange}, metrics::AuthorityClaimerMetrics, rollups_events::{Address, DAppMetadata, RollupsClaim}, - signer::{ConditionalSigner, ConditionalSignerError}, + signer::ConditionalSigner, }; use async_trait::async_trait; use eth_tx_manager::{ @@ -89,9 +89,6 @@ pub enum TransactionSenderError { #[snafu(display("Invalid provider URL"))] ProviderUrl { source: ParseError }, - #[snafu(display("Failed to initialize the transaction signer"))] - Signer { source: ConditionalSignerError }, - #[snafu(display("Transaction manager error"))] TransactionManager { source: TrasactionManagerError }, diff --git a/cmd/authority-claimer/src/signer/mod.rs b/cmd/authority-claimer/src/signer/mod.rs index 37d4c9885..57036b42a 100644 --- a/cmd/authority-claimer/src/signer/mod.rs +++ b/cmd/authority-claimer/src/signer/mod.rs @@ -5,4 +5,4 @@ mod aws_credentials; mod aws_signer; mod signer; -pub use signer::{ConditionalSigner, ConditionalSignerError}; +pub use signer::ConditionalSigner;