Skip to content

Commit 50bc492

Browse files
committed
fmt and msrv build
1 parent 4f7b5a0 commit 50bc492

File tree

2 files changed

+5
-15
lines changed

2 files changed

+5
-15
lines changed

.github/workflows/lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
- uses: actions/checkout@v4
6060
- uses: dtolnay/rust-toolchain@master
6161
with:
62-
toolchain: "1.81" # MSRV
62+
toolchain: "1.86" # MSRV
6363
- uses: Swatinem/rust-cache@v2
6464
with:
6565
cache-on-failure: true
@@ -106,4 +106,4 @@ jobs:
106106
- name: Decide whether the needed jobs succeeded or failed
107107
uses: re-actors/alls-green@release/v1
108108
with:
109-
jobs: ${{ toJSON(needs) }}
109+
jobs: ${{ toJSON(needs) }}

bin/lumen/src/main.rs

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,9 @@ use tracing::info;
6161
static ALLOC: reth_cli_util::allocator::Allocator = reth_cli_util::allocator::new_allocator();
6262

6363
/// Rollkit-specific command line arguments
64-
#[derive(Debug, Clone, Parser, PartialEq, Eq, Serialize, Deserialize)]
65-
#[derive(Default)]
64+
#[derive(Debug, Clone, Parser, PartialEq, Eq, Serialize, Deserialize, Default)]
6665
pub struct RollkitArgs {}
6766

68-
6967
/// Rollkit payload attributes that support passing transactions via Engine API
7068
#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
7169
pub struct RollkitEnginePayloadAttributes {
@@ -498,11 +496,7 @@ where
498496
rt.block_on(rollkit_builder.build_payload(rollkit_attrs))
499497
})
500498
.join()
501-
.map_err(|_| {
502-
PayloadBuilderError::other(std::io::Error::other(
503-
"Thread join failed",
504-
))
505-
})?
499+
.map_err(|_| PayloadBuilderError::other(std::io::Error::other("Thread join failed")))?
506500
.map_err(PayloadBuilderError::other)?;
507501

508502
info!(
@@ -564,11 +558,7 @@ where
564558
rt.block_on(rollkit_builder.build_payload(rollkit_attrs))
565559
})
566560
.join()
567-
.map_err(|_| {
568-
PayloadBuilderError::other(std::io::Error::other(
569-
"Thread join failed",
570-
))
571-
})?
561+
.map_err(|_| PayloadBuilderError::other(std::io::Error::other("Thread join failed")))?
572562
.map_err(PayloadBuilderError::other)?;
573563

574564
let gas_used = sealed_block.gas_used;

0 commit comments

Comments
 (0)