Don't override the fork in lcli eth1-genesis (#948)

* Don't override the fork in lcli

* Add spec flag to lcli
This commit is contained in:
Paul Hauner 2020-04-01 17:42:24 +11:00 committed by GitHub
parent 88d37e96fa
commit e04fc8ddb4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions

View File

@ -28,7 +28,7 @@ pub fn run<T: EthSpec>(mut env: Environment<T>, matches: &ArgMatches) -> Result<
let mut eth2_testnet_config: Eth2TestnetConfig<T> = let mut eth2_testnet_config: Eth2TestnetConfig<T> =
Eth2TestnetConfig::load(testnet_dir.clone())?; Eth2TestnetConfig::load(testnet_dir.clone())?;
let mut spec = eth2_testnet_config let spec = eth2_testnet_config
.yaml_config .yaml_config
.as_ref() .as_ref()
.ok_or_else(|| "The testnet directory must contain a spec config".to_string())? .ok_or_else(|| "The testnet directory must contain a spec config".to_string())?
@ -40,8 +40,6 @@ pub fn run<T: EthSpec>(mut env: Environment<T>, matches: &ArgMatches) -> Result<
) )
})?; })?;
spec.genesis_fork_version = [1, 3, 3, 7];
let mut config = Eth1Config::default(); let mut config = Eth1Config::default();
config.endpoint = endpoint.to_string(); config.endpoint = endpoint.to_string();
config.deposit_contract_address = eth2_testnet_config.deposit_contract_address.clone(); config.deposit_contract_address = eth2_testnet_config.deposit_contract_address.clone();

View File

@ -33,6 +33,7 @@ fn main() {
.arg( .arg(
Arg::with_name("spec") Arg::with_name("spec")
.short("s") .short("s")
.long("spec")
.value_name("STRING") .value_name("STRING")
.takes_value(true) .takes_value(true)
.required(true) .required(true)