Fix Staking and Democracy locking (#3606)

* Fix locking.

* Some reformattings.

* Fix build.

* Fix doc comment.

* Bump.

substrate/node/runtime/src/lib.rs

@@ -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;

substrate/srml/elections/src/mock.rs

@@ -0,0 +1,294 @@
+// Copyright 2019 Parity Technologies (UK) Ltd.
+// This file is part of Substrate.
+
+// Substrate is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Substrate is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Mock file for election module.
+
+#![cfg(test)]
+
+use std::cell::RefCell;
+use support::{
+	StorageValue, StorageMap, parameter_types, assert_ok,
+	traits::{Get, ChangeMembers, Currency}
+};
+use runtime_io::with_externalities;
+use primitives::{H256, Blake2Hasher};
+use sr_primitives::{
+	Perbill, BuildStorage,
+	testing::Header,
+	traits::{BlakeTwo256, IdentityLookup, Block as BlockT},
+};
+use crate as elections;
+
+
+parameter_types! {
+	pub const BlockHashCount: u64 = 250;
+	pub const MaximumBlockWeight: u32 = 1024;
+	pub const MaximumBlockLength: u32 = 2 * 1024;
+	pub const AvailableBlockRatio: Perbill = Perbill::one();
+}
+impl system::Trait for Test {
+	type Origin = Origin;
+	type Index = u64;
+	type BlockNumber = u64;
+	type Call = ();
+	type Hash = H256;
+	type Hashing = BlakeTwo256;
+	type AccountId = u64;
+	type Lookup = IdentityLookup<Self::AccountId>;
+	type Header = Header;
+	type Event = Event;
+	type WeightMultiplierUpdate = ();
+	type BlockHashCount = BlockHashCount;
+	type MaximumBlockWeight = MaximumBlockWeight;
+	type MaximumBlockLength = MaximumBlockLength;
+	type AvailableBlockRatio = AvailableBlockRatio;
+	type Version = ();
+}
+
+parameter_types! {
+	pub const ExistentialDeposit: u64 = 0;
+	pub const TransferFee: u64 = 0;
+	pub const CreationFee: u64 = 0;
+	pub const TransactionBaseFee: u64 = 0;
+	pub const TransactionByteFee: u64 = 0;
+}
+impl balances::Trait for Test {
+	type Balance = u64;
+	type OnNewAccount = ();
+	type OnFreeBalanceZero = ();
+	type Event = Event;
+	type TransactionPayment = ();
+	type TransferPayment = ();
+	type DustRemoval = ();
+	type ExistentialDeposit = ExistentialDeposit;
+	type TransferFee = TransferFee;
+	type CreationFee = CreationFee;
+	type TransactionBaseFee = TransactionBaseFee;
+	type TransactionByteFee = TransactionByteFee;
+	type WeightToFee = ();
+}
+
+parameter_types! {
+	pub const CandidacyBond: u64 = 3;
+	pub const CarryCount: u32 = 2;
+	pub const InactiveGracePeriod: u32 = 1;
+	pub const VotingPeriod: u64 = 4;
+	pub const MinimumVotingLock: u64 = 5;
+}
+
+thread_local! {
+	static VOTER_BOND: RefCell<u64> = RefCell::new(0);
+	static VOTING_FEE: RefCell<u64> = RefCell::new(0);
+	static PRESENT_SLASH_PER_VOTER: RefCell<u64> = RefCell::new(0);
+	static DECAY_RATIO: RefCell<u32> = RefCell::new(0);
+	static MEMBERS: RefCell<Vec<u64>> = RefCell::new(vec![]);
+}
+
+pub struct VotingBond;
+impl Get<u64> for VotingBond {
+	fn get() -> u64 { VOTER_BOND.with(|v| *v.borrow()) }
+}
+
+pub struct VotingFee;
+impl Get<u64> for VotingFee {
+	fn get() -> u64 { VOTING_FEE.with(|v| *v.borrow()) }
+}
+
+pub struct PresentSlashPerVoter;
+impl Get<u64> for PresentSlashPerVoter {
+	fn get() -> u64 { PRESENT_SLASH_PER_VOTER.with(|v| *v.borrow()) }
+}
+
+pub struct DecayRatio;
+impl Get<u32> for DecayRatio {
+	fn get() -> u32 { DECAY_RATIO.with(|v| *v.borrow()) }
+}
+
+pub struct TestChangeMembers;
+impl ChangeMembers<u64> for TestChangeMembers {
+	fn change_members_sorted(incoming: &[u64], outgoing: &[u64], new: &[u64]) {
+		let mut old_plus_incoming = MEMBERS.with(|m| m.borrow().to_vec());
+		old_plus_incoming.extend_from_slice(incoming);
+		old_plus_incoming.sort();
+		let mut new_plus_outgoing = new.to_vec();
+		new_plus_outgoing.extend_from_slice(outgoing);
+		new_plus_outgoing.sort();
+		assert_eq!(old_plus_incoming, new_plus_outgoing);
+
+		MEMBERS.with(|m| *m.borrow_mut() = new.to_vec());
+	}
+}
+
+impl elections::Trait for Test {
+	type Event = Event;
+	type Currency = Balances;
+	type BadPresentation = ();
+	type BadReaper = ();
+	type BadVoterIndex = ();
+	type LoserCandidate = ();
+	type ChangeMembers = TestChangeMembers;
+	type CandidacyBond = CandidacyBond;
+	type VotingBond = VotingBond;
+	type VotingFee = VotingFee;
+	type MinimumVotingLock = MinimumVotingLock;
+	type PresentSlashPerVoter = PresentSlashPerVoter;
+	type CarryCount = CarryCount;
+	type InactiveGracePeriod = InactiveGracePeriod;
+	type VotingPeriod = VotingPeriod;
+	type DecayRatio = DecayRatio;
+}
+
+pub type Block = sr_primitives::generic::Block<Header, UncheckedExtrinsic>;
+pub type UncheckedExtrinsic = sr_primitives::generic::UncheckedExtrinsic<u32, u64, Call, ()>;
+
+support::construct_runtime!(
+	pub enum Test where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic
+	{
+		System: system::{Module, Call, Event},
+		Balances: balances::{Module, Call, Event<T>, Config<T>, Error},
+		Elections: elections::{Module, Call, Event<T>, Config<T>},
+	}
+);
+
+pub struct ExtBuilder {
+	balance_factor: u64,
+	decay_ratio: u32,
+	desired_seats: u32,
+	voting_fee: u64,
+	voter_bond: u64,
+	bad_presentation_punishment: u64,
+}
+
+impl Default for ExtBuilder {
+	fn default() -> Self {
+		Self {
+			balance_factor: 1,
+			decay_ratio: 24,
+			desired_seats: 2,
+			voting_fee: 0,
+			voter_bond: 0,
+			bad_presentation_punishment: 1,
+		}
+	}
+}
+
+impl ExtBuilder {
+	pub fn balance_factor(mut self, factor: u64) -> Self {
+		self.balance_factor = factor;
+		self
+	}
+	pub fn decay_ratio(mut self, ratio: u32) -> Self {
+		self.decay_ratio = ratio;
+		self
+	}
+	pub fn voting_fee(mut self, fee: u64) -> Self {
+		self.voting_fee = fee;
+		self
+	}
+	pub fn bad_presentation_punishment(mut self, fee: u64) -> Self {
+		self.bad_presentation_punishment = fee;
+		self
+	}
+	pub fn voter_bond(mut self, fee: u64) -> Self {
+		self.voter_bond = fee;
+		self
+	}
+	pub fn desired_seats(mut self, seats: u32) -> Self {
+		self.desired_seats = seats;
+		self
+	}
+	pub fn build(self) -> runtime_io::TestExternalities<Blake2Hasher> {
+		VOTER_BOND.with(|v| *v.borrow_mut() = self.voter_bond);
+		VOTING_FEE.with(|v| *v.borrow_mut() = self.voting_fee);
+		PRESENT_SLASH_PER_VOTER.with(|v| *v.borrow_mut() = self.bad_presentation_punishment);
+		DECAY_RATIO.with(|v| *v.borrow_mut() = self.decay_ratio);
+		GenesisConfig {
+			balances: Some(balances::GenesisConfig::<Test>{
+				balances: vec![
+					(1, 10 * self.balance_factor),
+					(2, 20 * self.balance_factor),
+					(3, 30 * self.balance_factor),
+					(4, 40 * self.balance_factor),
+					(5, 50 * self.balance_factor),
+					(6, 60 * self.balance_factor)
+				],
+				vesting: vec![],
+			}),
+			elections: Some(elections::GenesisConfig::<Test>{
+				members: vec![],
+				desired_seats: self.desired_seats,
+				presentation_duration: 2,
+				term_duration: 5,
+			}),
+		}.build_storage().unwrap().into()
+	}
+}
+
+pub(crate) fn voter_ids() -> Vec<u64> {
+	Elections::all_voters().iter().map(|v| v.unwrap_or(0) ).collect::<Vec<u64>>()
+}
+
+pub(crate) fn vote(i: u64, l: usize) {
+	let _ = Balances::make_free_balance_be(&i, 20);
+	assert_ok!(
+		Elections::set_approvals(
+			Origin::signed(i),
+			(0..l).map(|_| true).collect::<Vec<bool>>(),
+			0,
+			0,
+			20,
+		)
+	);
+}
+
+pub(crate) fn vote_at(i: u64, l: usize, index: elections::VoteIndex) {
+	let _ = Balances::make_free_balance_be(&i, 20);
+	assert_ok!(
+		Elections::set_approvals(
+			Origin::signed(i),
+			(0..l).map(|_| true).collect::<Vec<bool>>(),
+			0,
+			index,
+			20,
+		)
+	);
+}
+
+pub(crate) fn create_candidate(i: u64, index: u32) {
+	let _ = Balances::make_free_balance_be(&i, 20);
+	assert_ok!(Elections::submit_candidacy(Origin::signed(i), index));
+}
+
+pub(crate) fn balances(who: &u64) -> (u64, u64) {
+	(Balances::free_balance(who), Balances::reserved_balance(who))
+}
+
+pub(crate) fn locks(who: &u64) -> Vec<u64> {
+	Balances::locks(who).iter().map(|l| l.amount).collect::<Vec<u64>>()
+}
+
+pub(crate) fn new_test_ext_with_candidate_holes() -> runtime_io::TestExternalities<Blake2Hasher> {
+	let mut t = ExtBuilder::default().build();
+	with_externalities(&mut t, || {
+		<elections::Candidates<Test>>::put(vec![0, 0, 1]);
+		elections::CandidateCount::put(1);
+		<elections::RegisterInfoOf<Test>>::insert(1, (0, 2));
+	});
+	t
+}

substrate/srml/im-online/src/lib.rs

@@ -67,7 +67,7 @@
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use app_crypto::{AppPublic, RuntimeAppPublic, AppSignature};
+use app_crypto::{AppPublic, RuntimeAppPublic};
 use codec::{Encode, Decode};
 use primitives::offchain::{OpaqueNetworkState, StorageKind};
 use rstd::prelude::*;

substrate/srml/staking/src/lib.rs

@@ -257,7 +257,7 @@ use support::{
 	StorageValue, StorageMap, StorageLinkedMap, decl_module, decl_event,
 	decl_storage, ensure, traits::{
 		Currency, OnFreeBalanceZero, OnDilution, LockIdentifier, LockableCurrency,
-		WithdrawReasons, WithdrawReason, OnUnbalanced, Imbalance, Get, Time
+		WithdrawReasons, OnUnbalanced, Imbalance, Get, Time
 	}
 };
 use session::{historical::OnSessionEnding, SelectInitialValidators};
@@ -1013,7 +1013,7 @@ impl<T: Trait> Module<T> {
 			&ledger.stash,
 			ledger.total,
 			T::BlockNumber::max_value(),
-			WithdrawReasons::except(WithdrawReason::TransactionPayment),
+			WithdrawReasons::all(),
 		);
 		<Ledger<T>>::insert(controller, ledger);
 	}