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

Companion PR for Substrate #8824 (Migrate pallet-democracy to pallet attribute macro) #3030

Merged
shawntabrizi merged 3 commits into from
Jun 3, 2021
Merged

Companion PR for Substrate #8824 (Migrate pallet-democracy to pallet attribute macro) #3030

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e8a396
Add type parameter for democracy genesis config.
shaunxw May 16, 2021
693435c
Merge remote-tracking branch 'origin/master' into sw/companion-8824
Jun 3, 2021
adc2ed6
update Substrate
Jun 3, 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
2 changes: 1 addition & 1 deletion runtime/kusama/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1378,7 +1378,7 @@ construct_runtime! {
AuthorityDiscovery: pallet_authority_discovery::{Pallet, Call, Config} = 12,

// Governance stuff; uncallable initially.
Democracy: pallet_democracy::{Pallet, Call, Storage, Config, Event<T>} = 13,
Democracy: pallet_democracy::{Pallet, Call, Storage, Config<T>, Event<T>} = 13,
Council: pallet_collective::<Instance1>::{Pallet, Call, Storage, Origin<T>, Event<T>, Config<T>} = 14,
TechnicalCommittee: pallet_collective::<Instance2>::{Pallet, Call, Storage, Origin<T>, Event<T>, Config<T>} = 15,
PhragmenElection: pallet_elections_phragmen::{Pallet, Call, Storage, Event<T>, Config<T>} = 16,
Expand Down
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 @@ -992,7 +992,7 @@ construct_runtime! {
AuthorityDiscovery: pallet_authority_discovery::{Pallet, Call, Config} = 13,

// Governance stuff.
Democracy: pallet_democracy::{Pallet, Call, Storage, Config, Event<T>} = 14,
Democracy: pallet_democracy::{Pallet, Call, Storage, Config<T>, Event<T>} = 14,
Council: pallet_collective::<Instance1>::{Pallet, Call, Storage, Origin<T>, Event<T>, Config<T>} = 15,
TechnicalCommittee: pallet_collective::<Instance2>::{Pallet, Call, Storage, Origin<T>, Event<T>, Config<T>} = 16,
PhragmenElection: pallet_elections_phragmen::{Pallet, Call, Storage, Event<T>, Config<T>} = 17,
Expand Down