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

* Add type parameter for democracy genesis config.

* update Substrate

Co-authored-by: parity-processbot <>
This commit is contained in:
Shaun Wangandparity-processbot authored and GitHub committed 2021-06-03 06:28:00 -04:00
1 parent a28d4a5c5d
commit 88e25f1669
3 files changed
+156 -156

No files matched your search

+154 -154
View File
File diff suppressed because it is too large. Load diff
+1 -1
View File
@@ -1399,7 +1399,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,
+1 -1
View File
@@ -997,7 +997,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,