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

Fix lcli merge conflicts

Browse Source
This commit is contained in:
pawanjay176
2020-04-28 18:21:52 +05:30
parent 19436d4ad7
commit 47124ca404
7 changed files with 111 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lcli/src/main.rs
View File

@@ -410,7 +410,7 @@ async fn main() {
macro_rules! run_with_spec {
($env_builder: expr) => {
match run($env_builder, &matches) {
match run($env_builder, &matches).await {
Ok(()) => process::exit(0),
Err(e) => {
println!("Failed to run lcli: {}", e);
@@ -421,9 +421,9 @@ async fn main() {
}
match matches.value_of("spec") {
Some("minimal") => run_with_spec!(EnvironmentBuilder::minimal()).await,
Some("mainnet") => run_with_spec!(EnvironmentBuilder::mainnet()).await,
Some("interop") => run_with_spec!(EnvironmentBuilder::interop()).await,
Some("minimal") => run_with_spec!(EnvironmentBuilder::minimal()),
Some("mainnet") => run_with_spec!(EnvironmentBuilder::mainnet()),
Some("interop") => run_with_spec!(EnvironmentBuilder::interop()),
spec => {
// This path should be unreachable due to slog having a `default_value`
unreachable!("Unknown spec configuration: {:?}", spec);
@@ -431,7 +431,10 @@ async fn main() {
}
}
fn run<T: EthSpec>(env_builder: EnvironmentBuilder<T>, matches: &ArgMatches) -> Result<(), String> {
async fn run<T: EthSpec>(
env_builder: EnvironmentBuilder<T>,
matches: &ArgMatches<'_>,
) -> Result<(), String> {
let env = env_builder
.multi_threaded_tokio_runtime()
.map_err(|e| format!("should start tokio runtime: {:?}", e))?
@@ -485,14 +488,15 @@ fn run<T: EthSpec>(env_builder: EnvironmentBuilder<T>, matches: &ArgMatches) ->
run_parse_hex::<T>(matches).map_err(|e| format!("Failed to pretty print hex: {}", e))
}
("deploy-deposit-contract", Some(matches)) => {
deploy_deposit_contract::run::<T>(env, matches)
deploy_deposit_contract::run::<T>(env, matches).await
.map_err(|e| format!("Failed to run deploy-deposit-contract command: {}", e))
}
("refund-deposit-contract", Some(matches)) => {
refund_deposit_contract::run::<T>(env, matches)
refund_deposit_contract::run::<T>(env, matches).await
.map_err(|e| format!("Failed to run refund-deposit-contract command: {}", e))
}
("eth1-genesis", Some(matches)) => eth1_genesis::run::<T>(env, matches)
.await
.map_err(|e| format!("Failed to run eth1-genesis command: {}", e)),
("interop-genesis", Some(matches)) => interop_genesis::run::<T>(env, matches)
.map_err(|e| format!("Failed to run interop-genesis command: {}", e)),