Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Companion for substrate/pull/8903 #3099

Merged
merged 5 commits into from
May 26, 2021
Merged

Companion for substrate/pull/8903 #3099

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5ec70f2
add stuff
kianenigma May 25, 2021
76e690f
Update runtime/polkadot/src/lib.rs
kianenigma May 25, 2021
bcb6676
Update runtime/kusama/src/lib.rs
kianenigma May 25, 2021
10d3ff6
Merge remote-tracking branch 'origin/master' into kiz-companion-8903
May 26, 2021
5536162
update Substrate
May 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions runtime/kusama/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
pallet_collective::EnsureProportionAtLeast<_2, _3, AccountId, TechnicalCollective>,
kianenigma marked this conversation as resolved.
Show resolved Hide resolved
pallet_collective::EnsureProportionAtLeast<_2, _3, AccountId, CouncilCollective>,
>;
type WeightInfo = weights::pallet_election_provider_multi_phase::WeightInfo<Runtime>;
}

Expand Down
5 changes: 5 additions & 0 deletions runtime/polkadot/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
pallet_collective::EnsureProportionAtLeast<_2, _3, AccountId, TechnicalCollective>,
kianenigma marked this conversation as resolved.
Show resolved Hide resolved
pallet_collective::EnsureProportionAtLeast<_2, _3, AccountId, CouncilCollective>,
>;
type WeightInfo = weights::pallet_election_provider_multi_phase::WeightInfo<Runtime>;
}

Expand Down
1 change: 1 addition & 0 deletions runtime/westend/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
}

Expand Down