Split put historical::FullValidatorIdentification trait

bin/node/runtime/src/lib.rs

@@ -402,10 +402,11 @@ parameter_types! {
 	pub const DisabledValidatorsThreshold: Perbill = Perbill::from_percent(17);
 }
 
-
 impl pallet_session::ValidatorIdentification<<Self as frame_system::Trait>::AccountId> for Runtime {
 	type ValidatorId = <Self as frame_system::Trait>::AccountId;
 	type ValidatorIdOf = pallet_staking::StashOf<Self>;
+}
+impl pallet_session::historical::FullValidatorIdentification<<Self as frame_system::Trait>::AccountId> for Runtime {
 	type FullIdentification = pallet_staking::Exposure<AccountId, Balance>;
 	type FullIdentificationOf = pallet_staking::ExposureOf<Runtime>;
 }
@@ -421,8 +422,6 @@ impl pallet_session::Trait for Runtime {
 	type WeightInfo = weights::pallet_session::WeightInfo<Runtime>;
 }
 
-impl pallet_session::historical::Trait for Runtime {}
-
 pallet_staking_reward_curve::build! {
 	const REWARD_CURVE: PiecewiseLinear<'static> = curve!(
 		min_inflation: 0_025_000,
@@ -772,7 +771,7 @@ parameter_types! {
 
 impl pallet_offences::Trait for Runtime {
 	type Event = Event;
-	type IdentificationTuple = pallet_session::IdentificationTuple<AccountId, Self>;
+	type IdentificationTuple = pallet_session::historical::IdentificationTuple<AccountId, Self>;
 	type OnOffenceHandler = Staking;
 	type WeightSoftLimit = OffencesWeightSoftLimit;
 }

frame/authority-discovery/src/lib.rs

@@ -116,6 +116,8 @@ mod tests {
 	impl pallet_session::ValidatorIdentification<AuthorityId> for Test {
 		type ValidatorId = AuthorityId;
 		type ValidatorIdOf = ConvertInto;
+	}
+	impl pallet_session::historical::FullValidatorIdentification<AuthorityId> for Test {
 		type FullIdentification = ();
 		type FullIdentificationOf = ();
 	}
@@ -131,8 +133,6 @@ mod tests {
 		type WeightInfo = ();
 	}
 
-	impl pallet_session::historical::Trait for Test {}
-
 	pub type BlockNumber = u64;
 
 	parameter_types! {

frame/babe/src/mock.rs

@@ -110,6 +110,8 @@ impl_opaque_keys! {
 impl pallet_session::ValidatorIdentification<DummyValidatorId> for Test {
 	type ValidatorId = <Self as frame_system::Trait>::AccountId;
 	type ValidatorIdOf = pallet_staking::StashOf<Self>;
+}
+impl pallet_session::historical::FullValidatorIdentification<DummyValidatorId> for Test {
 	type FullIdentification = pallet_staking::Exposure<u64, u128>;
 	type FullIdentificationOf = pallet_staking::ExposureOf<Self>;
 }
@@ -125,8 +127,6 @@ impl pallet_session::Trait for Test {
 	type WeightInfo = ();
 }
 
-impl pallet_session::historical::Trait for Test {}
-
 parameter_types! {
 	pub const UncleGenerations: u64 = 0;
 }
@@ -229,7 +229,7 @@ parameter_types! {
 
 impl pallet_offences::Trait for Test {
 	type Event = ();
-	type IdentificationTuple = pallet_session::IdentificationTuple<DummyValidatorId, Self>;
+	type IdentificationTuple = pallet_session::historical::IdentificationTuple<DummyValidatorId, Self>;
 	type OnOffenceHandler = Staking;
 	type WeightSoftLimit = OffencesWeightSoftLimit;
 }

frame/grandpa/src/mock.rs

@@ -124,6 +124,8 @@ parameter_types! {
 impl pallet_session::ValidatorIdentification<u64> for Test {
 	type ValidatorId = u64;
 	type ValidatorIdOf = pallet_staking::StashOf<Self>;
+}
+impl pallet_session::historical::FullValidatorIdentification<u64> for Test {
 	type FullIdentification = pallet_staking::Exposure<u64, u128>;
 	type FullIdentificationOf = pallet_staking::ExposureOf<Self>;
 }
@@ -140,8 +142,6 @@ impl pallet_session::Trait for Test {
 	type WeightInfo = ();
 }
 
-impl pallet_session::historical::Trait for Test {}
-
 parameter_types! {
 	pub const UncleGenerations: u64 = 0;
 }
@@ -244,7 +244,7 @@ parameter_types! {
 
 impl pallet_offences::Trait for Test {
 	type Event = TestEvent;
-	type IdentificationTuple = pallet_session::IdentificationTuple<u64, Self>;
+	type IdentificationTuple = pallet_session::historical::IdentificationTuple<u64, Self>;
 	type OnOffenceHandler = Staking;
 	type WeightSoftLimit = OffencesWeightSoftLimit;
 }

frame/im-online/src/lib.rs

@@ -103,7 +103,10 @@ use frame_system::offchain::{
 	SendTransactionTypes,
 	SubmitTransaction,
 };
-use pallet_session::{IdentificationTuple, ValidatorIdentification};
+use pallet_session::{
+	historical::{FullValidatorIdentification, IdentificationTuple},
+	ValidatorIdentification,
+};
 
 pub mod sr25519 {
 	mod app_sr25519 {
@@ -234,7 +237,7 @@ pub trait WeightInfo {
 
 pub trait Trait:
 	SendTransactionTypes<Call<Self>>
-	+ ValidatorIdentification<<Self as frame_system::Trait>::AccountId>
+	+ FullValidatorIdentification<<Self as frame_system::Trait>::AccountId>
 	+ frame_system::Trait
 {
 	/// The identifier type for an authority.
@@ -671,7 +674,7 @@ impl<T: Trait> pallet_session::OneSessionHandler<T::AccountId> for Module<T> {
 			.filter(|(index, id)|
 				!Self::is_online_aux(*index as u32, id)
 			).filter_map(|(_, id)|
-				<T as ValidatorIdentification<T::AccountId>>::FullIdentificationOf::convert(id.clone()).map(|full_id| (id, full_id))
+				<T as FullValidatorIdentification<T::AccountId>>::FullIdentificationOf::convert(id.clone()).map(|full_id| (id, full_id))
 			).collect::<Vec<IdentificationTuple<T::AccountId, T>>>();
 
 		// Remove all received heartbeats and number of authored blocks from the

frame/im-online/src/mock.rs

@@ -149,6 +149,8 @@ parameter_types! {
 impl pallet_session::ValidatorIdentification<u64> for Runtime {
 	type ValidatorId = u64;
 	type ValidatorIdOf = ConvertInto;
+}
+impl pallet_session::historical::FullValidatorIdentification<u64> for Runtime {
 	type FullIdentification = u64;
 	type FullIdentificationOf = ConvertInto;
 }
@@ -164,8 +166,6 @@ impl pallet_session::Trait for Runtime {
 	type WeightInfo = ();
 }
 
-impl pallet_session::historical::Trait for Runtime {}
-
 parameter_types! {
 	pub const UncleGenerations: u32 = 5;
 }

frame/offences/benchmarking/src/lib.rs

@@ -37,7 +37,10 @@ use pallet_grandpa::{GrandpaEquivocationOffence, GrandpaTimeSlot};
 use pallet_im_online::{Trait as ImOnlineTrait, Module as ImOnline, UnresponsivenessOffence};
 use pallet_offences::{Trait as OffencesTrait, Module as Offences};
 use pallet_session::historical::{Trait as HistoricalTrait};
-use pallet_session::{Trait as SessionTrait, SessionManager, IdentificationTuple, ValidatorIdentification};
+use pallet_session::{
+	Trait as SessionTrait, SessionManager, ValidatorIdentification,
+	historical::{IdentificationTuple, FullValidatorIdentification},
+};
 use pallet_staking::{
 	Module as Staking, Trait as StakingTrait, RewardDestination, ValidatorPrefs,
 	Exposure, IndividualExposure, ElectionStatus, MAX_NOMINATIONS, Event as StakingEvent
@@ -170,7 +173,7 @@ fn make_offenders<T: Trait>(num_offenders: u32, num_nominators: u32) -> Result<
 	let validator_id_of =
 		<T as ValidatorIdentification<<T as frame_system::Trait>::AccountId>>::ValidatorIdOf::convert;
 	let full_identification_of =
-		<T as ValidatorIdentification<<T as frame_system::Trait>::AccountId>>::FullIdentificationOf::convert;
+		<T as FullValidatorIdentification<<T as frame_system::Trait>::AccountId>>::FullIdentificationOf::convert;
 
 	let id_tuples = offenders.iter()
 		.map(|offender| validator_id_of(offender.controller.clone())

frame/offences/benchmarking/src/mock.rs

@@ -93,10 +93,11 @@ impl pallet_timestamp::Trait for Test {
 impl pallet_session::ValidatorIdentification<AccountId> for Test {
 	type ValidatorId = AccountId;
 	type ValidatorIdOf = pallet_staking::StashOf<Test>;
+}
+impl pallet_session::historical::FullValidatorIdentification<AccountId> for Test {
 	type FullIdentification = pallet_staking::Exposure<AccountId, Balance>;
 	type FullIdentificationOf = pallet_staking::ExposureOf<Test>;
 }
-impl pallet_session::historical::Trait for Test {}
 
 sp_runtime::impl_opaque_keys! {
 	pub struct SessionKeys {
@@ -203,7 +204,7 @@ parameter_types! {
 
 impl pallet_offences::Trait for Test {
 	type Event = Event;
-	type IdentificationTuple = pallet_session::IdentificationTuple<AccountId, Self>;
+	type IdentificationTuple = pallet_session::historical::IdentificationTuple<AccountId, Self>;
 	type OnOffenceHandler = Staking;
 	type WeightSoftLimit = OffencesWeightSoftLimit;
 }

frame/session/benchmarking/src/mock.rs

@@ -109,10 +109,11 @@ impl pallet_timestamp::Trait for Test {
 impl pallet_session::ValidatorIdentification<AccountId> for Test {
 	type ValidatorId = AccountId;
 	type ValidatorIdOf = pallet_staking::StashOf<Test>;
+}
+impl pallet_session::historical::FullValidatorIdentification<AccountId> for Test {
 	type FullIdentification = pallet_staking::Exposure<AccountId, Balance>;
 	type FullIdentificationOf = pallet_staking::ExposureOf<Test>;
 }
-impl pallet_session::historical::Trait for Test {}
 
 sp_runtime::impl_opaque_keys! {
 	pub struct SessionKeys {

frame/session/src/historical/mod.rs

@@ -31,18 +31,40 @@ use codec::{Encode, Decode};
 use sp_runtime::KeyTypeId;
 use sp_runtime::traits::{Convert, OpaqueKeys};
 use sp_session::{MembershipProof, ValidatorCount};
-use frame_support::{decl_module, decl_storage};
+use frame_support::{decl_module, decl_storage, Parameter};
 use frame_support::print;
 use sp_trie::{MemoryDB, Trie, TrieMut, Recorder, EMPTY_PREFIX};
 use sp_trie::trie_types::{TrieDBMut, TrieDB};
-use super::{SessionIndex, Module as SessionModule, IdentificationTuple};
+use super::{SessionIndex, Module as SessionModule, ValidatorIdentification};
 
 mod shared;
 pub mod offchain;
 pub mod onchain;
 
+pub trait FullValidatorIdentification<AccountId>: ValidatorIdentification<AccountId> {
+	/// Full identification of the validator.
+	type FullIdentification: Parameter;
+
+	/// A conversion from validator ID to full identification.
+	///
+	/// This should contain any references to economic actors associated with the
+	/// validator, since they may be outdated by the time this is queried from a
+	/// historical trie.
+	///
+	/// It must return the identification for the current session index.
+	type FullIdentificationOf: Convert<Self::ValidatorId, Option<Self::FullIdentification>>;
+}
+
+/// A tuple of the validator's ID and their full identification.
+pub type IdentificationTuple<AccountId, T> = (
+	<T as ValidatorIdentification<AccountId>>::ValidatorId,
+	<T as FullValidatorIdentification<AccountId>>::FullIdentification
+);
+
 /// Trait necessary for the historical module.
-pub trait Trait: super::Trait {}
+pub trait Trait: FullValidatorIdentification<<Self as frame_system::Trait>::AccountId> + super::Trait {}
+
+impl<T: FullValidatorIdentification<<Self as frame_system::Trait>::AccountId> + super::Trait> Trait for T {}
 
 decl_storage! {
 	trait Store for Module<T: Trait> as Session {

frame/session/src/historical/offchain.rs

@@ -193,7 +193,7 @@ mod tests {
 
 		let sample = (
 				22u32 as <Test as ValidatorIdentification<u64>>::ValidatorId,
-				7_777_777 as <Test as ValidatorIdentification<u64>>::FullIdentification);
+				7_777_777 as <Test as crate::historical::FullValidatorIdentification<u64>>::FullIdentification);
 
 		let encoded = sample.encode();
 		let decoded = Decode::decode(&mut encoded.as_slice()).expect("Must decode");

frame/session/src/historical/onchain.rs

@@ -22,7 +22,7 @@ use sp_runtime::traits::Convert;
 
 use super::super::Trait as SessionTrait;
 use super::super::{Module as SessionModule, SessionIndex, ValidatorIdentification};
-use super::Trait as HistoricalTrait;
+use super::{Trait as HistoricalTrait, FullValidatorIdentification};
 
 use super::shared;
 use sp_std::prelude::*;
@@ -42,7 +42,7 @@ pub fn store_session_validator_set_to_offchain<T: HistoricalTrait + SessionTrait
 		.into_iter()
 		.filter_map(|validator_id: <T as ValidatorIdentification<T::AccountId>>::ValidatorId| {
 			let full_identification =
-				<<T as ValidatorIdentification<T::AccountId>>::FullIdentificationOf>::convert(validator_id.clone());
+				<<T as FullValidatorIdentification<T::AccountId>>::FullIdentificationOf>::convert(validator_id.clone());
 			full_identification.map(|full_identification| (validator_id, full_identification))
 		})
 		.collect::<Vec<_>>();

frame/session/src/lib.rs

@@ -133,26 +133,8 @@ pub trait ValidatorIdentification<AccountId> {
 	///
 	/// Its cost must be at most one storage read.
 	type ValidatorIdOf: Convert<AccountId, Option<Self::ValidatorId>>;
-
-	/// Full identification of the validator.
-	type FullIdentification: Parameter;
-
-	/// A conversion from validator ID to full identification.
-	///
-	/// This should contain any references to economic actors associated with the
-	/// validator, since they may be outdated by the time this is queried from a
-	/// historical trie.
-	///
-	/// It must return the identification for the current session index.
-	type FullIdentificationOf: Convert<Self::ValidatorId, Option<Self::FullIdentification>>;
 }
 
-/// A tuple of the validator's ID and their full identification.
-pub type IdentificationTuple<AccountId, T> = (
-	<T as ValidatorIdentification<AccountId>>::ValidatorId,
-	<T as ValidatorIdentification<AccountId>>::FullIdentification
-);
-
 /// Decides whether the session should be ended.
 pub trait ShouldEndSession<BlockNumber> {
 	/// Return `true` if the session should be ended.

frame/session/src/mock.rs

@@ -214,6 +214,8 @@ parameter_types! {
 impl crate::ValidatorIdentification<u64> for Test {
 	type ValidatorId = u64;
 	type ValidatorIdOf = ConvertInto;
+}
+impl crate::historical::FullValidatorIdentification<u64> for Test {
 	type FullIdentification = u64;
 	type FullIdentificationOf = sp_runtime::traits::ConvertInto;
 }
@@ -232,8 +234,5 @@ impl Trait for Test {
 	type WeightInfo = ();
 }
 
-#[cfg(feature = "historical")]
-impl crate::historical::Trait for Test {}
-
 pub type System = frame_system::Module<Test>;
 pub type Session = Module<Test>;

frame/staking/fuzzer/src/mock.rs

@@ -111,11 +111,13 @@ impl pallet_timestamp::Trait for Test {
 	type MinimumPeriod = MinimumPeriod;
 	type WeightInfo = ();
 }
-impl pallet_session::historical::Trait for Test {}
 
 impl pallet_session::ValidatorIdentification<<Self as frame_system::Trait>::AccountId> for Test {
 	type ValidatorId = AccountId;
 	type ValidatorIdOf = pallet_staking::StashOf<Test>;
+}
+
+impl pallet_session::historical::FullValidatorIdentification<<Self as frame_system::Trait>::AccountId> for Test {
 	type FullIdentification = pallet_staking::Exposure<AccountId, Balance>;
 	type FullIdentificationOf = pallet_staking::ExposureOf<Test>;
 }

frame/staking/src/lib.rs

@@ -3177,7 +3177,7 @@ impl<T: Trait> Convert<T::AccountId, Option<Exposure<T::AccountId, BalanceOf<T>>
 impl <T: Trait>
 	OnOffenceHandler<
 		T::AccountId,
-		pallet_session::IdentificationTuple<<T as frame_system::Trait>::AccountId, T>,
+		pallet_session::historical::IdentificationTuple<<T as frame_system::Trait>::AccountId, T>,
 		Weight,
 	>
 for Module<T> where
@@ -3196,7 +3196,7 @@ for Module<T> where
 	fn on_offence(
 		offenders: &[OffenceDetails<
 			T::AccountId,
-			pallet_session::IdentificationTuple<<T as frame_system::Trait>::AccountId, T>>
+			pallet_session::historical::IdentificationTuple<<T as frame_system::Trait>::AccountId, T>>
 		],
 		slash_fraction: &[Perbill],
 		slash_session: SessionIndex,

frame/staking/src/mock.rs

@@ -249,6 +249,8 @@ sp_runtime::impl_opaque_keys! {
 impl pallet_session::ValidatorIdentification<AccountId> for Test {
 	type ValidatorId = AccountId;
 	type ValidatorIdOf = crate::StashOf<Test>;
+}
+impl pallet_session::historical::FullValidatorIdentification<AccountId> for Test {
 	type FullIdentification = crate::Exposure<AccountId, Balance>;
 	type FullIdentificationOf = crate::ExposureOf<Test>;
 }
@@ -264,7 +266,6 @@ impl pallet_session::Trait for Test {
 	type WeightInfo = ();
 }
 
-impl pallet_session::historical::Trait for Test {}
 impl pallet_authorship::Trait for Test {
 	type FindAuthor = Author11;
 	type UncleGenerations = UncleGenerations;
@@ -742,7 +743,7 @@ pub(crate) fn validator_controllers() -> Vec<AccountId> {
 pub(crate) fn on_offence_in_era(
 	offenders: &[OffenceDetails<
 		AccountId,
-		pallet_session::IdentificationTuple<AccountId, Test>,
+		pallet_session::historical::IdentificationTuple<AccountId, Test>,
 	>],
 	slash_fraction: &[Perbill],
 	era: EraIndex,
@@ -770,7 +771,7 @@ pub(crate) fn on_offence_in_era(
 }
 
 pub(crate) fn on_offence_now(
-	offenders: &[OffenceDetails<AccountId, pallet_session::IdentificationTuple<AccountId, Test>>],
+	offenders: &[OffenceDetails<AccountId, pallet_session::historical::IdentificationTuple<AccountId, Test>>],
 	slash_fraction: &[Perbill],
 ) {
 	let now = Staking::active_era().unwrap().index;

frame/staking/src/tests.rs

@@ -4578,7 +4578,7 @@ fn offences_weight_calculated_correctly() {
 
 		let offenders: Vec<OffenceDetails<
 						<Test as frame_system::Trait>::AccountId,
-						pallet_session::IdentificationTuple<<Test as frame_system::Trait>::AccountId, Test>,
+						pallet_session::historical::IdentificationTuple<<Test as frame_system::Trait>::AccountId, Test>,
 					>>
 			= (1..10).map(|i|
 				OffenceDetails {