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

Fix merge conflicts

Browse Source
This commit is contained in:
Age Manning
2019-03-25 17:46:08 +11:00
parent ca9af49d4e 2f49289c28
commit 02039be400
25 changed files with 1259 additions and 448 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
validator_client/src/main.rs
View File

@@ -5,7 +5,7 @@ mod duties;
pub mod error;
mod service;
use crate::config::Config as ValidatorConfig;
use crate::config::Config as ValidatorClientConfig;
use clap::{App, Arg};
use service::Service as ValidatorService;
use slog::{error, info, o, Drain};
@@ -48,7 +48,8 @@ fn main() {
)
.get_matches();
let config = ValidatorConfig::parse_args(matches, &log).unwrap();
let config = ValidatorClientConfig::parse_args(&matches, &log)
.expect("Unable to build a configuration for the validator client.");
// start the validator service.
match ValidatorService::start(config, log.clone()) {