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

Companion PR to 5802 #1050

Merged
gnunicorn merged 6 commits into from
May 14, 2020
Merged

Companion PR to 5802 #1050

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
68f2172
specify new associated type constraints for collective
apopiak Apr 29, 2020
0d9ce17
move to MAX_MEMBERS constant instead of configurable associated type
apopiak May 13, 2020
e196e4a
Merge branch 'master' of github.com:paritytech/polkadot into apopiak-…
apopiak May 13, 2020
86bfa76
use pallet alias
apopiak May 14, 2020
c8e7c20
Merge branch 'master' of github.com:paritytech/polkadot into apopiak-…
apopiak May 14, 2020
be7b87c
add Cargo.lock file
apopiak May 14, 2020
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
use pallet alias
  • Loading branch information
@apopiak
apopiak committed May 14, 2020
commit 86bfa76f482b14f73d93a37ed9b1534bd6e22ff3
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 @@ -402,7 +402,7 @@ parameter_types! {
pub const ElectionsPhragmenModuleId: LockIdentifier = *b"phrelect";
}
// Make sure that there are no more than MAX_MEMBERS members elected via phragmen.
const_assert!(DESIRED_MEMBERS <= pallet_collective::MAX_MEMBERS);
const_assert!(DESIRED_MEMBERS <= collective::MAX_MEMBERS);

impl elections_phragmen::Trait for Runtime {
type Event = Event;
Expand Down