IT: Simplify liquidity_pool test module

libs/primitives/src/lib.rs

@@ -283,6 +283,8 @@ pub mod constants {
 
 	/// The maximum number of pool fees per pool fee bucket
 	pub const MAX_POOL_FEES_PER_BUCKET: u32 = 100;
+
+	pub const NATIVE_KEY: &[u8] = &[0, 1];
 }
 
 /// Listing of parachains we integrate with.
@@ -301,7 +303,7 @@ pub mod parachains {
 
 		pub mod altair {
 			pub const ID: u32 = 2088;
-			pub const AIR_KEY: &[u8] = &[0, 1];
+			pub const AIR_KEY: &[u8] = crate::NATIVE_KEY;
 		}
 	}
 
@@ -313,7 +315,7 @@ pub mod parachains {
 
 		pub mod centrifuge {
 			pub const ID: u32 = 2031;
-			pub const CFG_KEY: &[u8] = &[0, 1];
+			pub const CFG_KEY: &[u8] = crate::NATIVE_KEY;
 		}
 	}
 

libs/types/src/tokens.rs

@@ -364,6 +364,23 @@ impl CrossChainTransferability {
 	pub fn includes_liquidity_pools(self) -> bool {
 		matches!(self, Self::LiquidityPools)
 	}
+
+	/// Fees will be charged using `FixedRateOfFungible`.
+	#[cfg(feature = "std")]
+	pub fn xcm_default() -> Self {
+		Self::Xcm(XcmMetadata {
+			fee_per_second: None,
+		})
+	}
+
+	/// Fees will be charged using `AssetRegistryTrader`.
+	/// If value is 0, no fees will be charged.
+	#[cfg(feature = "std")]
+	pub fn xcm_with_fees(value: Balance) -> Self {
+		Self::Xcm(XcmMetadata {
+			fee_per_second: Some(value),
+		})
+	}
 }
 
 /// Liquidity Pools-wrapped tokens

runtime/altair/src/xcm.rs

@@ -10,10 +10,7 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 
-use cfg_primitives::{
-	parachains,
-	types::{EnsureRootOr, HalfOfCouncil},
-};
+use cfg_primitives::types::{EnsureRootOr, HalfOfCouncil};
 use cfg_types::tokens::CurrencyId;
 use frame_support::{
 	parameter_types,
@@ -27,10 +24,9 @@ use pallet_xcm::XcmPassthrough;
 use runtime_common::{
 	transfer_filter::PreXcmTransfer,
 	xcm::{
-		general_key, AccountIdToLocation, Barrier, FixedConversionRateProvider,
+		AccountIdToLocation, Barrier, CanonicalNativePerSecond, FixedConversionRateProvider,
 		LocalOriginToLocation, ToTreasury,
 	},
-	xcm_fees::native_per_second,
 };
 use sp_core::ConstU32;
 use staging_xcm::{
@@ -88,25 +84,13 @@ impl staging_xcm_executor::Config for XcmConfig {
 /// else the xcm executor won't know how to charge fees for a transfer of said
 /// token.
 pub type Trader = (
-	FixedRateOfFungible<CanonicalAirPerSecond, ToTreasury<Runtime>>,
+	FixedRateOfFungible<CanonicalNativePerSecond, ToTreasury<Runtime>>,
 	AssetRegistryTrader<
 		FixedRateAssetRegistryTrader<FixedConversionRateProvider<OrmlAssetRegistry>>,
 		ToTreasury<Runtime>,
 	>,
 );
 
-parameter_types! {
-	// Canonical location: https://github.com/paritytech/polkadot/pull/4470
-	pub CanonicalAirPerSecond: (AssetId, u128, u128) = (
-		Location::new(
-			0,
-			general_key(parachains::kusama::altair::AIR_KEY)
-		).into(),
-		native_per_second(),
-		0,
-	);
-}
-
 /// Means for transacting the fungibles assets of this parachain.
 pub type FungiblesTransactor = FungiblesAdapter<
 	// Use this fungibles implementation

runtime/centrifuge/src/xcm.rs

@@ -10,10 +10,7 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 
-use cfg_primitives::{
-	parachains,
-	types::{EnsureRootOr, HalfOfCouncil},
-};
+use cfg_primitives::types::{EnsureRootOr, HalfOfCouncil};
 use cfg_traits::TryConvert;
 use cfg_types::{tokens::CurrencyId, EVMChainId};
 use frame_support::{
@@ -28,10 +25,9 @@ use pallet_xcm::XcmPassthrough;
 use runtime_common::{
 	transfer_filter::PreXcmTransfer,
 	xcm::{
-		general_key, AccountIdToLocation, Barrier, FixedConversionRateProvider,
+		AccountIdToLocation, Barrier, CanonicalNativePerSecond, FixedConversionRateProvider,
 		LocalOriginToLocation, LpInstanceRelayer, ToTreasury,
 	},
-	xcm_fees::native_per_second,
 };
 use sp_core::ConstU32;
 use staging_xcm::{
@@ -89,25 +85,13 @@ impl staging_xcm_executor::Config for XcmConfig {
 /// else the xcm executor won't know how to charge fees for a transfer of said
 /// token.
 pub type Trader = (
-	FixedRateOfFungible<CanonicalCfgPerSecond, ToTreasury<Runtime>>,
+	FixedRateOfFungible<CanonicalNativePerSecond, ToTreasury<Runtime>>,
 	AssetRegistryTrader<
 		FixedRateAssetRegistryTrader<FixedConversionRateProvider<OrmlAssetRegistry>>,
 		ToTreasury<Runtime>,
 	>,
 );
 
-parameter_types! {
-	// Canonical location: https://github.com/paritytech/polkadot/pull/4470
-	pub CanonicalCfgPerSecond: (AssetId, u128, u128) = (
-		Location::new(
-			0,
-			general_key(parachains::polkadot::centrifuge::CFG_KEY),
-		).into(),
-		native_per_second(),
-		0,
-	);
-}
-
 /// Means for transacting the fungibles assets of this parachain.
 pub type FungiblesTransactor = FungiblesAdapter<
 	// Use this fungibles implementation

runtime/common/src/xcm.rs

@@ -36,7 +36,7 @@ use staging_xcm_builder::{
 	TakeWeightCredit,
 };
 
-use crate::xcm_fees::default_per_second;
+use crate::xcm_fees::{default_per_second, native_per_second};
 
 /// Our FixedConversionRateProvider, used to charge XCM-related fees for
 /// tokens registered in the asset registry that were not already handled by
@@ -71,6 +71,18 @@ pub fn general_key(data: &[u8]) -> staging_xcm::latest::Junction {
 	}
 }
 
+frame_support::parameter_types! {
+	// Canonical location: https://github.com/paritytech/polkadot/pull/4470
+	pub CanonicalNativePerSecond: (AssetId, u128, u128) = (
+		Location::new(
+			0,
+			general_key(cfg_primitives::NATIVE_KEY),
+		).into(),
+		native_per_second(),
+		0,
+	);
+}
+
 /// How we convert an `[AccountId]` into an XCM Location
 pub struct AccountIdToLocation;
 impl<AccountId: Into<[u8; 32]>> Convert<AccountId, Location> for AccountIdToLocation {

runtime/development/src/xcm.rs

@@ -9,10 +9,7 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
-use cfg_primitives::{
-	parachains,
-	types::{EnsureRootOr, HalfOfCouncil},
-};
+use cfg_primitives::types::{EnsureRootOr, HalfOfCouncil};
 use cfg_traits::TryConvert;
 use cfg_types::{tokens::CurrencyId, EVMChainId};
 use frame_support::{
@@ -27,10 +24,9 @@ use pallet_xcm::XcmPassthrough;
 use runtime_common::{
 	transfer_filter::PreXcmTransfer,
 	xcm::{
-		general_key, AccountIdToLocation, Barrier, FixedConversionRateProvider,
+		AccountIdToLocation, Barrier, CanonicalNativePerSecond, FixedConversionRateProvider,
 		LocalOriginToLocation, LpInstanceRelayer, ToTreasury,
 	},
-	xcm_fees::native_per_second,
 };
 use sp_core::ConstU32;
 use staging_xcm::{
@@ -95,19 +91,6 @@ pub type Trader = (
 	>,
 );
 
-parameter_types! {
-	// Canonical location: https://github.com/paritytech/polkadot/pull/4470
-	pub CanonicalNativePerSecond: (AssetId, u128, u128) = (
-		Location::new(
-			0,
-			general_key(parachains::kusama::altair::AIR_KEY),
-		).into(),
-		native_per_second(),
-		0,
-	);
-
-}
-
 /// Means for transacting the fungibles assets of this parachain.
 pub type FungiblesTransactor = FungiblesAdapter<
 	// Use this fungibles implementation

runtime/integration-tests/src/generic/cases/investments.rs

@@ -43,7 +43,7 @@ mod common {
 				.add(genesis::balances::<T>(
 					T::ExistentialDeposit::get() + FOR_FEES,
 				))
-				.add(genesis::assets::<T>(vec![Box::new(Usd6)]))
+				.add(genesis::assets::<T>(vec![(Usd6.id(), &Usd6.metadata())]))
 				.add(genesis::tokens::<T>(vec![(Usd6.id(), Usd6.ed())]))
 				.storage(),
 		);