Fix compile (#1244)

darwinia-network · Aug 28, 2023 · 336c98a · 336c98a
1 parent 2235bd4
commit 336c98a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/runtime/pangolin/src/pallets/orml_xtokens.rs b/runtime/pangolin/src/pallets/orml_xtokens.rs
@@ -30,15 +30,15 @@ pub enum CurrencyId {
 	// Our native token
 	SelfReserve,
 	// Assets representing other chains native tokens
-	ForeignAsset(AssetId),
+	ForeignAsset(crate::AssetId),
 }
 
 // How to convert from CurrencyId to MultiLocation
 pub struct CurrencyIdtoMultiLocation<AssetXConverter>(sp_std::marker::PhantomData<AssetXConverter>);
 impl<AssetXConverter> sp_runtime::traits::Convert<CurrencyId, Option<MultiLocation>>
 	for CurrencyIdtoMultiLocation<AssetXConverter>
 where
-	AssetXConverter: xcm_executor::traits::Convert<MultiLocation, AssetId>,
+	AssetXConverter: xcm_executor::traits::Convert<MultiLocation, crate::AssetId>,
 {
 	fn convert(currency: CurrencyId) -> Option<MultiLocation> {
 		match currency {
@@ -73,7 +73,11 @@ impl orml_xtokens::Config for Runtime {
 	type BaseXcmWeight = BaseXcmWeight;
 	type CurrencyId = CurrencyId;
 	type CurrencyIdConvert = CurrencyIdtoMultiLocation<
-		xcm_primitives::AsAssetType<AssetId, xcm_configs::AssetType, AssetManager>,
+		xcm_primitives::AsAssetType<
+			crate::AssetId,
+			pallets::asset_manager::AssetType,
+			AssetManager,
+		>,
 	>;
 	type MaxAssetsForTransfer = MaxAssetsForTransfer;
 	// We don't have this case: fee_reserve != non_fee_reserve

diff --git a/runtime/pangolin/src/pallets/polkadot_xcm.rs b/runtime/pangolin/src/pallets/polkadot_xcm.rs
@@ -45,7 +45,7 @@ pub type ForeignFungiblesTransactor = xcm_builder::FungiblesAdapter<
 	// Use this currency when it is a fungible asset matching the given location or name:
 	(
 		xcm_builder::ConvertedConcreteId<
-			AssetId,
+			crate::AssetId,
 			Balance,
 			xcm_primitives::AsAssetType<
 				crate::AssetId,
@@ -203,7 +203,7 @@ pub type XcmFeesToAccount = xcm_primitives::XcmFeesToAccount<
 	Assets,
 	(
 		xcm_builder::ConvertedConcreteId<
-			AssetId,
+			crate::AssetId,
 			Balance,
 			xcm_primitives::AsAssetType<
 				crate::AssetId,