change: Make the CommitteeMember type inside CommitteeInfo fixed (#1103)

Author: AmbientTea

toolkit/committee-selection/pallet/src/lib.rs

@@ -326,23 +326,31 @@ pub mod pallet {
 	#[derive(CloneNoBound, Encode, Decode, TypeInfo, MaxEncodedLen)]
 	#[scale_info(skip_type_params(MaxValidators))]
 	/// Committee info type used on-chain.
-	pub struct CommitteeInfo<CommitteeMember: Clone, MaxValidators> {
+	pub struct CommitteeInfo<AuthorityId: Clone, AuthorityKeys: Clone, MaxValidators> {
 		/// Epoch number the committee is selected for.
 		pub epoch: ScEpochNumber,
 		/// List of committee members.
-		pub committee: BoundedVec<CommitteeMember, MaxValidators>,
+		pub committee: BoundedVec<CommitteeMember<AuthorityId, AuthorityKeys>, MaxValidators>,
 	}
 
-	impl<CommitteeMember: Clone, MaxValidators> CommitteeInfo<CommitteeMember, MaxValidators> {
+	/// Committee information type used by the pallet
+	pub type CommitteeInfoOf<T> = CommitteeInfo<
+		<T as Config>::AuthorityId,
+		<T as Config>::AuthorityKeys,
+		<T as Config>::MaxValidators,
+	>;
+
+	impl<AuthorityId: Clone, AuthorityKeys: Clone, MaxValidators>
+		CommitteeInfo<AuthorityId, AuthorityKeys, MaxValidators>
+	{
 		/// Returns committee info as a pair of epoch number and list of committee members
-		pub fn as_pair(self) -> (ScEpochNumber, Vec<CommitteeMember>) {
+		pub fn as_pair(self) -> (ScEpochNumber, Vec<CommitteeMember<AuthorityId, AuthorityKeys>>) {
 			(self.epoch, self.committee.to_vec())
 		}
 	}
 
-	impl<CommitteeMember, MaxValidators> Default for CommitteeInfo<CommitteeMember, MaxValidators>
-	where
-		CommitteeMember: Clone,
+	impl<AuthorityId: Clone, AuthorityKeys: Clone, MaxValidators> Default
+		for CommitteeInfo<AuthorityId, AuthorityKeys, MaxValidators>
 	{
 		fn default() -> Self {
 			Self { epoch: ScEpochNumber::zero(), committee: BoundedVec::new() }
@@ -354,12 +362,10 @@ pub mod pallet {
 		StorageValue<_, BoundedBTreeSet<T::AccountId, T::MaxValidators>, ValueQuery>;
 
 	#[pallet::storage]
-	pub type CurrentCommittee<T: Config> =
-		StorageValue<_, CommitteeInfo<CommitteeMemberOf<T>, T::MaxValidators>, ValueQuery>;
+	pub type CurrentCommittee<T: Config> = StorageValue<_, CommitteeInfoOf<T>, ValueQuery>;
 
 	#[pallet::storage]
-	pub type NextCommittee<T: Config> =
-		StorageValue<_, CommitteeInfo<CommitteeMemberOf<T>, T::MaxValidators>, OptionQuery>;
+	pub type NextCommittee<T: Config> = StorageValue<_, CommitteeInfoOf<T>, OptionQuery>;
 
 	/// Stores the stage of handling the inputs change. Used by session manager, to decide
 	/// if the session should be ended quickly, to speed up using the newly selected committee.
@@ -578,14 +584,13 @@ pub mod pallet {
 		}
 
 		/// Returns current committee from storage.
-		pub fn current_committee_storage() -> CommitteeInfo<CommitteeMemberOf<T>, T::MaxValidators>
-		{
+		pub fn current_committee_storage() -> CommitteeInfoOf<T> {
 			CurrentCommittee::<T>::get()
 		}
 
 		/// Returns next committee from storage.
 		pub fn next_committee_storage()
-		-> Option<CommitteeInfo<CommitteeMemberOf<T>, T::MaxValidators>> {
+		-> Option<CommitteeInfo<T::AuthorityId, T::AuthorityKeys, T::MaxValidators>> {
 			NextCommittee::<T>::get()
 		}
 

toolkit/committee-selection/pallet/src/migrations/v1.rs

@@ -1,7 +1,6 @@
 //! Implements storage migration of the `session-validator-management` pallet from v0 to v1.
 #[cfg(feature = "try-runtime")]
 extern crate alloc;
-use crate::CommitteeMemberOf;
 use frame_support::traits::UncheckedOnRuntimeUpgrade;
 #[cfg(feature = "try-runtime")]
 use {alloc::vec::Vec, parity_scale_codec::Encode};
@@ -26,26 +25,24 @@ impl<T: crate::pallet::Config> UncheckedOnRuntimeUpgrade for InnerMigrateV0ToV1<
 		use sp_runtime::BoundedVec;
 
 		let current_committee_v0 = v0::CurrentCommittee::<T>::get();
-		let current_committee_v1 =
-			crate::pallet::CommitteeInfo::<CommitteeMemberOf<T>, T::MaxValidators> {
-				epoch: current_committee_v0.epoch,
-				committee: BoundedVec::truncate_from(
-					current_committee_v0.committee.into_iter().map(From::from).collect(),
-				),
-			};
+		let current_committee_v1 = crate::pallet::CommitteeInfoOf::<T> {
+			epoch: current_committee_v0.epoch,
+			committee: BoundedVec::truncate_from(
+				current_committee_v0.committee.into_iter().map(From::from).collect(),
+			),
+		};
 
 		crate::CurrentCommittee::<T>::put(current_committee_v1);
 
 		let Some(next_committee_v0) = v0::NextCommittee::<T>::get() else {
 			return T::DbWeight::get().reads_writes(2, 1);
 		};
-		let next_committee_v1 =
-			crate::pallet::CommitteeInfo::<CommitteeMemberOf<T>, T::MaxValidators> {
-				epoch: next_committee_v0.epoch,
-				committee: BoundedVec::truncate_from(
-					next_committee_v0.committee.into_iter().map(From::from).collect(),
-				),
-			};
+		let next_committee_v1 = crate::pallet::CommitteeInfoOf::<T> {
+			epoch: next_committee_v0.epoch,
+			committee: BoundedVec::truncate_from(
+				next_committee_v0.committee.into_iter().map(From::from).collect(),
+			),
+		};
 
 		crate::NextCommittee::<T>::put(next_committee_v1);