refactor: abstract CfgCurrencyId

pallets/block-rewards/src/lib.rs

@@ -43,7 +43,6 @@ use cfg_traits::{
 	ops::{EnsureAdd, EnsureMul, EnsureSub},
 	rewards::{AccountRewards, CurrencyGroupChange, GroupRewards},
 };
-use cfg_types::tokens::CurrencyId as CfgCurrencyId;
 use frame_support::{
 	pallet_prelude::*,
 	storage::transactional,
@@ -141,16 +140,28 @@ pub mod pallet {
 			+ AccountRewards<
 				Self::AccountId,
 				Balance = Self::Balance,
-				CurrencyId = (DomainIdOf<Self>, CfgCurrencyId),
-			> + CurrencyGroupChange<GroupId = u32, CurrencyId = (DomainIdOf<Self>, CfgCurrencyId)>;
-
-		/// Type used to handle currency minting and burning for collators.
-		type Currency: Mutate<Self::AccountId, AssetId = CfgCurrencyId, Balance = Self::Balance>
+				CurrencyId = (DomainIdOf<Self>, <Self as Config>::CurrencyId),
+			> + CurrencyGroupChange<
+				GroupId = u32,
+				CurrencyId = (DomainIdOf<Self>, <Self as Config>::CurrencyId),
+			>;
+
+		/// The type used to handle currency minting and burning for collators.
+		type Currency: Mutate<Self::AccountId, AssetId = <Self as Config>::CurrencyId, Balance = Self::Balance>
 			+ CurrencyT<Self::AccountId>;
 
+		/// The currency type of the artificial block rewards currency.
+		type CurrencyId: Parameter
+			+ Member
+			+ Copy
+			+ MaybeSerializeDeserialize
+			+ Ord
+			+ TypeInfo
+			+ MaxEncodedLen;
+
 		/// The identifier of the artificial block rewards currency which is minted and burned for collators.
 		#[pallet::constant]
-		type StakeCurrencyId: Get<CfgCurrencyId>;
+		type StakeCurrencyId: Get<<Self as Config>::CurrencyId>;
 
 		/// The amount of the artificial block rewards currency which is minted and burned for collators.
 		#[pallet::constant]

pallets/block-rewards/src/mock.rs

@@ -238,6 +238,7 @@ impl pallet_block_rewards::Config for Test {
 	type Balance = Balance;
 	type Beneficiary = RewardRemainderMock;
 	type Currency = Tokens;
+	type CurrencyId = CurrencyId;
 	type Domain = BlockRewardsDomain;
 	type MaxChangesPerSession = MaxChangesPerSession;
 	type MaxCollators = MaxCollators;

runtime/development/src/lib.rs

@@ -1721,6 +1721,7 @@ impl pallet_block_rewards::Config for Runtime {
 	type Balance = Balance;
 	type Beneficiary = Treasury;
 	type Currency = Tokens;
+	type CurrencyId = CurrencyId;
 	type Domain = BlockRewardsDomain;
 	type MaxChangesPerSession = MaxChangesPerEpoch;
 	type MaxCollators = MaxAuthorities;