Companion PR for #6984 (#1661)

* Add DefaultVote trait definition

* Check in cargo lock

* Update cargo lock

* "Update Substrate"

Co-authored-by: parity-processbot <>
This commit is contained in:
Wei Tang
2020-09-14 16:35:38 +02:00
committed by GitHub
parent 2b96e04d01
commit bfb41c715b
3 changed files with 138 additions and 134 deletions
+134 -134
View File
File diff suppressed because it is too large Load Diff
+2
View File
@@ -418,6 +418,7 @@ impl pallet_collective::Trait<CouncilCollective> for Runtime {
type MotionDuration = CouncilMotionDuration; type MotionDuration = CouncilMotionDuration;
type MaxProposals = CouncilMaxProposals; type MaxProposals = CouncilMaxProposals;
type MaxMembers = CouncilMaxMembers; type MaxMembers = CouncilMaxMembers;
type DefaultVote = pallet_collective::PrimeDefaultVote;
type WeightInfo = weights::pallet_collective::WeightInfo; type WeightInfo = weights::pallet_collective::WeightInfo;
} }
@@ -465,6 +466,7 @@ impl pallet_collective::Trait<TechnicalCollective> for Runtime {
type MotionDuration = TechnicalMotionDuration; type MotionDuration = TechnicalMotionDuration;
type MaxProposals = TechnicalMaxProposals; type MaxProposals = TechnicalMaxProposals;
type MaxMembers = TechnicalMaxMembers; type MaxMembers = TechnicalMaxMembers;
type DefaultVote = pallet_collective::PrimeDefaultVote;
type WeightInfo = weights::pallet_collective::WeightInfo; type WeightInfo = weights::pallet_collective::WeightInfo;
} }
+2
View File
@@ -470,6 +470,7 @@ impl pallet_collective::Trait<CouncilCollective> for Runtime {
type MotionDuration = CouncilMotionDuration; type MotionDuration = CouncilMotionDuration;
type MaxProposals = CouncilMaxProposals; type MaxProposals = CouncilMaxProposals;
type MaxMembers = CouncilMaxMembers; type MaxMembers = CouncilMaxMembers;
type DefaultVote = pallet_collective::PrimeDefaultVote;
type WeightInfo = weights::pallet_collective::WeightInfo; type WeightInfo = weights::pallet_collective::WeightInfo;
} }
@@ -518,6 +519,7 @@ impl pallet_collective::Trait<TechnicalCollective> for Runtime {
type MotionDuration = TechnicalMotionDuration; type MotionDuration = TechnicalMotionDuration;
type MaxProposals = TechnicalMaxProposals; type MaxProposals = TechnicalMaxProposals;
type MaxMembers = TechnicalMaxMembers; type MaxMembers = TechnicalMaxMembers;
type DefaultVote = pallet_collective::PrimeDefaultVote;
type WeightInfo = weights::pallet_collective::WeightInfo; type WeightInfo = weights::pallet_collective::WeightInfo;
} }