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

Fix mapping bug in YamlConfig (#1048)

Browse Source
This commit is contained in:
Michael Sproul 2020-04-24 15:27:35 +10:00 committed by GitHub
parent 30e8e8a337
commit a50ade3ffc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
eth2/types/src/chain_spec.rs
View File

@ -355,6 +355,7 @@ impl ChainSpec {
persistent_committee_period: 128, persistent_committee_period: 128,
min_genesis_delay: 300, min_genesis_delay: 300,
milliseconds_per_slot: 6_000, milliseconds_per_slot: 6_000,
safe_slots_to_update_justified: 2,
network_id: 2, // lighthouse testnet network id network_id: 2, // lighthouse testnet network id
boot_nodes, boot_nodes,
..ChainSpec::mainnet() ..ChainSpec::mainnet()
@ -625,9 +626,9 @@ impl YamlConfig {
// Validator // Validator
eth1_follow_distance: spec.eth1_follow_distance, eth1_follow_distance: spec.eth1_follow_distance,
target_aggregators_per_committee: 0, target_aggregators_per_committee: spec.target_aggregators_per_committee,
random_subnets_per_validator: 0, random_subnets_per_validator: spec.random_subnets_per_validator,
epochs_per_random_subnet_subscription: 0, epochs_per_random_subnet_subscription: spec.epochs_per_random_subnet_subscription,
seconds_per_eth1_block: spec.seconds_per_eth1_block, seconds_per_eth1_block: spec.seconds_per_eth1_block,
} }
} }

2
tests/ef_tests/tests/tests.rs
View File

@ -13,7 +13,9 @@ fn config_test<E: EthSpec + TypeName>() {
.join("config.yaml"); .join("config.yaml");
let yaml_config = YamlConfig::from_file(&config_path).expect("config file loads OK"); let yaml_config = YamlConfig::from_file(&config_path).expect("config file loads OK");
let spec = E::default_spec(); let spec = E::default_spec();
let yaml_from_spec = YamlConfig::from_spec::<E>(&spec);
assert_eq!(yaml_config.apply_to_chain_spec::<E>(&spec), Some(spec)); assert_eq!(yaml_config.apply_to_chain_spec::<E>(&spec), Some(spec));
assert_eq!(yaml_from_spec, yaml_config);
} }
#[test] #[test]