From 35d1e577ae09012985b799332b175c2a1cf9b29c Mon Sep 17 00:00:00 2001 From: joepetrowski Date: Fri, 18 Nov 2022 15:53:46 +0100 Subject: [PATCH] cargo fmt to resolve duplicate imports on merge --- parachains/runtimes/assets/westmint/src/lib.rs | 4 ++-- parachains/runtimes/assets/westmint/src/xcm_config.rs | 11 +++-------- .../collectives-polkadot/src/xcm_config.rs | 7 +++---- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/parachains/runtimes/assets/westmint/src/lib.rs b/parachains/runtimes/assets/westmint/src/lib.rs index a8b2bd600c..00c03e56e8 100644 --- a/parachains/runtimes/assets/westmint/src/lib.rs +++ b/parachains/runtimes/assets/westmint/src/lib.rs @@ -247,8 +247,8 @@ impl pallet_assets::Config for Runtime { } /// Assets managed by some foreign location. -type ForeignAssetClasses = pallet_assets::Instance2; -impl pallet_assets::Config for Runtime { +type ForeignAssetsInstance = pallet_assets::Instance2; +impl pallet_assets::Config for Runtime { type RuntimeEvent = RuntimeEvent; type Balance = Balance; // TODO: impl Copy for MultiLocation or relax AssetId to Clone? diff --git a/parachains/runtimes/assets/westmint/src/xcm_config.rs b/parachains/runtimes/assets/westmint/src/xcm_config.rs index 2aa7affbc3..74f661815c 100644 --- a/parachains/runtimes/assets/westmint/src/xcm_config.rs +++ b/parachains/runtimes/assets/westmint/src/xcm_config.rs @@ -15,17 +15,12 @@ use super::{ AccountId, AllPalletsWithSystem, AssetId, Assets, Authorship, Balance, Balances, ParachainInfo, - ParachainSystem, PolkadotXcm, Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, WeightToFee, - XcmpQueue, - AccountId, AssetId, Authorship, Balance, Balances, ParachainInfo, ParachainSystem, PolkadotXcm, - Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, TrustBackedAssets, - TrustBackedAssetsInstance, WeightToFee, XcmpQueue, + ParachainSystem, PolkadotXcm, Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, + TrustBackedAssets, TrustBackedAssetsInstance, WeightToFee, XcmpQueue, }; use frame_support::{ match_types, parameter_types, - traits::{ConstU32, Everything, Nothing, PalletInfoAccess}, - traits::{EnsureOriginWithArg, Everything, PalletInfoAccess}, - traits::{EnsureOrigin, EnsureOriginWithArg, Everything, PalletInfoAccess}, + traits::{ConstU32, EnsureOrigin, EnsureOriginWithArg, Everything, Nothing, PalletInfoAccess}, }; use pallet_xcm::{EnsureXcm, XcmPassthrough}; use parachains_common::{ diff --git a/parachains/runtimes/collectives/collectives-polkadot/src/xcm_config.rs b/parachains/runtimes/collectives/collectives-polkadot/src/xcm_config.rs index 2cb82656c3..fb0bd3b419 100644 --- a/parachains/runtimes/collectives/collectives-polkadot/src/xcm_config.rs +++ b/parachains/runtimes/collectives/collectives-polkadot/src/xcm_config.rs @@ -31,10 +31,9 @@ use xcm::latest::prelude::*; use xcm_builder::{ AccountId32Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, CurrencyAdapter, EnsureXcmOrigin, - FixedWeightBounds, IsConcrete, ParentAsSuperuser, ParentIsPreset, - RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, - SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit, - UsingComponents, + FixedWeightBounds, IsConcrete, ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, + SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative, + SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit, UsingComponents, }; use xcm_executor::XcmExecutor;