cargo fmt to resolve duplicate imports on merge

This commit is contained in:
joepetrowski
2022-11-18 15:53:46 +01:00
parent 6de6313909
commit 35d1e577ae
3 changed files with 8 additions and 14 deletions
@@ -247,8 +247,8 @@ impl pallet_assets::Config<TrustBackedAssetsInstance> for Runtime {
}
/// Assets managed by some foreign location.
type ForeignAssetClasses = pallet_assets::Instance2;
impl pallet_assets::Config<ForeignAssetClasses> for Runtime {
type ForeignAssetsInstance = pallet_assets::Instance2;
impl pallet_assets::Config<ForeignAssetsInstance> for Runtime {
type RuntimeEvent = RuntimeEvent;
type Balance = Balance;
// TODO: impl Copy for MultiLocation or relax AssetId to Clone?
@@ -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::{