Adds BlockNumberProvider in multisig, proxy and nft pallets

substrate/frame/multisig/src/lib.rs

@@ -50,23 +50,9 @@ pub mod weights;
 
 extern crate alloc;
 use alloc::{boxed::Box, vec, vec::Vec};
-use codec::{Decode, Encode, MaxEncodedLen};
-use frame_support::{
-	dispatch::{
-		DispatchErrorWithPostInfo, DispatchResult, DispatchResultWithPostInfo, GetDispatchInfo,
-		PostDispatchInfo,
-	},
-	ensure,
-	traits::{Currency, Get, ReservableCurrency},
-	weights::Weight,
-	BoundedVec,
-};
-use frame_system::{self as system, pallet_prelude::BlockNumberFor, RawOrigin};
-use scale_info::TypeInfo;
-use sp_io::hashing::blake2_256;
-use sp_runtime::{
-	traits::{BlockNumberProvider, Dispatchable, TrailingZeroInput, Zero},
-	DispatchError, RuntimeDebug,
+use frame::{
+	prelude::*,
+	traits::{BlockNumberProvider, Currency, ReservableCurrency},
 };
 use frame_system::RawOrigin;
 pub use weights::WeightInfo;
@@ -166,7 +152,7 @@ pub mod pallet {
 		type MaxSignatories: Get<u32>;
 
 		/// Weight information for extrinsics in this pallet.
-		type WeightInfo: WeightInfo;
+		type WeightInfo: weights::WeightInfo;
 
 		/// Provider for the block number. Normally this is the `frame_system` pallet.
 		type BlockNumberProvider: BlockNumberProvider<BlockNumber = BlockNumberFor<Self>>;
@@ -644,7 +630,7 @@ impl<T: Config> Pallet<T> {
 	pub fn timepoint() -> Timepoint<BlockNumberFor<T>> {
 		Timepoint {
 			height: T::BlockNumberProvider::current_block_number(),
-			index: <system::Pallet<T>>::extrinsic_index().unwrap_or_default(),
+			index: <frame_system::Pallet<T>>::extrinsic_index().unwrap_or_default(),
 		}
 	}
 

substrate/frame/proxy/src/lib.rs

@@ -37,17 +37,9 @@ extern crate alloc;
 use alloc::{boxed::Box, vec};
 use frame::{
 	prelude::*,
-	traits::{Currency, ReservableCurrency},
+	traits::{BlockNumberProvider, Currency, ReservableCurrency},
 };
 pub use pallet::*;
-use scale_info::TypeInfo;
-use sp_io::hashing::blake2_256;
-use sp_runtime::{
-	traits::{
-		BlockNumberProvider, Dispatchable, Hash, Saturating, StaticLookup, TrailingZeroInput, Zero,
-	},
-	DispatchError, DispatchResult, RuntimeDebug,
-};
 pub use weights::WeightInfo;
 
 type CallHashOf<T> = <<T as Config>::CallHasher as Hash>::Output;
@@ -638,7 +630,7 @@ impl<T: Config> Pallet<T> {
 		let (height, ext_index) = maybe_when.unwrap_or_else(|| {
 			(
 				T::BlockNumberProvider::current_block_number(),
-				system::Pallet::<T>::extrinsic_index().unwrap_or_default(),
+				frame_system::Pallet::<T>::extrinsic_index().unwrap_or_default(),
 			)
 		});
 		let entropy = (b"modlpy/proxy____", who, height, ext_index, proxy_type, index)