Unverified Commit 5e0170c2 authored by Kian Paimani's avatar Kian Paimani Committed by GitHub
Browse files

Fix council/collective genesis (#954)



* Fix council collective genesisi values

* Update Cargo.lock

* Update Cargo.lock
Co-authored-by: Shawn Tabrizi's avatarShawn Tabrizi <shawntabrizi@gmail.com>
parent 5f376dfd
Pipeline #85777 passed with stages
in 24 minutes and 26 seconds
This diff is collapsed.
......@@ -376,6 +376,7 @@ impl elections_phragmen::Trait for Runtime {
type Event = Event;
type Currency = Balances;
type ChangeMembers = Council;
type InitializeMembers = Council;
type CurrencyToVote = CurrencyToVoteHandler<Self>;
type CandidacyBond = CandidacyBond;
type VotingBond = VotingBond;
......@@ -674,7 +675,7 @@ construct_runtime! {
Democracy: democracy::{Module, Call, Storage, Config, Event<T>},
Council: collective::<Instance1>::{Module, Call, Storage, Origin<T>, Event<T>, Config<T>},
TechnicalCommittee: collective::<Instance2>::{Module, Call, Storage, Origin<T>, Event<T>, Config<T>},
ElectionsPhragmen: elections_phragmen::{Module, Call, Storage, Event<T>},
ElectionsPhragmen: elections_phragmen::{Module, Call, Storage, Event<T>, Config<T>},
TechnicalMembership: membership::<Instance1>::{Module, Call, Storage, Event<T>, Config<T>},
Treasury: treasury::{Module, Call, Storage, Event<T>},
......
......@@ -384,6 +384,7 @@ impl elections_phragmen::Trait for Runtime {
type Event = Event;
type Currency = Balances;
type ChangeMembers = Council;
type InitializeMembers = Council;
type CurrencyToVote = CurrencyToVoteHandler<Self>;
type CandidacyBond = CandidacyBond;
type VotingBond = VotingBond;
......@@ -605,7 +606,7 @@ construct_runtime! {
Democracy: democracy::{Module, Call, Storage, Config, Event<T>},
Council: collective::<Instance1>::{Module, Call, Storage, Origin<T>, Event<T>, Config<T>},
TechnicalCommittee: collective::<Instance2>::{Module, Call, Storage, Origin<T>, Event<T>, Config<T>},
ElectionsPhragmen: elections_phragmen::{Module, Call, Storage, Event<T>},
ElectionsPhragmen: elections_phragmen::{Module, Call, Storage, Event<T>, Config<T>},
TechnicalMembership: membership::<Instance1>::{Module, Call, Storage, Event<T>, Config<T>},
Treasury: treasury::{Module, Call, Storage, Event<T>},
......
......@@ -140,6 +140,7 @@ fn polkadot_staging_testnet_config_genesis() -> polkadot::GenesisConfig {
slash_reward_fraction: Perbill::from_percent(10),
.. Default::default()
}),
elections_phragmen: Some(Default::default()),
democracy: Some(Default::default()),
collective_Instance1: Some(polkadot::CouncilConfig {
members: vec![],
......@@ -294,6 +295,7 @@ fn kusama_staging_testnet_config_genesis() -> kusama::GenesisConfig {
slash_reward_fraction: Perbill::from_percent(10),
.. Default::default()
}),
elections_phragmen: Some(Default::default()),
democracy: Some(Default::default()),
collective_Instance1: Some(kusama::CouncilConfig {
members: vec![],
......@@ -452,6 +454,7 @@ pub fn polkadot_testnet_genesis(
slash_reward_fraction: Perbill::from_percent(10),
.. Default::default()
}),
elections_phragmen: Some(Default::default()),
democracy: Some(polkadot::DemocracyConfig::default()),
collective_Instance1: Some(polkadot::CouncilConfig {
members: vec![],
......@@ -528,6 +531,7 @@ pub fn kusama_testnet_genesis(
slash_reward_fraction: Perbill::from_percent(10),
.. Default::default()
}),
elections_phragmen: Some(Default::default()),
democracy: Some(kusama::DemocracyConfig::default()),
collective_Instance1: Some(kusama::CouncilConfig {
members: vec![],
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment