From 83feb8b05347a99c3ad96e61f90ca1a49ffb76a8 Mon Sep 17 00:00:00 2001 From: claravanstaden Date: Tue, 20 Feb 2024 09:13:16 +0200 Subject: [PATCH] fixes after 1.7 updates --- system-parachains/asset-hubs/asset-hub-kusama/src/lib.rs | 2 +- .../asset-hubs/asset-hub-kusama/src/xcm_config.rs | 6 +++--- system-parachains/asset-hubs/asset-hub-polkadot/src/lib.rs | 2 +- .../asset-hubs/asset-hub-polkadot/src/xcm_config.rs | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/system-parachains/asset-hubs/asset-hub-kusama/src/lib.rs b/system-parachains/asset-hubs/asset-hub-kusama/src/lib.rs index 85256e3eda..7c0eaf5e09 100644 --- a/system-parachains/asset-hubs/asset-hub-kusama/src/lib.rs +++ b/system-parachains/asset-hubs/asset-hub-kusama/src/lib.rs @@ -395,7 +395,7 @@ impl pallet_assets::Config for Runtime { type CreateOrigin = ForeignCreators< ( FromSiblingParachain, xcm::v3::Location>, - FromNetwork, + FromNetwork, ), ForeignCreatorsSovereignAccountOf, AccountId, diff --git a/system-parachains/asset-hubs/asset-hub-kusama/src/xcm_config.rs b/system-parachains/asset-hubs/asset-hub-kusama/src/xcm_config.rs index 1a385f593a..68278c73c7 100644 --- a/system-parachains/asset-hubs/asset-hub-kusama/src/xcm_config.rs +++ b/system-parachains/asset-hubs/asset-hub-kusama/src/xcm_config.rs @@ -834,8 +834,8 @@ pub mod bridging { pub type IsTrustedBridgedReserveLocationForForeignAsset = matching::IsForeignConcreteAsset>; - impl Contains<(MultiLocation, Junction)> for UniversalAliases { - fn contains(alias: &(MultiLocation, Junction)) -> bool { + impl Contains<(Location, Junction)> for UniversalAliases { + fn contains(alias: &(Location, Junction)) -> bool { UniversalAliases::get().contains(alias) } } @@ -847,7 +847,7 @@ pub mod bridging { #[cfg(feature = "runtime-benchmarks")] impl BridgingBenchmarksHelper { - pub fn prepare_universal_alias() -> Option<(MultiLocation, Junction)> { + pub fn prepare_universal_alias() -> Option<(Location, Junction)> { let alias = to_polkadot::UniversalAliases::get().into_iter().find_map( |(location, junction)| { match to_polkadot::SiblingBridgeHubWithBridgeHubPolkadotInstance::get() diff --git a/system-parachains/asset-hubs/asset-hub-polkadot/src/lib.rs b/system-parachains/asset-hubs/asset-hub-polkadot/src/lib.rs index d863ea0e3d..1b73a7475c 100644 --- a/system-parachains/asset-hubs/asset-hub-polkadot/src/lib.rs +++ b/system-parachains/asset-hubs/asset-hub-polkadot/src/lib.rs @@ -325,7 +325,7 @@ impl pallet_assets::Config for Runtime { type CreateOrigin = ForeignCreators< ( FromSiblingParachain, xcm::v3::Location>, - FromNetwork, + FromNetwork, ), ForeignCreatorsSovereignAccountOf, AccountId, diff --git a/system-parachains/asset-hubs/asset-hub-polkadot/src/xcm_config.rs b/system-parachains/asset-hubs/asset-hub-polkadot/src/xcm_config.rs index 9bbb9044c7..013461041f 100644 --- a/system-parachains/asset-hubs/asset-hub-polkadot/src/xcm_config.rs +++ b/system-parachains/asset-hubs/asset-hub-polkadot/src/xcm_config.rs @@ -763,8 +763,8 @@ pub mod bridging { pub type IsTrustedBridgedReserveLocationForForeignAsset = matching::IsForeignConcreteAsset>; - impl Contains<(MultiLocation, Junction)> for UniversalAliases { - fn contains(alias: &(MultiLocation, Junction)) -> bool { + impl Contains<(Location, Junction)> for UniversalAliases { + fn contains(alias: &(Location, Junction)) -> bool { UniversalAliases::get().contains(alias) } }