More fixes

frame/benchmarking/pov/src/tests.rs

@@ -185,12 +185,12 @@ mod mock {
 		type DbWeight = ();
 		type RuntimeOrigin = RuntimeOrigin;
 		type Index = u32;
-				type RuntimeCall = RuntimeCall;
+		type RuntimeCall = RuntimeCall;
 		type Hash = H256;
 		type Hashing = ::sp_runtime::traits::BlakeTwo256;
 		type AccountId = u32;
 		type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
-
+		type Block = Block;
 		type RuntimeEvent = RuntimeEvent;
 		type BlockHashCount = ();
 		type Version = ();

frame/election-provider-multi-phase/src/mock.rs

@@ -67,6 +67,7 @@ frame_support::construct_runtime!(
 
 pub(crate) type Balance = u64;
 pub(crate) type AccountId = u64;
+pub(crate) type BlockNumber = u64;
 pub(crate) type VoterIndex = u32;
 pub(crate) type TargetIndex = u16;
 

frame/support/src/dispatch.rs

@@ -3226,14 +3226,16 @@ mod tests {
 			type RuntimeCall;
 			type BaseCallFilter;
 			type RuntimeOrigin: crate::traits::OriginTrait<Call = Self::RuntimeCall>;
-			type BlockNumber: Into<u32>;
+			type Block: Parameter + sp_runtime::traits::Block;
 			type PalletInfo: crate::traits::PalletInfo;
 			type DbWeight: Get<RuntimeDbWeight>;
 		}
 
 		pub use super::super::RawOrigin;
 
 		pub type Origin<T> = RawOrigin<<T as Config>::AccountId>;
+		pub type HeaderOf<T> = <<T as Config>::Block as traits::HeaderProvider>::Header;
+		pub type BlockNumberOf<T> = <HeaderOf<T> as traits::Header>::Number;
 	}
 
 	decl_module! {
@@ -3260,12 +3262,12 @@ mod tests {
 			#[weight = (5, DispatchClass::Operational)]
 			fn operational(_origin) { unreachable!() }
 
-			fn on_initialize(n: BlockNumberOf<T>,) -> Weight { if n.into() == 42 { panic!("on_initialize") } Weight::from_parts(7, 0) }
-			fn on_idle(n: BlockNumberOf<T>, remaining_weight: Weight,) -> Weight {
+			fn on_initialize(n: system::BlockNumberOf<T>,) -> Weight { if n.into() == 42 { panic!("on_initialize") } Weight::from_parts(7, 0) }
+			fn on_idle(n: system::BlockNumberOf<T>, remaining_weight: Weight,) -> Weight {
 				if n.into() == 42 || remaining_weight == Weight::from_parts(42, 0)  { panic!("on_idle") }
 				Weight::from_parts(7, 0)
 			}
-			fn on_finalize(n: BlockNumberOf<T>,) { if n.into() == 42 { panic!("on_finalize") } }
+			fn on_finalize(n: system::BlockNumberOf<T>,) { if n.into() == 42 { panic!("on_finalize") } }
 			fn on_runtime_upgrade() -> Weight { Weight::from_parts(10, 0) }
 			fn offchain_worker() {}
 			/// Some doc

frame/support/src/lib.rs

@@ -846,7 +846,7 @@ pub mod tests {
 	#[pallet]
 	pub mod frame_system {
 		#[allow(unused)]
-		use super::{frame_system, frame_system::pallet_prelude::*};
+		use super::{frame_system, frame_system::pallet_prelude::*, BlockNumerOf};
 		pub use crate::dispatch::RawOrigin;
 		use crate::pallet_prelude::*;