Fix chainspec and runtime (#326)

This commit is contained in:
Bastian Köcher
2019-07-11 16:57:50 +02:00
committed by André Silva
parent 5dfc0aab05
commit d814150d07
2 changed files with 5 additions and 5 deletions
+1 -1
View File
@@ -380,8 +380,8 @@ construct_runtime!(
Authorship: authorship::{Module, Call, Storage}, Authorship: authorship::{Module, Call, Storage},
Indices: indices, Indices: indices,
Balances: balances, Balances: balances,
Session: session::{Module, Call, Storage, Event, Config<T>},
Staking: staking::{default, OfflineWorker}, Staking: staking::{default, OfflineWorker},
Session: session::{Module, Call, Storage, Event, Config<T>},
Democracy: democracy::{Module, Call, Storage, Config, Event<T>}, Democracy: democracy::{Module, Call, Storage, Config, Event<T>},
Council: council::{Module, Call, Storage, Event<T>}, Council: council::{Module, Call, Storage, Event<T>},
CouncilMotions: council_motions::{Module, Call, Storage, Event<T>, Origin<T>}, CouncilMotions: council_motions::{Module, Call, Storage, Event<T>, Origin<T>},
+4 -4
View File
@@ -93,7 +93,7 @@ fn staging_testnet_config_genesis() -> GenesisConfig {
}), }),
session: Some(SessionConfig { session: Some(SessionConfig {
keys: initial_authorities.iter().map(|x| ( keys: initial_authorities.iter().map(|x| (
x.1.clone(), x.0.clone(),
SessionKeys { ed25519: x.2.clone() }, SessionKeys { ed25519: x.2.clone() },
)).collect::<Vec<_>>(), )).collect::<Vec<_>>(),
}), }),
@@ -106,7 +106,7 @@ fn staging_testnet_config_genesis() -> GenesisConfig {
offline_slash_grace: 4, offline_slash_grace: 4,
minimum_validator_count: 4, minimum_validator_count: 4,
stakers: initial_authorities.iter().map(|x| (x.0.clone(), x.1.clone(), STASH, StakerStatus::Validator)).collect(), stakers: initial_authorities.iter().map(|x| (x.0.clone(), x.1.clone(), STASH, StakerStatus::Validator)).collect(),
invulnerables: initial_authorities.iter().map(|x| x.1.clone()).collect(), invulnerables: initial_authorities.iter().map(|x| x.0.clone()).collect(),
}), }),
democracy: Some(Default::default()), democracy: Some(Default::default()),
council_seats: Some(CouncilSeatsConfig { council_seats: Some(CouncilSeatsConfig {
@@ -213,7 +213,7 @@ pub fn testnet_genesis(
}), }),
session: Some(SessionConfig { session: Some(SessionConfig {
keys: initial_authorities.iter().map(|x| ( keys: initial_authorities.iter().map(|x| (
x.1.clone(), x.0.clone(),
SessionKeys { ed25519: x.2.clone() }, SessionKeys { ed25519: x.2.clone() },
)).collect::<Vec<_>>(), )).collect::<Vec<_>>(),
}), }),
@@ -228,7 +228,7 @@ pub fn testnet_genesis(
stakers: initial_authorities.iter() stakers: initial_authorities.iter()
.map(|x| (x.0.clone(), x.1.clone(), STASH, StakerStatus::Validator)) .map(|x| (x.0.clone(), x.1.clone(), STASH, StakerStatus::Validator))
.collect(), .collect(),
invulnerables: initial_authorities.iter().map(|x| x.1.clone()).collect(), invulnerables: initial_authorities.iter().map(|x| x.0.clone()).collect(),
}), }),
democracy: Some(DemocracyConfig::default()), democracy: Some(DemocracyConfig::default()),
council_seats: Some(CouncilSeatsConfig { council_seats: Some(CouncilSeatsConfig {