cerc-io/lighthouse
16
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Update validator_client for BeaconStateTypes

Browse Source
This commit is contained in:
Paul Hauner 2019-05-09 12:19:52 +10:00
parent 49c92ef167
commit 0ac278f44d
No known key found for this signature in database
GPG Key ID: D362883A9218FCC6
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
beacon_node/eth2-libp2p/src/behaviour.rs
View File

@ -236,7 +236,7 @@ mod test {
#[test] #[test]
fn ssz_encoding() { fn ssz_encoding() {
let original = PubsubMessage::Block(BeaconBlock::empty(&ChainSpec::foundation())); let original = PubsubMessage::Block(BeaconBlock::empty(&FoundationStateTypes::spec()));
let encoded = ssz_encode(&original); let encoded = ssz_encode(&original);

13
validator_client/src/config.rs
View File

@ -6,7 +6,10 @@ use std::fs;
use std::fs::File; use std::fs::File;
use std::io::{Error, ErrorKind}; use std::io::{Error, ErrorKind};
use std::path::PathBuf; use std::path::PathBuf;
use types::ChainSpec; use types::{
BeaconStateTypes, ChainSpec, FewValidatorsStateTypes, FoundationStateTypes,
LighthouseTestnetStateTypes,
};
/// Stores the core configuration for this validator instance. /// Stores the core configuration for this validator instance.
#[derive(Clone)] #[derive(Clone)]
@ -31,7 +34,7 @@ impl Default for Config {
let server = "localhost:5051".to_string(); let server = "localhost:5051".to_string();
let spec = ChainSpec::foundation(); let spec = FoundationStateTypes::spec();
Self { Self {
data_dir, data_dir,
@ -65,9 +68,9 @@ impl Config {
if let Some(spec_str) = args.value_of("spec") { if let Some(spec_str) = args.value_of("spec") {
info!(log, "Using custom spec: {:?}", spec_str); info!(log, "Using custom spec: {:?}", spec_str);
config.spec = match spec_str { config.spec = match spec_str {
"foundation" => ChainSpec::foundation(), "foundation" => FoundationStateTypes::spec(),
"few_validators" => ChainSpec::few_validators(), "few_validators" => FewValidatorsStateTypes::spec(),
"lighthouse_testnet" => ChainSpec::lighthouse_testnet(), "lighthouse_testnet" => LighthouseTestnetStateTypes::spec(),
// Should be impossible due to clap's `possible_values(..)` function. // Should be impossible due to clap's `possible_values(..)` function.
_ => unreachable!(), _ => unreachable!(),
}; };