nits

Author: dharjeezy

modules/ismp/testsuite/Cargo.toml

@@ -16,4 +16,4 @@ anyhow = { workspace = true }
 [dependencies.polkadot-sdk]
 workspace = true
 default-features = true
-features = ["sp-core"]
+features = ["sp-core", "sp-runtime"]

modules/pallets/testsuite/src/xcm.rs

@@ -432,7 +432,6 @@ impl pallet_xcm_gateway::Config for Test {
 	type Assets = Assets;
 	type IsmpHost = Ismp;
 	type GatewayOrigin = EnsureRoot<AccountId32>;
-	type DotLocation = DotOnAssetHub;
 }
 
 impl pallet_assets::Config for Test {

modules/pallets/xcm-gateway/src/lib.rs

@@ -99,8 +99,6 @@ pub mod pallet {
 		type GatewayOrigin: EnsureOrigin<
 			<Self as polkadot_sdk::frame_system::Config>::RuntimeOrigin,
 		>;
-
-		type DotLocation: Get<Location>;
 	}
 
 	#[pallet::storage]
@@ -339,6 +337,7 @@ where
 				},
 			}
 		);
+
 		// parachains/solochains shouldn't be sending us a request.
 		ensure!(
 			!matches!(
@@ -390,7 +389,7 @@ where
 					},
 				})?;
 
-		let asset_id = T::DotLocation::get();
+		let asset_id = Location::parent();
 
 		// We don't custody user funds, we send the dot back to assethub using xcm
 		let xcm_beneficiary: Location =
@@ -485,7 +484,7 @@ where
 				// on assethub;
 				let xcm_beneficiary: Location =
 					Junction::AccountId32 { network: None, id: body.from.0 }.into();
-				let asset_id = T::DotLocation::get();
+				let asset_id = Location::parent();
 				let xcm_dest = VersionedLocation::V5(Location::new(1, [Parachain(ASSET_HUB_PARA_ID)]));
 				let fee_asset_item = 0;
 				let weight_limit = WeightLimit::Unlimited;

modules/pallets/xcm-gateway/src/xcm_utilities.rs

@@ -23,7 +23,6 @@ use frame_support::traits::{
 };
 use ismp::host::StateMachine;
 use polkadot_sdk::*;
-use polkadot_sdk::cumulus_primitives_core::Here;
 use sp_core::{Get, H160};
 use sp_runtime::traits::MaybeEquivalence;
 use staging_xcm::v5::{
@@ -36,7 +35,6 @@ use staging_xcm_executor::{
 	AssetsInHolding,
 };
 pub const ASSET_HUB_PARA_ID: u32 = 1000;
-pub const NATIVE_ASSET_ID_ON_ASSET_HUB: u128 = 0;
 pub struct WrappedNetworkId(pub NetworkId);
 
 impl TryFrom<WrappedNetworkId> for StateMachine {
@@ -128,7 +126,7 @@ pub struct ReserveTransferFilter;
 
 impl Contains<(Location, Vec<Asset>)> for ReserveTransferFilter {
 	fn contains(t: &(Location, Vec<Asset>)) -> bool {
-		let native = Location::new(1, Here);
+		let native = Location::parent();
 		t.1.iter().all(|asset| {
 			if let Asset { id: asset_id, fun: Fungible(_) } = asset {
 				asset_id.0 == native

parachain/runtimes/gargantua/src/ismp.rs

@@ -19,7 +19,6 @@ use crate::{
 	Runtime, RuntimeEvent, Timestamp, TokenGatewayInspector, TokenGovernor, TreasuryPalletId,
 	XcmGateway, EXISTENTIAL_DEPOSIT,
 };
-use crate::xcm::DotOnAssetHub;
 use anyhow::anyhow;
 use frame_support::{
 	pallet_prelude::{ConstU32, Get},
@@ -198,7 +197,6 @@ impl pallet_xcm_gateway::Config for Runtime {
 	type Assets = Assets;
 	type IsmpHost = Ismp;
 	type GatewayOrigin = EnsureRoot<AccountId>;
-	type DotLocation = DotOnAssetHub;
 }
 
 impl pallet_token_gateway_inspector::Config for Runtime {

parachain/runtimes/gargantua/src/xcm.rs

@@ -40,7 +40,7 @@ use staging_xcm_builder::{
 };
 use staging_xcm_executor::XcmExecutor;
 
-use pallet_xcm_gateway::xcm_utilities::{ASSET_HUB_PARA_ID, ConvertAssetId, HyperbridgeAssetTransactor, NATIVE_ASSET_ID_ON_ASSET_HUB, ReserveTransferFilter};
+use pallet_xcm_gateway::xcm_utilities::{ASSET_HUB_PARA_ID, ConvertAssetId, HyperbridgeAssetTransactor, ReserveTransferFilter};
 
 parameter_types! {
 	pub const RelayLocation: Location = Location::parent();
@@ -149,10 +149,6 @@ impl ContainsPair<Asset, Location> for MultiNativeAsset {
 	}
 }
 
-parameter_types! {
-	pub DotOnAssetHub: Location = Location::new(1, Here);
-}
-
 pub struct AssetsFromAssetHub;
 impl ContainsPair<Asset, Location> for AssetsFromAssetHub {
 	fn contains(asset: &Asset, origin: &Location) -> bool {
@@ -164,7 +160,7 @@ impl ContainsPair<Asset, Location> for AssetsFromAssetHub {
 		let asset_hub = Location::new(1, [Parachain(ASSET_HUB_PARA_ID)]);
 		if origin == &asset_hub {
 			let AssetId(asset_id) = &asset.id;
-			return DotOnAssetHub::get() == *asset_id;
+			return Parent == *asset_id;
 		}
 
 		false

parachain/runtimes/nexus/src/ismp.rs

@@ -19,7 +19,6 @@ use crate::{
 	ReputationAsset, Runtime, RuntimeEvent, Timestamp, TokenGatewayInspector, TokenGovernor,
 	TreasuryPalletId, XcmGateway, EXISTENTIAL_DEPOSIT,
 };
-use crate::xcm::DotOnAssetHub;
 use frame_support::{
 	pallet_prelude::{ConstU32, Get},
 	parameter_types,
@@ -249,7 +248,6 @@ impl pallet_xcm_gateway::Config for Runtime {
 			MIN_TECH_COLLECTIVE_APPROVAL,
 		>,
 	>;
-	type DotLocation = DotOnAssetHub;
 }
 
 impl pallet_token_governor::Config for Runtime {

parachain/runtimes/nexus/src/xcm.rs

@@ -145,7 +145,7 @@ impl ContainsPair<Asset, Location> for AssetsFromAssetHub {
 		let asset_hub = Location::new(1, [Parachain(ASSET_HUB_PARA_ID)]);
 		if origin == &asset_hub {
 			let AssetId(asset_id) = &asset.id;
-			return DotOnAssetHub::get() == *asset_id;
+			return Parent == *asset_id;
 		}
 
 		false
@@ -209,10 +209,6 @@ parameter_types! {
 	pub ReachableDest: Option<Location> = Some(Parent.into());
 }
 
-parameter_types! {
-	pub DotOnAssetHub: Location = Location::new(1, Here);
-}
-
 impl pallet_xcm::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type Currency = Balances;