gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-03-03 00:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove merge transition code (#8761)

Browse Source 
Co-Authored-By: dapplion <35266934+dapplion@users.noreply.github.com>
This commit is contained in:
Lion - dapplion
2026-02-24 20:20:28 -07:00
committed by GitHub
parent e59f1f03ef
commit d6bf53834f
39 changed files with 581 additions and 2433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lcli/src/mock_el.rs
View File

@@ -3,13 +3,10 @@ use clap_utils::{parse_optional, parse_required};
use environment::Environment;
use execution_layer::{
auth::{JwtKey, strip_prefix},
test_utils::{
Config, DEFAULT_JWT_SECRET, DEFAULT_TERMINAL_BLOCK, MockExecutionConfig, MockServer,
},
test_utils::{Config, DEFAULT_JWT_SECRET, MockExecutionConfig, MockServer},
};
use std::net::Ipv4Addr;
use std::path::PathBuf;
use std::sync::Arc;
use types::*;
pub fn run<E: EthSpec>(mut env: Environment<E>, matches: &ArgMatches) -> Result<(), String> {
@@ -25,7 +22,6 @@ pub fn run<E: EthSpec>(mut env: Environment<E>, matches: &ArgMatches) -> Result<
let amsterdam_time = parse_optional(matches, "amsterdam-time")?;
let handle = env.core_context().executor.handle().unwrap();
let spec = Arc::new(E::default_spec());
let jwt_key = if let Some(secret_path) = jwt_secret_path {
let hex_str = std::fs::read_to_string(&secret_path)
@@ -50,9 +46,6 @@ pub fn run<E: EthSpec>(mut env: Environment<E>, matches: &ArgMatches) -> Result<
listen_port,
},
jwt_key,
terminal_difficulty: spec.terminal_total_difficulty,
terminal_block: DEFAULT_TERMINAL_BLOCK,
terminal_block_hash: spec.terminal_block_hash,
shanghai_time: Some(shanghai_time),
cancun_time,
prague_time,