mirror of
https://github.com/sigp/lighthouse.git
synced 2026-05-30 04:37:13 +00:00
Use E for EthSpec globally (#5264)
* 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:
@@ -15,19 +15,19 @@ fn read_file_bytes(filename: &Path) -> Result<Vec<u8>, String> {
|
||||
Ok(bytes)
|
||||
}
|
||||
|
||||
pub fn run<T: EthSpec>(matches: &ArgMatches) -> Result<(), String> {
|
||||
let spec = &T::default_spec();
|
||||
pub fn run<E: EthSpec>(matches: &ArgMatches) -> Result<(), String> {
|
||||
let spec = &E::default_spec();
|
||||
|
||||
let state_file: PathBuf = parse_required(matches, "state")?;
|
||||
let attestations_file: PathBuf = parse_required(matches, "attestations")?;
|
||||
|
||||
let mut state = BeaconState::<T>::from_ssz_bytes(&read_file_bytes(&state_file)?, spec)
|
||||
let mut state = BeaconState::<E>::from_ssz_bytes(&read_file_bytes(&state_file)?, spec)
|
||||
.map_err(|e| format!("Invalid state: {:?}", e))?;
|
||||
state
|
||||
.build_all_committee_caches(spec)
|
||||
.map_err(|e| format!("{:?}", e))?;
|
||||
|
||||
let attestations: Vec<Attestation<T>> =
|
||||
let attestations: Vec<Attestation<E>> =
|
||||
serde_json::from_slice(&read_file_bytes(&attestations_file)?)
|
||||
.map_err(|e| format!("Invalid attestation list: {:?}", e))?;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user