Asset conversion nits

parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/swap.rs

@@ -6,7 +6,7 @@ use xcm_emulator::Parachain;
 fn swap_locally_on_chain_using_local_assets() {
 	const ASSET_ID: u32 = 1;
 
-	let asset_native = Box::new(MultiLocation { parents: 0, interior: Here });
+	let asset_native = Box::new(asset_hub_westend_runtime::xcm_config::WestendLocation::get());
 	let asset_one = Box::new(MultiLocation {
 		parents: 0,
 		interior: X2(PalletInstance(50), GeneralIndex(ASSET_ID.into())),
@@ -99,7 +99,7 @@ fn swap_locally_on_chain_using_foreign_assets() {
 	use frame_support::weights::WeightToFee;
 
 	const ASSET_ID: u32 = 1;
-	let asset_native = Box::new(MultiLocation { parents: 0, interior: Here });
+	let asset_native = Box::new(asset_hub_westend_runtime::xcm_config::WestendLocation::get());
 
 	let foreign_asset1_at_asset_hub_westend = Box::new(MultiLocation {
 		parents: 1,

parachains/runtimes/assets/asset-hub-westend/src/lib.rs

@@ -315,7 +315,7 @@ impl pallet_asset_conversion::Config for Runtime {
 	type MaxSwapPathLength = ConstU32<4>;
 
 	type MultiAssetId = Box<MultiLocation>;
-	type MultiAssetIdConverter = MultiLocationConverter<Balances, UniversalLocation>;
+	type MultiAssetIdConverter = MultiLocationConverter<UniversalLocation, WestendLocation>;
 
 	type MintMinLiquidity = ConstU128<100>;
 

parachains/runtimes/assets/common/src/local_and_foreign_assets.rs

@@ -29,7 +29,7 @@ use pallet_asset_conversion::MultiAssetIdConverter;
 use parachains_common::{AccountId, AssetIdForTrustBackedAssets};
 use sp_runtime::{traits::MaybeEquivalence, DispatchResult};
 use sp_std::{boxed::Box, marker::PhantomData};
-use xcm::{latest::MultiLocation, opaque::lts::Junctions::Here};
+use xcm::latest::MultiLocation;
 use xcm_builder::AsPrefixedGeneralIndex;
 use xcm_executor::traits::JustTry;
 
@@ -41,18 +41,18 @@ fn is_local<TrustBackedAssetsPalletLocation: Get<MultiLocation>>(
 	AsPrefixedGeneralIndex::<TrustBackedAssetsPalletLocation, AssetIdForTrustBackedAssets, JustTry>::convert(&multilocation)
 }
 
-pub struct MultiLocationConverter<Balances, ParachainLocation: Get<InteriorMultiLocation>> {
-	_phantom: PhantomData<(Balances, ParachainLocation)>,
+pub struct MultiLocationConverter<ParachainLocation: Get<InteriorMultiLocation>, NativeAssetLocation: Get<MultiLocation>> {
+	_phantom: PhantomData<(ParachainLocation, NativeAssetLocation)>,
 }
 
-impl<Balances, ParachainLocation> MultiAssetIdConverter<Box<MultiLocation>, MultiLocation>
-	for MultiLocationConverter<Balances, ParachainLocation>
+impl<ParachainLocation, NativeAssetLocation> MultiAssetIdConverter<Box<MultiLocation>, MultiLocation>
+	for MultiLocationConverter<ParachainLocation, NativeAssetLocation>
 where
-	Balances: PalletInfoAccess,
 	ParachainLocation: Get<InteriorMultiLocation>,
+	NativeAssetLocation: Get<MultiLocation>,
 {
 	fn get_native() -> Box<MultiLocation> {
-		Box::new(MultiLocation { parents: 0, interior: Here })
+		Box::new(NativeAssetLocation::get())
 	}
 
 	fn is_native(asset_id: &Box<MultiLocation>) -> bool {