Moved PalletId and AccountId to primitives.

pallets/bb-bnc/src/mock.rs

@@ -23,10 +23,13 @@
 
 use crate as bb_bnc;
 use bifrost_asset_registry::AssetIdMaps;
-use bifrost_primitives::MoonbeamChainId;
 pub use bifrost_primitives::{
  currency::*, CurrencyId, CurrencyIdMapping, SlpxOperator, TokenSymbol,
 };
+use bifrost_primitives::{
+ BifrostEntranceAccount, BifrostExitAccount, BifrostFeeAccount, BuyBackAccount,
+ IncentivePalletId, IncentivePoolAccount, MoonbeamChainId,
+};
 use bifrost_runtime_common::{micro, milli};
 use bifrost_slp::{QueryId, QueryResponseManager};
 pub use cumulus_primitives_core::ParaId;
@@ -35,10 +38,8 @@ use frame_support::{
  pallet_prelude::Get,
  parameter_types,
  traits::{Everything, Nothing},
- PalletId,
 };
 use frame_system::{EnsureRoot, EnsureSignedBy};
-use hex_literal::hex;
 use orml_traits::{location::RelativeReserveProvider, parameter_type_with_key};
 use sp_core::ConstU32;
 use sp_runtime::{
@@ -90,7 +91,7 @@ impl frame_system::Config for Runtime {
 }
 
 parameter_types! {
- pub const NativeCurrencyId: CurrencyId = CurrencyId::Native(TokenSymbol::BNC);
+ pub const NativeCurrencyId: CurrencyId = BNC;
 }
 
 pub type AdaptedBasicCurrency =
@@ -105,11 +106,8 @@ impl bifrost_currencies::Config for Runtime {
 
 parameter_types! {
  pub const ExistentialDeposit: Balance = 1;
- // pub const NativeCurrencyId: CurrencyId = CurrencyId::Native(TokenSymbol::BNC);
- // pub const RelayCurrencyId: CurrencyId = CurrencyId::Token(TokenSymbol::KSM);
- pub const StableCurrencyId: CurrencyId = CurrencyId::Stable(TokenSymbol::KUSD);
- // pub SelfParaId: u32 = ParachainInfo::parachain_id().into();
- pub const PolkadotCurrencyId: CurrencyId = CurrencyId::Token(TokenSymbol::DOT);
+ pub const StableCurrencyId: CurrencyId = KUSD;
+ pub const PolkadotCurrencyId: CurrencyId = DOT;
 }
 
 impl pallet_balances::Config for Runtime {
@@ -192,15 +190,11 @@ impl orml_xtokens::Config for Runtime {
 parameter_types! {
  pub const MaximumUnlockIdOfUser: u32 = 1_000;
  pub const MaximumUnlockIdOfTimeUnit: u32 = 1_000;
- pub BifrostEntranceAccount: PalletId = PalletId(*b"bf/vtkin");
- pub BifrostExitAccount: PalletId = PalletId(*b"bf/vtout");
- pub BifrostFeeAccount: AccountId = hex!["e4da05f08e89bf6c43260d96f26fffcfc7deae5b465da08669a9d008e64c2c63"].into();
- pub IncentivePoolAccount: PalletId = PalletId(*b"bf/inpoo");
 }
 
 ord_parameter_types! {
  pub const One: AccountId = ALICE;
- pub const RelayCurrencyId: CurrencyId = CurrencyId::Token(TokenSymbol::KSM);
+ pub const RelayCurrencyId: CurrencyId = KSM;
 }
 
 impl bifrost_vtoken_minting::Config for Runtime {
@@ -240,9 +234,7 @@ impl bifrost_asset_registry::Config for Runtime {
 }
 
 parameter_types! {
- pub const BbBNCTokenType: CurrencyId = CurrencyId::VToken(TokenSymbol::BNC);
- pub IncentivePalletId: PalletId = PalletId(*b"bf/bbict");
- pub const BuyBackAccount: PalletId = PalletId(*b"bf/bybck");
+ pub const BbBNCTokenType: CurrencyId = VBNC;
  pub const Week: BlockNumber = 50400; // a week
  pub const MaxBlock: BlockNumber = 10512000; // four years
  pub const Multiplier: Balance = 10_u128.pow(12);

pallets/buy-back/src/mock.rs

@@ -22,8 +22,11 @@
 #![allow(non_upper_case_globals)]
 
 use bifrost_asset_registry::AssetIdMaps;
-use bifrost_primitives::MoonbeamChainId;
-pub use bifrost_primitives::{currency::*, CurrencyId, SlpxOperator, TokenSymbol};
+pub use bifrost_primitives::{currency::*, CurrencyId, SlpxOperator};
+use bifrost_primitives::{
+ BifrostEntranceAccount, BifrostExitAccount, BifrostFeeAccount, BuyBackAccount,
+ IncentivePalletId, IncentivePoolAccount, LiquidityAccount, MoonbeamChainId, ZenlinkPalletId,
+};
 use bifrost_slp::{QueryId, QueryResponseManager};
 pub use cumulus_primitives_core::ParaId;
 use frame_support::{
@@ -32,10 +35,8 @@ use frame_support::{
  parameter_types,
  sp_runtime::{traits::ConvertInto, DispatchError, DispatchResult},
  traits::{Everything, Nothing},
- PalletId,
 };
 use frame_system::{EnsureRoot, EnsureSignedBy};
-use hex_literal::hex;
 use orml_traits::{location::RelativeReserveProvider, parameter_type_with_key, MultiCurrency};
 use sp_core::ConstU32;
 use sp_runtime::{
@@ -104,7 +105,7 @@ impl frame_system::Config for Runtime {
 }
 
 parameter_types! {
- pub const GetNativeCurrencyId: CurrencyId = CurrencyId::Native(TokenSymbol::BNC);
+ pub const GetNativeCurrencyId: CurrencyId = BNC;
 }
 
 pub type AdaptedBasicCurrency =
@@ -158,14 +159,11 @@ impl orml_tokens::Config for Runtime {
 
 parameter_types! {
  pub const TreasuryAccount: AccountId32 = TREASURY_ACCOUNT;
- pub BifrostVsbondAccount: PalletId = PalletId(*b"bf/salpb");
- pub const BuyBackAccount: PalletId = PalletId(*b"bf/bybck");
- pub const LiquidityAccount: PalletId = PalletId(*b"bf/liqdt");
 }
 
 ord_parameter_types! {
  pub const One: AccountId = ALICE;
- pub const RelayCurrencyId: CurrencyId = CurrencyId::Token(TokenSymbol::KSM);
+ pub const RelayCurrencyId: CurrencyId = KSM;
 }
 
 impl bifrost_buy_back::Config for Runtime {
@@ -283,10 +281,6 @@ impl orml_xtokens::Config for Runtime {
 parameter_types! {
  pub const MaximumUnlockIdOfUser: u32 = 10;
  pub const MaximumUnlockIdOfTimeUnit: u32 = 50;
- pub BifrostEntranceAccount: PalletId = PalletId(*b"bf/vtkin");
- pub BifrostExitAccount: PalletId = PalletId(*b"bf/vtout");
- pub BifrostFeeAccount: AccountId = hex!["e4da05f08e89bf6c43260d96f26fffcfc7deae5b465da08669a9d008e64c2c63"].into();
- pub IncentivePoolAccount: PalletId = PalletId(*b"bf/inpoo");
 }
 
 impl bifrost_vtoken_minting::Config for Runtime {
@@ -316,7 +310,6 @@ impl bifrost_vtoken_minting::Config for Runtime {
 }
 
 parameter_types! {
- pub const ZenlinkPalletId: PalletId = PalletId(*b"/zenlink");
  pub const GetExchangeFee: (u32, u32) = (3, 1000); // 0.3%
  pub const SelfParaId: u32 = 2001;
 }
@@ -465,8 +458,7 @@ impl pallet_xcm::Config for Runtime {
 }
 
 parameter_types! {
- pub const BbBNCTokenType: CurrencyId = CurrencyId::VToken(TokenSymbol::BNC);
- pub IncentivePalletId: PalletId = PalletId(*b"bf/bbict");
+ pub const BbBNCTokenType: CurrencyId = VBNC;
  pub const Week: BlockNumber = 50400; // a week
  pub const MaxBlock: BlockNumber = 10512000; // four years
  pub const Multiplier: Balance = 10_u128.pow(12);

pallets/buy-back/src/tests.rs

@@ -21,6 +21,7 @@
 #![cfg(test)]
 
 use crate::{mock::*, *};
+use bifrost_primitives::IncentivePalletId;
 use frame_support::{assert_noop, assert_ok};
 use sp_arithmetic::per_things::Permill;
 

pallets/channel-commission/src/mock.rs

@@ -21,8 +21,8 @@
 
 use crate::mock::sp_api_hidden_includes_construct_runtime::hidden_include::traits::OnInitialize;
 use bifrost_primitives::{
- currency::{BNC, KSM},
- CurrencyId, TokenSymbol,
+ currency::{ASG, BNC, KSM},
+ CommissionPalletId, CurrencyId,
 };
 use frame_support::{derive_impl, ord_parameter_types, parameter_types, traits::Nothing, PalletId};
 use frame_system::EnsureSignedBy;
@@ -66,7 +66,7 @@ impl frame_system::Config for Runtime {
 }
 
 parameter_types! {
- pub const GetNativeCurrencyId: CurrencyId = CurrencyId::Native(TokenSymbol::ASG);
+ pub const GetNativeCurrencyId: CurrencyId = ASG;
 }
 
 pub type AdaptedBasicCurrency =
@@ -127,10 +127,8 @@ ord_parameter_types! {
 }
 
 parameter_types! {
- pub const CommissionPalletId: PalletId = PalletId(*b"bf/comms");
  pub const ClearingDuration: u32 = 100;
  pub const NameLengthLimit: u32 = 20;
- pub const FeeSharePalletId: PalletId = PalletId(*b"bf/feesh");
  pub BifrostCommissionReceiver: AccountId = AccountId32::new([7u8; 32]);
 }
 

pallets/clouds-convert/src/mock.rs

@@ -24,9 +24,9 @@
 use bifrost_asset_registry::AssetIdMaps;
 use bifrost_primitives::{
  currency::{BNC, CLOUD, KSM, VBNC, VKSM},
- CurrencyId, CurrencyIdMapping, TokenSymbol,
+ BuyBackAccount, CloudsPalletId, CurrencyId, CurrencyIdMapping, IncentivePalletId,
 };
-use frame_support::{ord_parameter_types, parameter_types, traits::Nothing, PalletId};
+use frame_support::{ord_parameter_types, parameter_types, traits::Nothing};
 use frame_system::EnsureSignedBy;
 use sp_core::H256;
 use sp_runtime::{
@@ -95,7 +95,7 @@ impl frame_system::Config for Runtime {
 }
 
 parameter_types! {
- pub const NativeCurrencyId: CurrencyId = CurrencyId::Native(TokenSymbol::BNC);
+ pub const NativeCurrencyId: CurrencyId = BNC;
 }
 
 pub type AdaptedBasicCurrency =
@@ -166,10 +166,6 @@ impl bifrost_asset_registry::Config for Runtime {
  type WeightInfo = ();
 }
 
-parameter_types! {
- pub const CloudsPalletId: PalletId = PalletId(*b"bf/cloud");
-}
-
 impl bifrost_clouds_convert::Config for Runtime {
  type RuntimeEvent = RuntimeEvent;
  type MultiCurrency = Currencies;
@@ -180,9 +176,7 @@ impl bifrost_clouds_convert::Config for Runtime {
 }
 
 parameter_types! {
- pub const BbBNCTokenType: CurrencyId = CurrencyId::VToken(TokenSymbol::BNC);
- pub IncentivePalletId: PalletId = PalletId(*b"bf/bbict");
- pub const BuyBackAccount: PalletId = PalletId(*b"bf/bybck");
+ pub const BbBNCTokenType: CurrencyId = VBNC;
  pub const Week: BlockNumber = 50400; // a week
  pub const MaxBlock: BlockNumber = 10512000; // four years
  pub const Multiplier: Balance = 10_u128.pow(12);

pallets/cross-in-out/src/mock.rs

@@ -20,8 +20,8 @@
 #![allow(non_upper_case_globals)]
 
 use bifrost_primitives::{
- currency::{BNC, DOT, KSM, VDOT},
- CurrencyId, TokenSymbol,
+ currency::{ASG, BNC, DOT, KSM, VDOT},
+ CurrencyId, SlpEntrancePalletId,
 };
 use frame_support::{derive_impl, ord_parameter_types, parameter_types, traits::Nothing, PalletId};
 use frame_system::EnsureSignedBy;
@@ -65,7 +65,7 @@ impl frame_system::Config for Runtime {
 }
 
 parameter_types! {
- pub const GetNativeCurrencyId: CurrencyId = CurrencyId::Native(TokenSymbol::ASG);
+ pub const GetNativeCurrencyId: CurrencyId = ASG;
 }
 
 pub type AdaptedBasicCurrency =
@@ -126,7 +126,6 @@ ord_parameter_types! {
 }
 
 parameter_types! {
- pub const SlpEntrancePalletId: PalletId = PalletId(*b"bf/vtkin");
  pub const MaxLengthLimit: u32 = 100;
 }
 

pallets/deprecated/lightening-redeem/src/mock.rs

@@ -129,10 +129,6 @@ impl pallet_collective::Config<CouncilCollective> for Runtime {
  type WeightInfo = pallet_collective::weights::SubstrateWeight<Runtime>;
 }
 
-parameter_types! {
- pub const LighteningRedeemPalletId: PalletId = PalletId(*b"lighten#");
-}
-
 impl bifrost_lightening_redeem::Config for Runtime {
  type RuntimeEvent = RuntimeEvent;
  type MultiCurrency = Tokens;

pallets/deprecated/liquidity-mining/src/mock.rs

@@ -180,7 +180,6 @@ parameter_types! {
  pub const MinimumDuration: BlockNumber = MINUTES;
  pub const MaximumApproved: u32 = 4;
  pub const MaximumOptionRewards: u32 = 7;
- pub const LiquidityMiningPalletId: PalletId = PalletId(*b"mining##");
 }
 
 impl lm::Config for Test {

pallets/deprecated/salp-lite/src/mock.rs

@@ -161,7 +161,6 @@ impl bifrost_currencies::Config for Test {
 
 parameter_types! {
  pub const MinContribution: Balance = 10;
- pub const BifrostCrowdloanId: PalletId = PalletId(*b"bf/salp#");
  pub const RemoveKeysLimit: u32 = 50;
  pub const SlotLength: BlockNumber = 8u32 as BlockNumber;
  pub const LeasePeriod: BlockNumber = 6 * WEEKS;

pallets/deprecated/system-maker/src/mock.rs

@@ -22,8 +22,11 @@
 #![allow(non_upper_case_globals)]
 
 use bifrost_asset_registry::AssetIdMaps;
-use bifrost_primitives::MoonbeamChainId;
-pub use bifrost_primitives::{currency::*, CurrencyId, SlpxOperator, TokenSymbol};
+pub use bifrost_primitives::{currency::*, CurrencyId, SlpxOperator};
+use bifrost_primitives::{
+ BifrostEntranceAccount, BifrostExitAccount, BifrostFeeAccount, IncentivePoolAccount,
+ MoonbeamChainId, SystemMakerPalletId, ZenlinkPalletId,
+};
 use bifrost_slp::{QueryId, QueryResponseManager};
 pub use cumulus_primitives_core::ParaId;
 use frame_support::{
@@ -32,10 +35,8 @@ use frame_support::{
  parameter_types,
  sp_runtime::{DispatchError, DispatchResult},
  traits::{Everything, Nothing},
- PalletId,
 };
 use frame_system::{EnsureRoot, EnsureSignedBy};
-use hex_literal::hex;
 use orml_traits::{location::RelativeReserveProvider, parameter_type_with_key, MultiCurrency};
 use sp_core::ConstU32;
 use sp_runtime::{
@@ -103,7 +104,7 @@ impl frame_system::Config for Runtime {
 }
 
 parameter_types! {
- pub const GetNativeCurrencyId: CurrencyId = CurrencyId::Native(TokenSymbol::ASG);
+ pub const GetNativeCurrencyId: CurrencyId = ASG;
 }
 
 pub type AdaptedBasicCurrency =
@@ -157,14 +158,11 @@ impl orml_tokens::Config for Runtime {
 
 parameter_types! {
  pub const TreasuryAccount: AccountId32 = TREASURY_ACCOUNT;
- pub BifrostVsbondAccount: PalletId = PalletId(*b"bf/salpb");
- pub const SystemMakerPalletId: PalletId = PalletId(*b"bf/sysmk");
 }
 
 ord_parameter_types! {
  pub const One: AccountId = ALICE;
- // pub const RelayChainTokenSymbolKSM: TokenSymbol = TokenSymbol::KSM;
- pub const RelayCurrencyId: CurrencyId = CurrencyId::Token(TokenSymbol::KSM);
+ pub const RelayCurrencyId: CurrencyId = KSM;
 }
 
 impl bifrost_system_maker::Config for Runtime {
@@ -282,10 +280,6 @@ impl orml_xtokens::Config for Runtime {
 parameter_types! {
  pub const MaximumUnlockIdOfUser: u32 = 10;
  pub const MaximumUnlockIdOfTimeUnit: u32 = 50;
- pub BifrostEntranceAccount: PalletId = PalletId(*b"bf/vtkin");
- pub BifrostExitAccount: PalletId = PalletId(*b"bf/vtout");
- pub BifrostFeeAccount: AccountId = hex!["e4da05f08e89bf6c43260d96f26fffcfc7deae5b465da08669a9d008e64c2c63"].into();
- pub IncentivePoolAccount: PalletId = PalletId(*b"bf/inpoo");
 }
 
 impl bifrost_vtoken_minting::Config for Runtime {
@@ -315,7 +309,6 @@ impl bifrost_vtoken_minting::Config for Runtime {
 }
 
 parameter_types! {
- pub const ZenlinkPalletId: PalletId = PalletId(*b"/zenlink");
  pub const GetExchangeFee: (u32, u32) = (3, 1000); // 0.3%
  pub const SelfParaId: u32 = 2001;
 }