diff --git a/pallets/asset-index/src/benchmarking.rs b/pallets/asset-index/src/benchmarking.rs index 33a4125774..42172d53bb 100644 --- a/pallets/asset-index/src/benchmarking.rs +++ b/pallets/asset-index/src/benchmarking.rs @@ -8,7 +8,6 @@ use frame_support::{ assert_ok, dispatch::UnfilteredDispatchable, sp_runtime::{traits::AccountIdConversion, FixedPointNumber}, - sp_std::convert::TryFrom, traits::{Currency as _, EnsureOrigin, Get}, }; use frame_system::RawOrigin; diff --git a/pallets/asset-index/src/lib.rs b/pallets/asset-index/src/lib.rs index 83c40bec1b..72d49ec962 100644 --- a/pallets/asset-index/src/lib.rs +++ b/pallets/asset-index/src/lib.rs @@ -36,7 +36,7 @@ pub mod pallet { ArithmeticError, FixedPointNumber, }, sp_std::{ - convert::{TryFrom, TryInto}, + convert::TryInto, prelude::*, result::Result, }, @@ -99,7 +99,7 @@ pub mod pallet { /// Type that handles cross chain transfers type RemoteAssetManager: RemoteAssetManager; /// Type used to identify assets - type AssetId: Parameter + Member + Copy + MaybeSerializeDeserialize + TryFrom; + type AssetId: Parameter + Member + Copy + MaybeSerializeDeserialize ; /// The native asset id #[pallet::constant] diff --git a/pallets/price-feed/src/lib.rs b/pallets/price-feed/src/lib.rs index d8939ed94f..45da4fd534 100644 --- a/pallets/price-feed/src/lib.rs +++ b/pallets/price-feed/src/lib.rs @@ -50,7 +50,6 @@ pub mod pallet { use frame_support::{ pallet_prelude::*, sp_runtime::{traits::CheckedDiv, FixedPointNumber, FixedPointOperand}, - sp_std::convert::TryFrom, traits::{Get, Time}, }; use frame_system::pallet_prelude::*; @@ -82,7 +81,7 @@ pub mod pallet { type SelfAssetId: Get; /// Type used to identify the assets. - type AssetId: Parameter + Member + MaybeSerializeDeserialize + TryFrom; + type AssetId: Parameter + Member + MaybeSerializeDeserialize ; /// Type to keep track of timestamped values type Time: Time; diff --git a/pallets/remote-asset-manager/src/lib.rs b/pallets/remote-asset-manager/src/lib.rs index 493f5ff164..aa184a9f4a 100644 --- a/pallets/remote-asset-manager/src/lib.rs +++ b/pallets/remote-asset-manager/src/lib.rs @@ -28,7 +28,7 @@ pub mod pallet { dispatch::DispatchResultWithPostInfo, pallet_prelude::*, sp_runtime::traits::{AccountIdConversion, AtLeast32BitUnsigned, Convert, Saturating, StaticLookup, Zero}, - sp_std::{self, convert::TryFrom, mem, prelude::*}, + sp_std::{self, mem, prelude::*}, traits::Get, transactional, }; @@ -80,7 +80,7 @@ pub mod pallet { + Into; /// Asset Id that is used to identify different kinds of assets. - type AssetId: Parameter + Member + Copy + MaybeSerializeDeserialize + TryFrom; + type AssetId: Parameter + Member + Copy + MaybeSerializeDeserialize ; /// Convert a `T::AssetId` to its relative `MultiLocation` identifier. type AssetIdConvert: Convert>; diff --git a/pallets/saft-registry/src/benchmarking.rs b/pallets/saft-registry/src/benchmarking.rs index cf32c171ae..c9f57686d1 100644 --- a/pallets/saft-registry/src/benchmarking.rs +++ b/pallets/saft-registry/src/benchmarking.rs @@ -5,7 +5,7 @@ use frame_benchmarking::benchmarks; use frame_support::{ - assert_ok, dispatch::UnfilteredDispatchable, sp_runtime::traits::Zero, sp_std::convert::TryFrom, + assert_ok, dispatch::UnfilteredDispatchable, sp_runtime::traits::Zero traits::EnsureOrigin, }; use xcm::v0::Junction; diff --git a/pallets/saft-registry/src/lib.rs b/pallets/saft-registry/src/lib.rs index 49e3b701da..148a7103ef 100644 --- a/pallets/saft-registry/src/lib.rs +++ b/pallets/saft-registry/src/lib.rs @@ -24,7 +24,7 @@ pub mod pallet { traits::{AtLeast32BitUnsigned, CheckedAdd, One, Saturating, Zero}, ArithmeticError, }, - sp_std::{self, convert::TryFrom, prelude::*, result::Result}, + sp_std::{self, prelude::*, result::Result}, transactional, }; use frame_system::pallet_prelude::*; @@ -41,7 +41,7 @@ pub mod pallet { type AdminOrigin: EnsureOrigin; type AssetRecorder: AssetRecorder; type Balance: Parameter + Member + AtLeast32BitUnsigned + Default + Copy; - type AssetId: Parameter + Member + Copy + TryFrom; + type AssetId: Parameter + Member + Copy ; type Event: From> + IsType<::Event>; /// The weight for this pallet's extrinsics. type WeightInfo: WeightInfo;