Self-Vote for Staking (among others.)

core/sr-std/src/lib.rs

@@ -45,6 +45,7 @@ pub mod prelude {
 	pub use crate::boxed::Box;
 	pub use crate::cmp::{Eq, PartialEq};
 	pub use crate::clone::Clone;
+	pub use crate::alloc::prelude::*;
 
 	// Re-export `vec!` macro here, but not in `std` mode, since
 	// std's prelude already brings `vec!` into the scope.

node/executor/src/lib.rs

@@ -443,13 +443,7 @@ mod tests {
 			]
 		);
 
-		// let mut digest = generic::Digest::<Log>::default();
-		// digest.push(Log::from(::grandpa::RawLog::AuthoritiesChangeSignal(0, vec![
-		// 	(Keyring::Charlie.to_raw_public().into(), 1),
-		// 	(Keyring::Bob.to_raw_public().into(), 1),
-		// 	(Keyring::Alice.to_raw_public().into(), 1),
-		// ])));
-		let digest = generic::Digest::<Log>::default(); // TODO test this
+		let digest = generic::Digest::<Log>::default();
 		assert_eq!(Header::decode(&mut &block2.0[..]).unwrap().digest, digest);
 
 		(block1, block2)
@@ -578,14 +572,6 @@ mod tests {
 					phase: Phase::Finalization,
 					event: Event::session(session::RawEvent::NewSession(1))
 				},
-				// EventRecord { // TODO: this might be wrong.
-				// 	phase: Phase::Finalization,
-				// 	event: Event::grandpa(::grandpa::RawEvent::NewAuthorities(vec![
-				// 		(Keyring::Charlie.to_raw_public().into(), 1),
-				// 		(Keyring::Bob.to_raw_public().into(), 1),
-				// 		(Keyring::Alice.to_raw_public().into(), 1),
-				// 	])),
-				// },
 				EventRecord {
 					phase: Phase::Finalization,
 					event: Event::treasury(treasury::RawEvent::Spending(0))

node/runtime/src/lib.rs

@@ -58,7 +58,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("node"),
 	impl_name: create_runtime_str!("substrate-node"),
 	authoring_version: 10,
-	spec_version: 38,
+	spec_version: 39,
 	impl_version: 39,
 	apis: RUNTIME_API_VERSIONS,
 };

srml/staking/src/mock.rs

@@ -84,12 +84,12 @@ pub struct ExtBuilder {
 	session_length: u64,
 	sessions_per_era: u64,
 	current_era: u64,
-	monied: bool,
 	reward: u64,
 	validator_pool: bool,
 	nominate: bool,
 	validator_count: u32,
 	minimum_validator_count: u32,
+	fare: bool,
 }
 
 impl Default for ExtBuilder {
@@ -99,12 +99,12 @@ impl Default for ExtBuilder {
 			session_length: 1,
 			sessions_per_era: 1,
 			current_era: 0,
-			monied: true,
 			reward: 10,
 			validator_pool: false,
 			nominate: true,
 			validator_count: 2,
 			minimum_validator_count: 0,
+			fare: true
 		}
 	}
 }
@@ -126,16 +126,7 @@ impl ExtBuilder {
 		self.current_era = current_era;
 		self
 	}
-	pub fn _monied(mut self, monied: bool) -> Self {
-		self.monied = monied;
-		self
-	}
-	pub fn reward(mut self, reward: u64) -> Self {
-		self.reward = reward;
-		self
-	}
 	pub fn validator_pool(mut self, validator_pool: bool) -> Self { 
-		// NOTE: this should only be set to true with monied = false.
 		self.validator_pool = validator_pool;
 		self
 	}
@@ -152,6 +143,10 @@ impl ExtBuilder {
 		self.minimum_validator_count = count;
 		self
 	}
+	pub fn fare(mut self, is_fare: bool) -> Self {
+		self.fare = is_fare;
+		self
+	}
 	pub fn build(self) -> runtime_io::TestExternalities<Blake2Hasher> {
 		let (mut t, mut c) = system::GenesisConfig::<Test>::default().build_storage().unwrap();
 		let balance_factor = if self.existential_deposit > 0 {
@@ -170,34 +165,22 @@ impl ExtBuilder {
 			keys: vec![],
 		}.assimilate_storage(&mut t, &mut c);
 		let _ = balances::GenesisConfig::<Test>{
-			balances: if self.monied {
-				if self.reward > 0 {
-					vec![
-						(1, 10 * balance_factor),
-						(2, 20 * balance_factor),
-						(3, 300 * balance_factor),
-						(4, 400 * balance_factor),
-						(10, balance_factor),
-						(11, balance_factor * 1000),
-						(20, balance_factor),
-						(21, balance_factor * 2000),
-						(100, 2000 * balance_factor),
-						(101, 2000 * balance_factor),
-					]
-				} else {
-					vec![
-						(1, 10 * balance_factor), (2, 20 * balance_factor),
-						(3, 300 * balance_factor), (4, 400 * balance_factor)
-					]
-				}
-			} else {
-				vec![
-					(10, balance_factor), (11, balance_factor * 10),
-					(20, balance_factor), (21, balance_factor * 20),
-					(30, balance_factor), (31, balance_factor * 30),
-					(40, balance_factor), (41, balance_factor * 40)
-				]
-			},
+			balances: vec![
+					(1, 10 * balance_factor),
+					(2, 20 * balance_factor),
+					(3, 300 * balance_factor),
+					(4, 400 * balance_factor),
+					(10, balance_factor),
+					(11, balance_factor * 1000),
+					(20, balance_factor),
+					(21, balance_factor * 2000),
+					(30, balance_factor),
+					(31, balance_factor * 2000),
+					(40, balance_factor),
+					(41, balance_factor * 2000),
+					(100, 2000 * balance_factor),
+					(101, 2000 * balance_factor),
+			],
 			transaction_base_fee: 0,
 			transaction_byte_fee: 0,
 			existential_deposit: self.existential_deposit,
@@ -211,16 +194,16 @@ impl ExtBuilder {
 			stakers: if self.validator_pool {
 				vec![
 					(11, 10, balance_factor * 1000, StakerStatus::<AccountIdType>::Validator),
-					(21, 20, balance_factor * 2000, StakerStatus::<AccountIdType>::Validator),
-					(31, 30, balance_factor * 3000, if self.validator_pool { StakerStatus::<AccountIdType>::Validator } else { StakerStatus::<AccountIdType>::Idle }),
-					(41, 40, balance_factor * 4000, if self.validator_pool { StakerStatus::<AccountIdType>::Validator } else { StakerStatus::<AccountIdType>::Idle }),
+					(21, 20, balance_factor * if self.fare { 1000 } else { 2000 }, StakerStatus::<AccountIdType>::Validator),
+					(31, 30, balance_factor * 1000, if self.validator_pool { StakerStatus::<AccountIdType>::Validator } else { StakerStatus::<AccountIdType>::Idle }),
+					(41, 40, balance_factor * 1000, if self.validator_pool { StakerStatus::<AccountIdType>::Validator } else { StakerStatus::<AccountIdType>::Idle }),
 					// nominator
 					(101, 100, balance_factor * 500, if self.nominate { StakerStatus::<AccountIdType>::Nominator(vec![10, 20]) } else { StakerStatus::<AccountIdType>::Nominator(vec![]) })
 				]
 			} else {
 				vec![
 					(11, 10, balance_factor * 1000, StakerStatus::<AccountIdType>::Validator),
-					(21, 20, balance_factor * 2000, StakerStatus::<AccountIdType>::Validator),
+					(21, 20, balance_factor * if self.fare { 1000 } else { 2000 }, StakerStatus::<AccountIdType>::Validator),
 					// nominator
 					(101, 100, balance_factor * 500, if self.nominate { StakerStatus::<AccountIdType>::Nominator(vec![10, 20]) } else { StakerStatus::<AccountIdType>::Nominator(vec![]) })
 				]
@@ -229,7 +212,7 @@ impl ExtBuilder {
 			minimum_validator_count: self.minimum_validator_count,
 			bonding_duration: self.sessions_per_era * self.session_length * 3,
 			session_reward: Perbill::from_millionths((1000000 * self.reward / balance_factor) as u32),
-			offline_slash: if self.monied { Perbill::from_percent(40) } else { Perbill::zero() },
+			offline_slash: Perbill::from_percent(40),
 			current_session_reward: self.reward,
 			current_offline_slash: 20,
 			offline_slash_grace: 0,