Revert "Uses u32 in mock block"

This reverts commit 60bd4c6.

client/chain-spec/README.md

@@ -50,7 +50,7 @@ pub struct Extension {
 		pub pool: PoolParams,
 }
 
-pub type BlockNumber = u32;
+pub type BlockNumber = u64;
 
 /// A chain spec supporting forkable `ClientParams`.
 pub type MyChainSpec1<G> = GenericChainSpec<G, Forks<BlockNumber, ClientParams>>;

client/chain-spec/src/extension.rs

@@ -164,7 +164,7 @@ pub trait IsForks {
 }
 
 impl IsForks for Option<()> {
-	type BlockNumber = u32;
+	type BlockNumber = u64;
 	type Extension = Self;
 }
 

client/chain-spec/src/lib.rs

@@ -68,7 +68,7 @@
 //! 	pub pool: PoolParams,
 //! }
 //!
-//! pub type BlockNumber = u32;
+//! pub type BlockNumber = u64;
 //!
 //! /// A chain spec supporting forkable `ClientParams`.
 //! pub type MyChainSpec1<G> = GenericChainSpec<G, Forks<BlockNumber, ClientParams>>;

client/statement-store/src/lib.rs

@@ -891,7 +891,7 @@ mod tests {
 	type Extrinsic = sp_runtime::OpaqueExtrinsic;
 	type Hash = sp_core::H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;
-	type BlockNumber = u32;
+	type BlockNumber = u64;
 	type Header = sp_runtime::generic::Header<BlockNumber, Hashing>;
 	type Block = sp_runtime::generic::Block<Header, Extrinsic>;
 

frame/alliance/src/mock.rs

@@ -37,7 +37,7 @@ pub use crate as pallet_alliance;
 
 use super::*;
 
-type BlockNumber = u32;
+type BlockNumber = u64;
 type AccountId = u64;
 
 parameter_types! {

frame/authority-discovery/src/lib.rs

@@ -216,7 +216,7 @@ mod tests {
 		type FullIdentificationOf = ();
 	}
 
-	pub type BlockNumber = u32;
+	pub type BlockNumber = u64;
 
 	parameter_types! {
 		pub const Period: BlockNumber = 1;

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

@@ -64,7 +64,7 @@ frame_support::construct_runtime!(
 
 pub(crate) type Balance = u64;
 pub(crate) type AccountId = u64;
-pub(crate) type BlockNumber = u32;
+pub(crate) type BlockNumber = u64;
 pub(crate) type VoterIndex = u32;
 pub(crate) type TargetIndex = u16;
 
@@ -319,7 +319,7 @@ impl onchain::Config for OnChainSeqPhragmen {
 pub struct MockFallback;
 impl ElectionProviderBase for MockFallback {
 	type AccountId = AccountId;
-	type BlockNumber = u32;
+	type BlockNumber = u64;
 	type Error = &'static str;
 	type DataProvider = StakingMock;
 	type MaxWinners = MaxWinners;
@@ -433,7 +433,7 @@ pub struct ExtBuilder {}
 pub struct StakingMock;
 impl ElectionDataProvider for StakingMock {
 	type AccountId = AccountId;
-	type BlockNumber = u32;
+	type BlockNumber = u64;
 	type MaxVotesPerVoter = MaxNominations;
 
 	fn electable_targets(maybe_max_len: Option<usize>) -> data_provider::Result<Vec<AccountId>> {

frame/election-provider-multi-phase/test-staking-e2e/src/mock.rs

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

frame/election-provider-support/src/onchain.rs

@@ -190,7 +190,7 @@ mod tests {
 	use sp_npos_elections::Support;
 	use sp_runtime::Perbill;
 	type AccountId = u64;
-	type BlockNumber = u32;
+	type BlockNumber = u64;
 
 	pub type Header = sp_runtime::generic::Header<BlockNumber, sp_runtime::traits::BlakeTwo256>;
 	pub type UncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic<AccountId, (), (), ()>;

frame/fast-unstake/src/mock.rs

@@ -30,7 +30,7 @@ use sp_std::prelude::*;
 
 pub type AccountId = u128;
 pub type AccountIndex = u32;
-pub type BlockNumber = u32;
+pub type BlockNumber = u64;
 pub type Balance = u128;
 pub type T = Runtime;
 

frame/nomination-pools/benchmarking/src/mock.rs

@@ -25,7 +25,7 @@ use sp_runtime::{
 
 type AccountId = u128;
 type AccountIndex = u32;
-type BlockNumber = u32;
+type BlockNumber = u64;
 type Balance = u128;
 
 impl frame_system::Config for Runtime {

frame/nomination-pools/src/mock.rs

@@ -5,7 +5,7 @@ use frame_system::RawOrigin;
 use sp_runtime::FixedU128;
 use sp_staking::Stake;
 
-pub type BlockNumber = u32;
+pub type BlockNumber = u64;
 pub type AccountId = u128;
 pub type Balance = u128;
 pub type RewardCounter = FixedU128;

frame/nomination-pools/test-staking/src/mock.rs

@@ -30,7 +30,7 @@ use sp_runtime::{
 
 type AccountId = u128;
 type AccountIndex = u32;
-type BlockNumber = u32;
+type BlockNumber = u64;
 type Balance = u128;
 
 pub(crate) type T = Runtime;

frame/root-offences/src/mock.rs

@@ -36,7 +36,7 @@ use sp_std::collections::btree_map::BTreeMap;
 type Block = frame_system::mocking::MockBlock<Test>;
 type AccountId = u64;
 type Balance = u64;
-type BlockNumber = u32;
+type BlockNumber = u64;
 
 pub const INIT_TIMESTAMP: u64 = 30_000;
 pub const BLOCK_TIME: u64 = 1000;

frame/staking/src/mock.rs

@@ -43,7 +43,7 @@ pub const BLOCK_TIME: u64 = 1000;
 /// The AccountId alias in this test module.
 pub(crate) type AccountId = u64;
 pub(crate) type AccountIndex = u64;
-pub(crate) type BlockNumber = u32;
+pub(crate) type BlockNumber = u64;
 pub(crate) type Balance = u128;
 
 /// Another session handler struct to test on_disabled.

frame/support/test/compile_pass/src/lib.rs

@@ -44,7 +44,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 
 pub type Signature = sr25519::Signature;
 pub type AccountId = <Signature as Verify>::Signer;
-pub type BlockNumber = u32;
+pub type BlockNumber = u64;
 pub type Index = u64;
 
 parameter_types! {

frame/utility/src/tests.rs

@@ -37,7 +37,7 @@ use sp_runtime::{
 	TokenError,
 };
 
-type BlockNumber = u32;
+type BlockNumber = u64;
 
 // example module to test behaviors.
 #[frame_support::pallet(dev_mode)]

primitives/test-primitives/src/lib.rs

@@ -69,7 +69,7 @@ pub type AccountId = <AccountSignature as Verify>::Signer;
 /// A simple hash type for all our hashing.
 pub type Hash = H256;
 /// The block number type used in this runtime.
-pub type BlockNumber = u32;
+pub type BlockNumber = u64;
 /// Index of a transaction.
 pub type Index = u64;
 /// The item of a block digest.

test-utils/runtime/src/lib.rs

@@ -154,7 +154,7 @@ pub type Hash = H256;
 /// The hashing algorithm used.
 pub type Hashing = BlakeTwo256;
 /// The block number type used in this runtime.
-pub type BlockNumber = u32;
+pub type BlockNumber = u64;
 /// Index of a transaction.
 pub type Index = u64;
 /// The item of a block digest.

utils/frame/rpc/client/src/lib.rs

@@ -203,7 +203,7 @@ mod tests {
 	use tokio::sync::Mutex;
 
 	type Block = TBlock<ExtrinsicWrapper<()>>;
-	type BlockNumber = u32;
+	type BlockNumber = u64;
 	type Hash = H256;
 
 	struct MockHeaderProvider(pub Arc<Mutex<VecDeque<BlockNumber>>>);