Skip to content

Commit 0482424

Browse files
committed
fix the errors
1 parent e6cad69 commit 0482424

File tree

5 files changed

+19
-34
lines changed

5 files changed

+19
-34
lines changed

crates/l2/prover/src/guest_program/src/sp1/Cargo.lock

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/networking/p2p/snap.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ mod tests {
192192
use std::sync::LazyLock;
193193

194194
// Constant values for hive `AccountRange` tests
195-
static HASH_MIN: LazyLock<H256> = LazyLock::new(|| H256::zero());
195+
static HASH_MIN: LazyLock<H256> = LazyLock::new(H256::zero);
196196
static HASH_MAX: LazyLock<H256> = LazyLock::new(|| {
197197
H256::from_str("0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff")
198198
.unwrap()

tooling/Cargo.lock

Lines changed: 0 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tooling/archive_sync/src/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use ethrex_rpc::clients::auth::RpcResponse;
1515
use ethrex_storage::Store;
1616
use serde::{Deserialize, Serialize};
1717
use serde_json::{Value, json};
18-
use std::cell::LazyCell;
18+
use std::sync::LazyLock;
1919
use std::collections::HashMap;
2020
use std::fs::File;
2121
use std::io::{self, Read, Write};
@@ -27,7 +27,7 @@ use tokio::task::JoinSet;
2727
use tracing::{debug, info};
2828
use tracing_subscriber::FmtSubscriber;
2929

30-
static CLIENT: LazyCell<reqwest::Client> = LazyCell::new(|| reqwest::Client::new());
30+
static CLIENT: LazyLock<reqwest::Client> = LazyLock::new(|| reqwest::Client::new());
3131

3232
/// Max account dumps to ask for in a single request. The current value matches geth's maximum output.
3333
const MAX_ACCOUNTS: usize = 256;

tooling/ef_tests/blockchain/fork.rs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
use ethrex_common::{H160, types::ChainConfig};
22
use serde::Deserialize;
3-
use std::cell::LazyCell;
3+
use std::sync::LazyLock;
44
use std::str::FromStr;
55

66
// Chain config for different forks as defined on https://ethereum.github.io/execution-spec-tests/v3.0.0/consuming_tests/common_types/#fork
7-
pub static MERGE_CONFIG: LazyCell<ChainConfig> = LazyCell::new(|| ChainConfig {
7+
pub static MERGE_CONFIG: LazyLock<ChainConfig> = LazyLock::new(|| ChainConfig {
88
chain_id: 1_u64,
99
homestead_block: Some(0),
1010
dao_fork_block: Some(0),
@@ -25,24 +25,24 @@ pub static MERGE_CONFIG: LazyCell<ChainConfig> = LazyCell::new(|| ChainConfig {
2525
terminal_total_difficulty: Some(0),
2626
..Default::default()
2727
});
28-
pub static MERGE_TO_SHANGHAI_AT_15K_CONFIG: LazyCell<ChainConfig> = LazyCell::new(|| ChainConfig {
28+
pub static MERGE_TO_SHANGHAI_AT_15K_CONFIG: LazyLock<ChainConfig> = LazyLock::new(|| ChainConfig {
2929
shanghai_time: Some(0x3a98),
3030
..*MERGE_CONFIG
3131
});
32-
pub static SHANGHAI_CONFIG: LazyCell<ChainConfig> = LazyCell::new(|| ChainConfig {
32+
pub static SHANGHAI_CONFIG: LazyLock<ChainConfig> = LazyLock::new(|| ChainConfig {
3333
shanghai_time: Some(0),
3434
..*MERGE_CONFIG
3535
});
36-
pub static SHANGHAI_TO_CANCUN_AT_15K_CONFIG: LazyCell<ChainConfig> =
37-
LazyCell::new(|| ChainConfig {
36+
pub static SHANGHAI_TO_CANCUN_AT_15K_CONFIG: LazyLock<ChainConfig> =
37+
LazyLock::new(|| ChainConfig {
3838
cancun_time: Some(0x3a98),
3939
..*SHANGHAI_CONFIG
4040
});
41-
pub static CANCUN_CONFIG: LazyCell<ChainConfig> = LazyCell::new(|| ChainConfig {
41+
pub static CANCUN_CONFIG: LazyLock<ChainConfig> = LazyLock::new(|| ChainConfig {
4242
cancun_time: Some(0),
4343
..*SHANGHAI_CONFIG
4444
});
45-
pub static CANCUN_TO_PRAGUE_AT_15K_CONFIG: LazyCell<ChainConfig> = LazyCell::new(|| {
45+
pub static CANCUN_TO_PRAGUE_AT_15K_CONFIG: LazyLock<ChainConfig> = LazyLock::new(|| {
4646
ChainConfig {
4747
prague_time: Some(0x3a98),
4848
// Mainnet address
@@ -51,43 +51,43 @@ pub static CANCUN_TO_PRAGUE_AT_15K_CONFIG: LazyCell<ChainConfig> = LazyCell::new
5151
..*CANCUN_CONFIG
5252
}
5353
});
54-
pub static PRAGUE_CONFIG: LazyCell<ChainConfig> = LazyCell::new(|| ChainConfig {
54+
pub static PRAGUE_CONFIG: LazyLock<ChainConfig> = LazyLock::new(|| ChainConfig {
5555
prague_time: Some(0),
5656
..*CANCUN_TO_PRAGUE_AT_15K_CONFIG
5757
});
5858

59-
pub static PRAGUE_TO_OSAKA_AT_15K_CONFIG: LazyCell<ChainConfig> = LazyCell::new(|| ChainConfig {
59+
pub static PRAGUE_TO_OSAKA_AT_15K_CONFIG: LazyLock<ChainConfig> = LazyLock::new(|| ChainConfig {
6060
osaka_time: Some(0x3a98),
6161
..*PRAGUE_CONFIG
6262
});
6363

64-
pub static OSAKA_CONFIG: LazyCell<ChainConfig> = LazyCell::new(|| ChainConfig {
64+
pub static OSAKA_CONFIG: LazyLock<ChainConfig> = LazyLock::new(|| ChainConfig {
6565
osaka_time: Some(0),
6666
..*PRAGUE_CONFIG
6767
});
6868

69-
pub static OSAKA_TO_BPO1_AT_15K_CONFIG: LazyCell<ChainConfig> = LazyCell::new(|| ChainConfig {
69+
pub static OSAKA_TO_BPO1_AT_15K_CONFIG: LazyLock<ChainConfig> = LazyLock::new(|| ChainConfig {
7070
bpo1_time: Some(0x3a98),
7171
..*OSAKA_CONFIG
7272
});
7373

74-
pub static BPO1_TO_BPO2_AT_15K_CONFIG: LazyCell<ChainConfig> = LazyCell::new(|| ChainConfig {
74+
pub static BPO1_TO_BPO2_AT_15K_CONFIG: LazyLock<ChainConfig> = LazyLock::new(|| ChainConfig {
7575
bpo1_time: Some(0),
7676
bpo2_time: Some(0x3a98),
7777
..*OSAKA_CONFIG
7878
});
7979

80-
pub static BPO2_TO_BPO3_AT_15K_CONFIG: LazyCell<ChainConfig> = LazyCell::new(|| ChainConfig {
80+
pub static BPO2_TO_BPO3_AT_15K_CONFIG: LazyLock<ChainConfig> = LazyLock::new(|| ChainConfig {
8181
bpo2_time: Some(0),
8282
bpo3_time: Some(0x3a98),
8383
..*OSAKA_CONFIG
8484
});
85-
pub static BPO3_TO_BPO4_AT_15K_CONFIG: LazyCell<ChainConfig> = LazyCell::new(|| ChainConfig {
85+
pub static BPO3_TO_BPO4_AT_15K_CONFIG: LazyLock<ChainConfig> = LazyLock::new(|| ChainConfig {
8686
bpo3_time: Some(0),
8787
bpo4_time: Some(0x3a98),
8888
..*OSAKA_CONFIG
8989
});
90-
pub static BPO4_TO_BPO5_AT_15K_CONFIG: LazyCell<ChainConfig> = LazyCell::new(|| ChainConfig {
90+
pub static BPO4_TO_BPO5_AT_15K_CONFIG: LazyLock<ChainConfig> = LazyLock::new(|| ChainConfig {
9191
bpo4_time: Some(0),
9292
bpo5_time: Some(0x3a98),
9393
..*OSAKA_CONFIG

0 commit comments

Comments
 (0)