gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-04-19 13:58:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use E for EthSpec globally (#5264)

Browse Source 
* Use `E` for `EthSpec` globally

* Fix tests

* Merge branch 'unstable' into e-ethspec

* Merge branch 'unstable' into e-ethspec

# Conflicts:
#	beacon_node/execution_layer/src/engine_api.rs
#	beacon_node/execution_layer/src/engine_api/http.rs
#	beacon_node/execution_layer/src/engine_api/json_structures.rs
#	beacon_node/execution_layer/src/test_utils/handle_rpc.rs
#	beacon_node/store/src/partial_beacon_state.rs
#	consensus/types/src/beacon_block.rs
#	consensus/types/src/beacon_block_body.rs
#	consensus/types/src/beacon_state.rs
#	consensus/types/src/config_and_preset.rs
#	consensus/types/src/execution_payload.rs
#	consensus/types/src/execution_payload_header.rs
#	consensus/types/src/light_client_optimistic_update.rs
#	consensus/types/src/payload.rs
#	lcli/src/parse_ssz.rs
This commit is contained in:
Mac L
2024-04-03 02:12:25 +11:00
committed by GitHub
parent f8fdb71f50
commit 969d12dc6f
230 changed files with 2743 additions and 2792 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lcli/src/transition_blocks.rs
View File

@@ -96,12 +96,12 @@ struct Config {
exclude_post_block_thc: bool,
}
pub fn run<T: EthSpec>(
env: Environment<T>,
pub fn run<E: EthSpec>(
env: Environment<E>,
network_config: Eth2NetworkConfig,
matches: &ArgMatches,
) -> Result<(), String> {
let spec = &network_config.chain_spec::<T>()?;
let spec = &network_config.chain_spec::<E>()?;
let executor = env.core_context().executor;
/*
@@ -122,7 +122,7 @@ pub fn run<T: EthSpec>(
exclude_post_block_thc: matches.is_present("exclude-post-block-thc"),
};
info!("Using {} spec", T::spec_name());
info!("Using {} spec", E::spec_name());
info!("Doing {} runs", runs);
info!("{:?}", &config);
@@ -157,7 +157,7 @@ pub fn run<T: EthSpec>(
return Err("Cannot run on the genesis block".to_string());
}
let parent_block: SignedBeaconBlock<T> = client
let parent_block: SignedBeaconBlock<E> = client
.get_beacon_blocks(BlockId::Root(block.parent_root()))
.await
.map_err(|e| format!("Failed to download parent block: {:?}", e))?
@@ -167,7 +167,7 @@ pub fn run<T: EthSpec>(
let state_root = parent_block.state_root();
let state_id = StateId::Root(state_root);
let pre_state = client
.get_debug_beacon_states::<T>(state_id)
.get_debug_beacon_states::<E>(state_id)
.await
.map_err(|e| format!("Failed to download state: {:?}", e))?
.ok_or_else(|| format!("Unable to locate state at {:?}", state_id))?
@@ -297,15 +297,15 @@ pub fn run<T: EthSpec>(
Ok(())
}
fn do_transition<T: EthSpec>(
mut pre_state: BeaconState<T>,
fn do_transition<E: EthSpec>(
mut pre_state: BeaconState<E>,
block_root: Hash256,
block: SignedBeaconBlock<T>,
block: SignedBeaconBlock<E>,
mut state_root_opt: Option<Hash256>,
config: &Config,
validator_pubkey_cache: &ValidatorPubkeyCache<EphemeralHarnessType<T>>,
validator_pubkey_cache: &ValidatorPubkeyCache<EphemeralHarnessType<E>>,
spec: &ChainSpec,
) -> Result<BeaconState<T>, String> {
) -> Result<BeaconState<E>, String> {
if !config.exclude_cache_builds {
let t = Instant::now();
pre_state