Fix grumbles.

substrate/runtime/session/src/lib.rs

@@ -64,7 +64,7 @@ impl<T> OnSessionChange<T> for () {
 }
 
 pub trait Trait: timestamp::Trait {
-	// the position of the required timestamp-set extrinsic.
+	// the position of the required note_missed_proposal extrinsic.
 	const NOTE_MISSED_PROPOSAL_POSITION: u32;
 
 	type ConvertAccountIdToSessionKey: Convert<Self::AccountId, Self::SessionKey>;
@@ -152,7 +152,7 @@ impl<T: Trait> Module<T> {
 		assert!(aux.is_empty());
 		assert!(
 			<system::Module<T>>::extrinsic_index() == T::NOTE_MISSED_PROPOSAL_POSITION,
-			"note_offline extrinsic must be at position {} in the block",
+			"note_missed_proposal extrinsic must be at position {} in the block",
 			T::NOTE_MISSED_PROPOSAL_POSITION
 		);
 

substrate/runtime/staking/Cargo.toml

@@ -10,6 +10,7 @@ serde_derive = { version = "1.0", optional = true }
 safe-mix = { version = "1.0", default_features = false}
 substrate-keyring = { path = "../../keyring", optional = true }
 substrate-codec = { path = "../../codec", default_features = false }
+substrate-codec-derive = { path = "../../codec/derive", default_features = false }
 substrate-primitives = { path = "../../primitives", default_features = false }
 substrate-runtime-std = { path = "../../runtime-std", default_features = false }
 substrate-runtime-io = { path = "../../runtime-io", default_features = false }
@@ -32,6 +33,7 @@ std = [
 	"safe-mix/std",
 	"substrate-keyring",
 	"substrate-codec/std",
+	"substrate-codec-derive/std",
 	"substrate-primitives/std",
 	"substrate-runtime-std/std",
 	"substrate-runtime-io/std",

substrate/runtime/staking/src/lib.rs

@@ -34,6 +34,9 @@ extern crate substrate_runtime_support as runtime_support;
 #[cfg_attr(feature = "std", macro_use)]
 extern crate substrate_runtime_std as rstd;
 
+#[macro_use]
+extern crate substrate_codec_derive;
+
 extern crate substrate_codec as codec;
 extern crate substrate_primitives;
 extern crate substrate_runtime_io as runtime_io;
@@ -102,26 +105,12 @@ impl<AccountId> OnAccountKill<AccountId> for () {
 
 /// Preference of what happens on a slash event.
 #[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))]
-#[derive(Eq, PartialEq, Clone, Copy)]
+#[derive(Encode, Decode, Eq, PartialEq, Clone, Copy)]
 pub struct SlashPreference {
 	/// Validator should ensure this many more slashes than is necessary before being unstaked.
 	pub unstake_threshold: u32,
 }
 
-impl Decode for SlashPreference {
-	fn decode<I: Input>(input: &mut I) -> Option<Self> {
-		Some(SlashPreference {
-			unstake_threshold: Decode::decode(input)?
-		})
-	}
-}
-
-impl Encode for SlashPreference {
-	fn encode_to<T: Output>(&self, dest: &mut T) {
-		self.unstake_threshold.encode_to(dest)
-	}
-}
-
 impl Default for SlashPreference {
 	fn default() -> Self {
 		SlashPreference {
@@ -549,8 +538,8 @@ impl<T: Trait> Module<T> {
 		Ok(())
 	}
 
-	/// Force there to be a new era. This also forces a new session immediately after by
-	/// setting `normal_rotation` to be false. Validators will get slashed.
+	/// Force there to be a new era. This also forces a new session immediately after.
+	/// `apply_rewards` should be true for validators to get the session reward.
 	fn force_new_era(apply_rewards: bool) -> Result {
 		<ForcingNewEra<T>>::put(());
 		<session::Module<T>>::force_new_session(apply_rewards)
@@ -853,7 +842,8 @@ impl<T: Trait> Module<T> {
 			.map(|v| (Self::slashable_balance(&v), v))
 			.collect::<Vec<_>>();
 
-		// Avoid making new era if it would leave us with fewer than the minimum needed validators
+		// Avoid reevaluate validator set if it would leave us with fewer than the minimum
+		// needed validators
 		if intentions.len() < Self::minimum_validator_count() {
 			return
 		}