Avoid using frame dep in primitives via pallet-session-common

Cargo.toml

@@ -95,6 +95,7 @@ members = [
 	"frame/scored-pool",
 	"frame/session",
 	"frame/session/benchmarking",
+	"frame/session/common",
 	"frame/society",
 	"frame/staking",
 	"frame/staking/reward-curve",

bin/node/runtime/src/lib.rs

@@ -403,7 +403,7 @@ parameter_types! {
 }
 
 
-impl sp_session::ValidatorIdentification<<Self as frame_system::Trait>::AccountId> for Runtime {
+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>;
 	type FullIdentification = pallet_staking::Exposure<AccountId, Balance>;
@@ -757,8 +757,8 @@ impl<C> frame_system::offchain::SendTransactionTypes<C> for Runtime where
 	type OverarchingCall = Call;
 }
 
-impl pallet_im_online::ValidatorSet<<Self as sp_session::ValidatorIdentification<<Self as frame_system::Trait>::AccountId>>::ValidatorId> for Runtime {
-	fn validators() -> Vec<<Self as sp_session::ValidatorIdentification<<Self as frame_system::Trait>::AccountId>>::ValidatorId> {
+impl pallet_im_online::ValidatorSet<<Self as pallet_session::ValidatorIdentification<<Self as frame_system::Trait>::AccountId>>::ValidatorId> for Runtime {
+	fn validators() -> Vec<<Self as pallet_session::ValidatorIdentification<<Self as frame_system::Trait>::AccountId>>::ValidatorId> {
 		Session::validators()
 	}
 }
@@ -786,7 +786,7 @@ parameter_types! {
 
 impl pallet_offences::Trait for Runtime {
 	type Event = Event;
-	type IdentificationTuple = sp_session::IdentificationTuple<<Self as frame_system::Trait>::AccountId, Self>;
+	type IdentificationTuple = pallet_session::IdentificationTuple<<Self as frame_system::Trait>::AccountId, Self>;
 	type OnOffenceHandler = Staking;
 	type WeightSoftLimit = OffencesWeightSoftLimit;
 }

frame/authority-discovery/src/lib.rs

@@ -113,7 +113,7 @@ mod tests {
 		pub const DisabledValidatorsThreshold: Perbill = Perbill::from_percent(33);
 	}
 
-	impl sp_session::ValidatorIdentification<AuthorityId> for Test {
+	impl pallet_session::ValidatorIdentification<AuthorityId> for Test {
 		type ValidatorId = AuthorityId;
 		type ValidatorIdOf = ConvertInto;
 		type FullIdentification = ();

frame/babe/src/mock.rs

@@ -107,7 +107,7 @@ impl_opaque_keys! {
 	}
 }
 
-impl sp_session::ValidatorIdentification<DummyValidatorId> for Test {
+impl pallet_session::ValidatorIdentification<DummyValidatorId> for Test {
 	type ValidatorId = <Self as frame_system::Trait>::AccountId;
 	type ValidatorIdOf = pallet_staking::StashOf<Self>;
 	type FullIdentification = pallet_staking::Exposure<u64, u128>;
@@ -229,7 +229,7 @@ parameter_types! {
 
 impl pallet_offences::Trait for Test {
 	type Event = ();
-	type IdentificationTuple = sp_session::IdentificationTuple<DummyValidatorId, Self>;
+	type IdentificationTuple = pallet_session::IdentificationTuple<DummyValidatorId, Self>;
 	type OnOffenceHandler = Staking;
 	type WeightSoftLimit = OffencesWeightSoftLimit;
 }

frame/grandpa/src/mock.rs

@@ -121,7 +121,7 @@ parameter_types! {
 	pub const DisabledValidatorsThreshold: Perbill = Perbill::from_percent(17);
 }
 
-impl sp_session::ValidatorIdentification<u64> for Test {
+impl pallet_session::ValidatorIdentification<u64> for Test {
 	type ValidatorId = u64;
 	type ValidatorIdOf = pallet_staking::StashOf<Self>;
 	type FullIdentification = pallet_staking::Exposure<u64, u128>;
@@ -244,7 +244,7 @@ parameter_types! {
 
 impl pallet_offences::Trait for Test {
 	type Event = TestEvent;
-	type IdentificationTuple = sp_session::IdentificationTuple<u64, Self>;
+	type IdentificationTuple = pallet_session::IdentificationTuple<u64, Self>;
 	type OnOffenceHandler = Staking;
 	type WeightSoftLimit = OffencesWeightSoftLimit;
 }

frame/im-online/Cargo.toml

@@ -26,6 +26,7 @@ sp-runtime = { version = "2.0.0", default-features = false, path = "../../primit
 sp-staking = { version = "2.0.0", default-features = false, path = "../../primitives/staking" }
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
 frame-system = { version = "2.0.0", default-features = false, path = "../system" }
+pallet-session-common = { version = "2.0.0", default-features = false, path = "../session/common" }
 
 frame-benchmarking = { version = "2.0.0", default-features = false, path = "../benchmarking", optional = true }
 
@@ -45,5 +46,6 @@ std = [
 	"sp-staking/std",
 	"frame-support/std",
 	"frame-system/std",
+	"pallet-session-common/std",
 ]
 runtime-benchmarks = ["frame-benchmarking"]

frame/im-online/src/lib.rs

@@ -79,7 +79,6 @@ use codec::{Encode, Decode};
 use sp_core::offchain::OpaqueNetworkState;
 use sp_std::prelude::*;
 use sp_std::convert::TryInto;
-use sp_session::{IdentificationTuple, ValidatorIdentification};
 use sp_runtime::{
 	offchain::storage::StorageValueRef,
 	RuntimeDebug,
@@ -103,6 +102,7 @@ use frame_system::offchain::{
 	SendTransactionTypes,
 	SubmitTransaction,
 };
+use pallet_session_common::{IdentificationTuple, ValidatorIdentification};
 
 pub mod sr25519 {
 	mod app_sr25519 {

frame/im-online/src/mock.rs

@@ -28,7 +28,7 @@ use sp_runtime::testing::{Header, UintAuthorityId, TestXt};
 use sp_runtime::traits::{IdentityLookup, BlakeTwo256, ConvertInto};
 use sp_core::H256;
 use frame_support::{impl_outer_origin, impl_outer_dispatch, parameter_types, weights::Weight};
-use sp_session::ValidatorIdentification;
+use pallet_session::ValidatorIdentification;
 
 impl_outer_origin!{
 	pub enum Origin for Runtime {}
@@ -147,7 +147,7 @@ parameter_types! {
 	pub const DisabledValidatorsThreshold: Perbill = Perbill::from_percent(33);
 }
 
-impl sp_session::ValidatorIdentification<u64> for Runtime {
+impl pallet_session::ValidatorIdentification<u64> for Runtime {
 	type ValidatorId = u64;
 	type ValidatorIdOf = ConvertInto;
 	type FullIdentification = u64;

frame/offences/benchmarking/src/lib.rs

@@ -30,15 +30,14 @@ use frame_support::traits::{Currency, OnInitialize};
 
 use sp_runtime::{Perbill, traits::{Convert, StaticLookup, Saturating, UniqueSaturatedInto}};
 use sp_staking::offence::{ReportOffence, Offence, OffenceDetails};
-use sp_session::{IdentificationTuple, ValidatorIdentification};
 
 use pallet_balances::{Trait as BalancesTrait};
 use pallet_babe::BabeEquivocationOffence;
 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};
+use pallet_session::{Trait as SessionTrait, SessionManager, IdentificationTuple, ValidatorIdentification};
 use pallet_staking::{
 	Module as Staking, Trait as StakingTrait, RewardDestination, ValidatorPrefs,
 	Exposure, IndividualExposure, ElectionStatus, MAX_NOMINATIONS, Event as StakingEvent

frame/offences/benchmarking/src/mock.rs

@@ -90,7 +90,7 @@ impl pallet_timestamp::Trait for Test {
 	type MinimumPeriod = MinimumPeriod;
 	type WeightInfo = ();
 }
-impl sp_session::ValidatorIdentification<AccountId> for Test {
+impl pallet_session::ValidatorIdentification<AccountId> for Test {
 	type ValidatorId = AccountId;
 	type ValidatorIdOf = pallet_staking::StashOf<Test>;
 	type FullIdentification = pallet_staking::Exposure<AccountId, Balance>;
@@ -187,8 +187,8 @@ impl pallet_staking::Trait for Test {
 	type WeightInfo = ();
 }
 
-impl pallet_im_online::ValidatorSet<<Self as sp_session::ValidatorIdentification<AccountId>>::ValidatorId> for Test {
-	fn validators() -> Vec<<Self as sp_session::ValidatorIdentification<AccountId>>::ValidatorId> {
+impl pallet_im_online::ValidatorSet<<Self as pallet_session::ValidatorIdentification<AccountId>>::ValidatorId> for Test {
+	fn validators() -> Vec<<Self as pallet_session::ValidatorIdentification<AccountId>>::ValidatorId> {
 		Session::validators()
 	}
 }
@@ -216,7 +216,7 @@ parameter_types! {
 
 impl pallet_offences::Trait for Test {
 	type Event = Event;
-	type IdentificationTuple = sp_session::IdentificationTuple<AccountId, Self>;
+	type IdentificationTuple = pallet_session::IdentificationTuple<AccountId, Self>;
 	type OnOffenceHandler = Staking;
 	type WeightSoftLimit = OffencesWeightSoftLimit;
 }

frame/session/Cargo.toml

@@ -23,6 +23,7 @@ sp-session = { version = "2.0.0", default-features = false, path = "../../primit
 sp-staking = { version = "2.0.0", default-features = false, path = "../../primitives/staking" }
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
 frame-system = { version = "2.0.0", default-features = false, path = "../system" }
+pallet-session-common = { version = "2.0.0", default-features = false, path = "./common" }
 pallet-timestamp = { version = "2.0.0", default-features = false, path = "../timestamp" }
 sp-trie = { version = "2.0.0", optional = true, default-features = false, path = "../../primitives/trie" }
 impl-trait-for-tuples = "0.1.3"
@@ -45,6 +46,7 @@ std = [
 	"sp-runtime/std",
 	"sp-session/std",
 	"sp-staking/std",
+	"pallet-session-common/std",
 	"pallet-timestamp/std",
 	"sp-trie/std",
 ]

frame/session/benchmarking/src/mock.rs

@@ -106,7 +106,7 @@ impl pallet_timestamp::Trait for Test {
 	type MinimumPeriod = MinimumPeriod;
 	type WeightInfo = ();
 }
-impl sp_session::ValidatorIdentification<AccountId> for Test {
+impl pallet_session::ValidatorIdentification<AccountId> for Test {
 	type ValidatorId = AccountId;
 	type ValidatorIdOf = pallet_staking::StashOf<Test>;
 	type FullIdentification = pallet_staking::Exposure<AccountId, Balance>;

frame/session/src/historical/mod.rs

@@ -37,7 +37,7 @@ use sp_trie::{MemoryDB, Trie, TrieMut, Recorder, EMPTY_PREFIX};
 use sp_trie::trie_types::{TrieDBMut, TrieDB};
 use super::{SessionIndex, Module as SessionModule};
 
-pub use sp_session::IdentificationTuple;
+pub use pallet_session_common::IdentificationTuple;
 
 mod shared;
 pub mod offchain;

frame/session/src/historical/offchain.rs

@@ -152,7 +152,7 @@ mod tests {
 	};
 
 	use sp_runtime::testing::UintAuthorityId;
-	use sp_session::ValidatorIdentification;
+	use crate::ValidatorIdentification;
 
 	type Historical = Module<Test>;
 

frame/session/src/historical/onchain.rs

@@ -26,7 +26,7 @@ use super::Trait as HistoricalTrait;
 
 use super::shared;
 use sp_std::prelude::*;
-use sp_session::ValidatorIdentification;
+use pallet_session_common::ValidatorIdentification;
 
 /// Store the validator-set associated to the `session_index` to the off-chain database.
 ///

frame/session/src/lib.rs

@@ -102,7 +102,6 @@
 
 use sp_std::{prelude::*, marker::PhantomData, ops::{Sub, Rem}};
 use codec::Decode;
-use sp_session::ValidatorIdentification;
 use sp_runtime::{KeyTypeId, Perbill, RuntimeAppPublic, BoundToRuntimeAppPublic};
 use sp_runtime::traits::{Convert, Zero, Member, OpaqueKeys, Saturating};
 use sp_staking::SessionIndex;
@@ -116,6 +115,8 @@ use frame_support::{
 };
 use frame_system::ensure_signed;
 
+pub use pallet_session_common::{IdentificationTuple, ValidatorIdentification};
+
 #[cfg(test)]
 mod mock;
 #[cfg(test)]

frame/session/src/mock.rs

@@ -211,7 +211,7 @@ parameter_types! {
 	pub const DisabledValidatorsThreshold: Perbill = Perbill::from_percent(33);
 }
 
-impl sp_session::ValidatorIdentification<u64> for Test {
+impl crate::ValidatorIdentification<u64> for Test {
 	type ValidatorId = u64;
 	type ValidatorIdOf = ConvertInto;
 	type FullIdentification = u64;

frame/staking/fuzzer/src/mock.rs

@@ -114,7 +114,7 @@ impl pallet_timestamp::Trait for Test {
 impl pallet_session::historical::Trait for Test {
 }
 
-impl sp_session::ValidatorIdentification<<Self as frame_system::Trait>::AccountId> for Test {
+impl pallet_session::ValidatorIdentification<<Self as frame_system::Trait>::AccountId> for Test {
 	type ValidatorId = AccountId;
 	type ValidatorIdOf = pallet_staking::StashOf<Test>;
 	type FullIdentification = pallet_staking::Exposure<AccountId, Balance>;

frame/staking/src/lib.rs

@@ -3175,7 +3175,7 @@ impl<T: Trait> Convert<T::AccountId, Option<Exposure<T::AccountId, BalanceOf<T>>
 
 /// This is intended to be used with `FilterHistoricalOffences`.
 impl <T: Trait>
-	OnOffenceHandler<T::AccountId, sp_session::IdentificationTuple<<T as frame_system::Trait>::AccountId, T>, Weight>
+	OnOffenceHandler<T::AccountId, pallet_session::IdentificationTuple<<T as frame_system::Trait>::AccountId, T>, Weight>
 for Module<T> where
 	T: pallet_session::Trait<ValidatorId = <T as frame_system::Trait>::AccountId>,
 	T: pallet_session::historical::Trait<
@@ -3190,7 +3190,7 @@ for Module<T> where
 	>,
 {
 	fn on_offence(
-		offenders: &[OffenceDetails<T::AccountId, sp_session::IdentificationTuple<<T as frame_system::Trait>::AccountId, T>>],
+		offenders: &[OffenceDetails<T::AccountId, pallet_session::IdentificationTuple<<T as frame_system::Trait>::AccountId, T>>],
 		slash_fraction: &[Perbill],
 		slash_session: SessionIndex,
 	) -> Result<Weight, ()> {

frame/staking/src/mock.rs

@@ -246,7 +246,7 @@ sp_runtime::impl_opaque_keys! {
 	}
 }
 
-impl sp_session::ValidatorIdentification<AccountId> for Test {
+impl pallet_session::ValidatorIdentification<AccountId> for Test {
 	type ValidatorId = AccountId;
 	type ValidatorIdOf = crate::StashOf<Test>;
 	type FullIdentification = crate::Exposure<AccountId, Balance>;
@@ -742,7 +742,7 @@ pub(crate) fn validator_controllers() -> Vec<AccountId> {
 pub(crate) fn on_offence_in_era(
 	offenders: &[OffenceDetails<
 		AccountId,
-		sp_session::IdentificationTuple<AccountId, Test>,
+		pallet_session::IdentificationTuple<AccountId, Test>,
 	>],
 	slash_fraction: &[Perbill],
 	era: EraIndex,
@@ -770,7 +770,7 @@ pub(crate) fn on_offence_in_era(
 }
 
 pub(crate) fn on_offence_now(
-	offenders: &[OffenceDetails<AccountId, sp_session::IdentificationTuple<AccountId, Test>>],
+	offenders: &[OffenceDetails<AccountId, pallet_session::IdentificationTuple<AccountId, Test>>],
 	slash_fraction: &[Perbill],
 ) {
 	let now = Staking::active_era().unwrap().index;

frame/staking/src/tests.rs

@@ -4576,7 +4576,7 @@ fn offences_weight_calculated_correctly() {
 		let n_offence_unapplied_weight = <Test as frame_system::Trait>::DbWeight::get().reads_writes(4, 1)
 			+ <Test as frame_system::Trait>::DbWeight::get().reads_writes(4, 5);
 
-		let offenders: Vec<OffenceDetails<<Test as frame_system::Trait>::AccountId, sp_session::IdentificationTuple<<Test as frame_system::Trait>::AccountId, Test>>>
+		let offenders: Vec<OffenceDetails<<Test as frame_system::Trait>::AccountId, pallet_session::IdentificationTuple<<Test as frame_system::Trait>::AccountId, Test>>>
 			= (1..10).map(|i|
 				OffenceDetails {
 					offender: (i, Staking::eras_stakers(Staking::active_era().unwrap().index, i)),

primitives/session/Cargo.toml

@@ -19,7 +19,6 @@ sp-core = { version = "2.0.0", default-features = false, path = "../core" }
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
 sp-staking = { version = "2.0.0", default-features = false, path = "../staking" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../runtime" }
-frame-support = { version = "2.0.0", default-features = false, path = "../../frame/support" }
 
 [features]
 default = [ "std" ]
@@ -30,5 +29,4 @@ std = [
 	"sp-std/std",
 	"sp-staking/std",
 	"sp-runtime/std",
-	"frame-support/std",
 ]