Fix Staking and Democracy locking (#3606)

* Fix locking.

* Some reformattings.

* Fix build.

* Fix doc comment.

* Bump.
This commit is contained in:
Kian Paimani
2019-09-13 08:52:52 +02:00
committed by GitHub
parent a6b5d1d155
commit a7f35680b4
6 changed files with 2091 additions and 1886 deletions
+3 -1
View File
@@ -83,7 +83,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
// implementation changes and behavior does not, then leave spec_version as
// is and increment impl_version.
spec_version: 157,
impl_version: 157,
impl_version: 158,
apis: RUNTIME_API_VERSIONS,
};
@@ -293,6 +293,7 @@ parameter_types! {
pub const CandidacyBond: Balance = 10 * DOLLARS;
pub const VotingBond: Balance = 1 * DOLLARS;
pub const VotingFee: Balance = 2 * DOLLARS;
pub const MinimumVotingLock: Balance = 1 * DOLLARS;
pub const PresentSlashPerVoter: Balance = 1 * CENTS;
pub const CarryCount: u32 = 6;
// one additional vote should go by before an inactive voter can be reaped.
@@ -312,6 +313,7 @@ impl elections::Trait for Runtime {
type CandidacyBond = CandidacyBond;
type VotingBond = VotingBond;
type VotingFee = VotingFee;
type MinimumVotingLock = MinimumVotingLock;
type PresentSlashPerVoter = PresentSlashPerVoter;
type CarryCount = CarryCount;
type InactiveGracePeriod = InactiveGracePeriod;