Companion for substrate/pull/8903 (#3099)

* add stuff

* Update runtime/polkadot/src/lib.rs

* Update runtime/kusama/src/lib.rs

* update Substrate

Co-authored-by: parity-processbot <>
This commit is contained in:
Kian Paimani
2021-05-26 12:50:50 +02:00
committed by GitHub
parent d682ab82d2
commit 0da48f736a
4 changed files with 163 additions and 152 deletions
+152 -152
View File
File diff suppressed because it is too large Load Diff
+5
View File
@@ -378,6 +378,11 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
type OnChainAccuracy = Perbill;
type Fallback = Fallback;
type BenchmarkingConfig = ();
type ForceOrigin = EnsureOneOf<
AccountId,
EnsureRoot<AccountId>,
pallet_collective::EnsureProportionAtLeast<_2, _3, AccountId, CouncilCollective>,
>;
type WeightInfo = weights::pallet_election_provider_multi_phase::WeightInfo<Runtime>;
}
+5
View File
@@ -359,6 +359,11 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
type CompactSolution = NposCompactSolution16;
type Fallback = Fallback;
type BenchmarkingConfig = ();
type ForceOrigin = EnsureOneOf<
AccountId,
EnsureRoot<AccountId>,
pallet_collective::EnsureProportionAtLeast<_2, _3, AccountId, CouncilCollective>,
>;
type WeightInfo = weights::pallet_election_provider_multi_phase::WeightInfo<Runtime>;
}
+1
View File
@@ -369,6 +369,7 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
type CompactSolution = NposCompactSolution16;
type Fallback = Fallback;
type BenchmarkingConfig = ();
type ForceOrigin = EnsureRoot<AccountId>;
type WeightInfo = weights::pallet_election_provider_multi_phase::WeightInfo<Runtime>;
}