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

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 <>
parent cb34a018
Pipeline #139391 canceled with stages
in 24 minutes and 52 seconds
This diff is collapsed.
...@@ -378,6 +378,11 @@ impl pallet_election_provider_multi_phase::Config for Runtime { ...@@ -378,6 +378,11 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
type OnChainAccuracy = Perbill; type OnChainAccuracy = Perbill;
type Fallback = Fallback; type Fallback = Fallback;
type BenchmarkingConfig = (); 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>; type WeightInfo = weights::pallet_election_provider_multi_phase::WeightInfo<Runtime>;
} }
......
...@@ -359,6 +359,11 @@ impl pallet_election_provider_multi_phase::Config for Runtime { ...@@ -359,6 +359,11 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
type CompactSolution = NposCompactSolution16; type CompactSolution = NposCompactSolution16;
type Fallback = Fallback; type Fallback = Fallback;
type BenchmarkingConfig = (); 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>; type WeightInfo = weights::pallet_election_provider_multi_phase::WeightInfo<Runtime>;
} }
......
...@@ -369,6 +369,7 @@ impl pallet_election_provider_multi_phase::Config for Runtime { ...@@ -369,6 +369,7 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
type CompactSolution = NposCompactSolution16; type CompactSolution = NposCompactSolution16;
type Fallback = Fallback; type Fallback = Fallback;
type BenchmarkingConfig = (); type BenchmarkingConfig = ();
type ForceOrigin = EnsureRoot<AccountId>;
type WeightInfo = weights::pallet_election_provider_multi_phase::WeightInfo<Runtime>; type WeightInfo = weights::pallet_election_provider_multi_phase::WeightInfo<Runtime>;
} }
......
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