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

Adding Fallback on election failure #5093

Merged
kianenigma merged 12 commits into from
Mar 26, 2022
Merged

Adding Fallback on election failure #5093

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
93cd481
Adding `Fallback` on election failure
Mar 12, 2022
de23131
Merge branch 'paritytech:master' into election-fallback
georgesdib Mar 18, 2022
6f7736e
Adding `BoundedOnchainExecution`
Mar 18, 2022
a0051bb
Introducing `ExecutionConfig`
Mar 19, 2022
c567a24
Merge branch 'paritytech:master' into election-fallback
georgesdib Mar 20, 2022
995812a
`OnChainSequentialPhragmen` > `OnChainSeqPhragmen`
Mar 20, 2022
b4e885c
`BoundedOnchainExecution` -> `BoundedExecution`
Mar 20, 2022
76677bb
`Fallback` back to `NoFallback`
Mar 21, 2022
592fc8c
Merge branch 'master' into election-fallback
kianenigma Mar 25, 2022
261665b
Update runtime/test-runtime/src/lib.rs
kianenigma Mar 25, 2022
0518dbb
Merge remote-tracking branch 'origin/master' into election-fallback
Mar 25, 2022
e179ded
update lockfile for {"substrate"}
Mar 25, 2022
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
Prev Previous commit
Next Next commit
Merge branch 'master' into election-fallback
  • Loading branch information
@kianenigma
kianenigma authored Mar 25, 2022
commit 592fc8cfa1f355b446e3fcbc8db28db08a7102c6
2 changes: 1 addition & 1 deletion runtime/polkadot/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@ impl pallet_staking::Config for Runtime {
type NextNewSession = Session;
type ElectionProvider = ElectionProviderMultiPhase;
type GenesisElectionProvider = runtime_common::elections::GenesisElectionOf<Self, Staking>;
type SortedListProvider = BagsList;
type VoterList = BagsList;
type MaxUnlockingChunks = frame_support::traits::ConstU32<32>;
type BenchmarkingConfig = runtime_common::StakingBenchmarkingConfig;
type WeightInfo = weights::pallet_staking::WeightInfo<Runtime>;
Expand Down
2 changes: 1 addition & 1 deletion runtime/test-runtime/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ impl pallet_staking::Config for Runtime {
>;
// Use the nominator map to iter voter AND no-ops for all SortedListProvider hooks. The migration
// to bags-list is a no-op, but the storage version will be updated.
type SortedListProvider = pallet_staking::UseNominatorsMap<Runtime>;
type VoterList = pallet_staking::UseNominatorsMap<Runtime>;
type MaxUnlockingChunks = frame_support::traits::ConstU32<32>;
type BenchmarkingConfig = runtime_common::StakingBenchmarkingConfig;
type WeightInfo = ();
Expand Down
2 changes: 1 addition & 1 deletion runtime/westend/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ impl pallet_staking::Config for Runtime {
type NextNewSession = Session;
type ElectionProvider = ElectionProviderMultiPhase;
type GenesisElectionProvider = runtime_common::elections::GenesisElectionOf<Self, Staking>;
type SortedListProvider = BagsList;
type VoterList = BagsList;
type MaxUnlockingChunks = frame_support::traits::ConstU32<32>;
type BenchmarkingConfig = runtime_common::StakingBenchmarkingConfig;
type WeightInfo = weights::pallet_staking::WeightInfo<Runtime>;
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.