From 002037772924963fc3fd10023164c18b5fbc32a5 Mon Sep 17 00:00:00 2001 From: Alistair Singh Date: Tue, 19 Dec 2023 11:19:34 +0200 Subject: [PATCH] remove explicit snowbridge teleport --- .../assets/asset-hub-rococo/src/xcm_config.rs | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/xcm_config.rs b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/xcm_config.rs index cfbaee064159..7cd4942750b8 100644 --- a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/xcm_config.rs +++ b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/xcm_config.rs @@ -42,7 +42,6 @@ use polkadot_runtime_common::xcm_sender::ExponentialPrice; use snowbridge_rococo_common::EthereumNetwork; use snowbridge_router_primitives::inbound::GlobalConsensusEthereumConvertsFor; use sp_runtime::traits::{AccountIdConversion, ConvertInto}; -use sp_std::marker::PhantomData; use xcm::latest::prelude::*; #[allow(deprecated)] use xcm_builder::CurrencyAdapter; @@ -61,7 +60,6 @@ use xcm_executor::{traits::WithOriginFilter, XcmExecutor}; #[cfg(feature = "runtime-benchmarks")] use cumulus_primitives_core::ParaId; -use frame_support::traits::{ContainsPair, Get}; parameter_types! { pub const TokenLocation: MultiLocation = MultiLocation::parent(); @@ -536,7 +534,6 @@ pub type WaivedLocations = ( /// - Sibling parachains' assets from where they originate (as `ForeignCreators`). pub type TrustedTeleporters = ( ConcreteAssetFromSystem, - ConcreteAssetFromSnowBridgeMessageQueue, IsForeignConcreteAsset>>, ); @@ -720,18 +717,6 @@ where } } -pub struct ConcreteAssetFromSnowBridgeMessageQueue(PhantomData); -impl> ContainsPair - for ConcreteAssetFromSnowBridgeMessageQueue -{ - fn contains(asset: &MultiAsset, origin: &MultiLocation) -> bool { - log::trace!(target: "xcm::contains", "ConcreteAssetFromSystem asset: {:?}, origin: {:?}", asset, origin); - let from_snowbridge = origin - .eq(&bridging::to_ethereum::SiblingBridgeHubWithEthereumInboundQueueInstance::get()); - matches!(asset.id, Concrete(id) if id == AssetLocation::get()) && from_snowbridge - } -} - /// All configuration related to bridging pub mod bridging { use super::*;