feat: remove BlockNumberFor clauses

Author: ashutoshvarma

pallets/dapp-staking-migration/src/benchmarking.rs

@@ -33,10 +33,7 @@ fn smart_contract<T: pallet_dapps_staking::Config>(index: u8) -> T::SmartContrac
 }
 
 /// Initialize the old dApp staking pallet with some storage.
-pub(super) fn initial_config<T: Config>()
-where
-    BlockNumberFor<T>: IsType<BlockNumber>,
-{
+pub(super) fn initial_config<T: Config>() {
     let dapps_number = <T as pallet_dapp_staking_v3::Config>::MaxNumberOfContracts::get();
     let dapps_number = (dapps_number as u8).min(100);
 
@@ -69,10 +66,7 @@ where
     }
 }
 
-#[benchmarks(
-    where
-        BlockNumberFor<T>: IsType<BlockNumber>,
-)]
+#[benchmarks]
 mod benchmarks {
     use super::*;
 

pallets/dapp-staking-migration/src/lib.rs

@@ -98,8 +98,6 @@ pub mod pallet {
     pub trait Config:
         // Tight coupling, but it's fine since pallet is supposed to be just temporary and will be removed after migration.
         frame_system::Config + pallet_dapp_staking_v3::Config + pallet_dapps_staking::Config
-            where
-            BlockNumberFor<Self>: IsType<BlockNumber>,
     {
         /// The overarching event type.
         type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
@@ -114,21 +112,15 @@ pub mod pallet {
 
     #[pallet::event]
     #[pallet::generate_deposit(pub(crate) fn deposit_event)]
-    pub enum Event<T: Config>
-    where
-        BlockNumberFor<T>: IsType<BlockNumber>,
-    {
+    pub enum Event<T: Config> {
         /// Number of entries migrated from v2 over to v3
         EntriesMigrated(u32),
         /// Number of entries deleted from v2
         EntriesDeleted(u32),
     }
 
     #[pallet::call]
-    impl<T: Config> Pallet<T>
-    where
-        BlockNumberFor<T>: IsType<BlockNumber>,
-    {
+    impl<T: Config> Pallet<T> {
         /// Attempt to execute migration steps, consuming up to the specified amount of weight.
         /// If no weight is specified, max allowed weight is used.
         ///
@@ -161,10 +153,7 @@ pub mod pallet {
     }
 
     #[pallet::hooks]
-    impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T>
-    where
-        BlockNumberFor<T>: IsType<BlockNumber>,
-    {
+    impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
         fn integrity_test() {
             assert!(Pallet::<T>::max_call_weight().all_gte(Pallet::<T>::min_call_weight()));
 
@@ -175,10 +164,7 @@ pub mod pallet {
         }
     }
 
-    impl<T: Config> Pallet<T>
-    where
-        BlockNumberFor<T>: IsType<BlockNumber>,
-    {
+    impl<T: Config> Pallet<T> {
         /// Execute migrations steps until the specified weight limit has been consumed.
         ///
         /// Depending on the number of entries migrated and/or deleted, appropriate events are emitted.
@@ -533,13 +519,8 @@ pub mod pallet {
         }
     }
 
-    pub struct DappStakingMigrationHandler<T: Config>(PhantomData<T>)
-    where
-        BlockNumberFor<T>: IsType<BlockNumber>;
-    impl<T: Config> frame_support::traits::OnRuntimeUpgrade for DappStakingMigrationHandler<T>
-    where
-        BlockNumberFor<T>: IsType<BlockNumber>,
-    {
+    pub struct DappStakingMigrationHandler<T: Config>(PhantomData<T>);
+    impl<T: Config> frame_support::traits::OnRuntimeUpgrade for DappStakingMigrationHandler<T> {
         fn on_runtime_upgrade() -> Weight {
             // When upgrade happens, we need to put dApp staking v3 into maintenance mode immediately.
             // For the old pallet, since the storage cleanup is going to happen, maintenance mode must be ensured
@@ -732,10 +713,7 @@ pub mod pallet {
 #[cfg(feature = "try-runtime")]
 /// Used to help with `try-runtime` testing.
 #[derive(Encode, Decode)]
-struct Helper<T: Config>
-where
-    BlockNumberFor<T>: IsType<BlockNumber>,
-{
+struct Helper<T: Config> {
     /// Vec of devs, with their associated smart contract & total reserved balance
     developers: Vec<(
         T::AccountId,

pallets/dapp-staking-v3/src/benchmarking/mod.rs

@@ -35,10 +35,7 @@ use utils::*;
 //
 // Without this optimization, benchmarks can take hours to execute for production runtimes.
 
-#[benchmarks(
-    where
-        BlockNumberFor<T>: IsType<BlockNumber>,
-)]
+#[benchmarks()]
 mod benchmarks {
     use super::*;
 
@@ -307,10 +304,10 @@ mod benchmarks {
 
         // Hack
         // In order to speed up the benchmark, we reduce how long it takes to unlock the chunks
-        let mut counter = 1;
+        let mut counter = 1u32;
         Ledger::<T>::mutate(&staker, |ledger| {
             ledger.unlocking.iter_mut().for_each(|unlocking| {
-                unlocking.unlock_block = (System::<T>::block_number() + counter.into()).into();
+                unlocking.unlock_block = (System::<T>::block_number() + counter.into()).saturated_into();
             });
             counter += 1;
         });

pallets/dapp-staking-v3/src/benchmarking/utils.rs

@@ -24,34 +24,25 @@ use frame_system::Pallet as System;
 
 /// Run to the specified block number.
 /// Function assumes first block has been initialized.
-pub(super) fn run_to_block<T: Config>(n: BlockNumberFor<T>)
-where
-    BlockNumberFor<T>: IsType<BlockNumber>,
-{
+pub(super) fn run_to_block<T: Config>(n: BlockNumberFor<T>) {
     while System::<T>::block_number() < n {
         DappStaking::<T>::on_finalize(System::<T>::block_number());
-        System::<T>::set_block_number(System::<T>::block_number() + 1.into());
+        System::<T>::set_block_number(System::<T>::block_number() + 1u32.into());
         // This is performed outside of dapps staking but we expect it before on_initialize
         DappStaking::<T>::on_initialize(System::<T>::block_number());
     }
 }
 
 /// Run for the specified number of blocks.
 /// Function assumes first block has been initialized.
-pub(super) fn run_for_blocks<T: Config>(n: BlockNumberFor<T>)
-where
-    BlockNumberFor<T>: IsType<BlockNumber>,
-{
+pub(super) fn run_for_blocks<T: Config>(n: BlockNumberFor<T>) {
     run_to_block::<T>(System::<T>::block_number() + n);
 }
 
 /// Advance blocks until the specified era has been reached.
 ///
 /// Function has no effect if era is already passed.
-pub(super) fn advance_to_era<T: Config>(era: EraNumber)
-where
-    BlockNumberFor<T>: IsType<BlockNumber>,
-{
+pub(super) fn advance_to_era<T: Config>(era: EraNumber) {
     assert!(era >= ActiveProtocolState::<T>::get().era);
     while ActiveProtocolState::<T>::get().era < era {
         run_for_blocks::<T>(One::one());
@@ -61,10 +52,7 @@ where
 /// Advance blocks until the specified era has been reached.
 ///
 /// Relies on the `force` approach to advance one era per block.
-pub(super) fn force_advance_to_era<T: Config>(era: EraNumber)
-where
-    BlockNumberFor<T>: IsType<BlockNumber>,
-{
+pub(super) fn force_advance_to_era<T: Config>(era: EraNumber) {
     assert!(era > ActiveProtocolState::<T>::get().era);
     while ActiveProtocolState::<T>::get().era < era {
         assert_ok!(DappStaking::<T>::force(
@@ -76,18 +64,12 @@ where
 }
 
 /// Advance blocks until next era has been reached.
-pub(super) fn _advance_to_next_era<T: Config>()
-where
-    BlockNumberFor<T>: IsType<BlockNumber>,
-{
+pub(super) fn _advance_to_next_era<T: Config>() {
     advance_to_era::<T>(ActiveProtocolState::<T>::get().era + 1);
 }
 
 /// Advance to next era, in the next block using the `force` approach.
-pub(crate) fn force_advance_to_next_era<T: Config>()
-where
-    BlockNumberFor<T>: IsType<BlockNumber>,
-{
+pub(crate) fn force_advance_to_next_era<T: Config>() {
     assert_ok!(DappStaking::<T>::force(
         RawOrigin::Root.into(),
         ForcingType::Era
@@ -98,10 +80,7 @@ where
 /// Advance blocks until next period has been reached.
 ///
 /// Relies on the `force` approach to advance one subperiod per block.
-pub(super) fn force_advance_to_next_period<T: Config>()
-where
-    BlockNumberFor<T>: IsType<BlockNumber>,
-{
+pub(super) fn force_advance_to_next_period<T: Config>() {
     let init_period_number = ActiveProtocolState::<T>::get().period_number();
     while ActiveProtocolState::<T>::get().period_number() == init_period_number {
         assert_ok!(DappStaking::<T>::force(
@@ -113,21 +92,15 @@ where
 }
 
 /// Advance to the specified period, using the `force` approach.
-pub(super) fn force_advance_to_period<T: Config>(period: PeriodNumber)
-where
-    BlockNumberFor<T>: IsType<BlockNumber>,
-{
+pub(super) fn force_advance_to_period<T: Config>(period: PeriodNumber) {
     assert!(period >= ActiveProtocolState::<T>::get().period_number());
     while ActiveProtocolState::<T>::get().period_number() < period {
         force_advance_to_next_subperiod::<T>();
     }
 }
 
 /// Use the `force` approach to advance to the next subperiod immediately in the next block.
-pub(super) fn force_advance_to_next_subperiod<T: Config>()
-where
-    BlockNumberFor<T>: IsType<BlockNumber>,
-{
+pub(super) fn force_advance_to_next_subperiod<T: Config>() {
     assert_ok!(DappStaking::<T>::force(
         RawOrigin::Root.into(),
         ForcingType::Subperiod
@@ -148,18 +121,12 @@ pub(super) const NUMBER_OF_SLOTS: u32 = 100;
 pub(super) const SEED: u32 = 9000;
 
 /// Assert that the last event equals the provided one.
-pub(super) fn assert_last_event<T: Config>(generic_event: <T as Config>::RuntimeEvent)
-where
-    BlockNumberFor<T>: IsType<BlockNumber>,
-{
+pub(super) fn assert_last_event<T: Config>(generic_event: <T as Config>::RuntimeEvent) {
     frame_system::Pallet::<T>::assert_last_event(generic_event.into());
 }
 
 // Return all dApp staking events from the event buffer.
-pub(super) fn dapp_staking_events<T: Config>() -> Vec<crate::Event<T>>
-where
-    BlockNumberFor<T>: IsType<BlockNumber>,
-{
+pub(super) fn dapp_staking_events<T: Config>() -> Vec<crate::Event<T>> {
     System::<T>::events()
         .into_iter()
         .map(|r| r.event)
@@ -171,10 +138,7 @@ where
 ///
 /// **NOTE:** This assumes similar tier configuration for all runtimes.
 /// If we decide to change this, we'll need to provide a more generic init function.
-pub(super) fn initial_config<T: Config>()
-where
-    BlockNumberFor<T>: IsType<BlockNumber>,
-{
+pub(super) fn initial_config<T: Config>() {
     let era_length = T::CycleConfiguration::blocks_per_era();
     let voting_period_length_in_eras = T::CycleConfiguration::eras_per_voting_subperiod();
 
@@ -244,21 +208,15 @@ where
 }
 
 /// Maximum number of contracts that 'makes sense' - considers both contract number limit & number of slots.
-pub(super) fn max_number_of_contracts<T: Config>() -> u32
-where
-    BlockNumberFor<T>: IsType<BlockNumber>,
-{
+pub(super) fn max_number_of_contracts<T: Config>() -> u32 {
     T::MaxNumberOfContracts::get().min(NUMBER_OF_SLOTS).into()
 }
 
 /// Registers & staked on the specified number of smart contracts
 ///
 /// Stake amounts are decided in such a way to maximize tier filling rate.
 /// This means that all of the contracts should end up in some tier.
-pub(super) fn prepare_contracts_for_tier_assignment<T: Config>(x: u32)
-where
-    BlockNumberFor<T>: IsType<BlockNumber>,
-{
+pub(super) fn prepare_contracts_for_tier_assignment<T: Config>(x: u32) {
     let developer: T::AccountId = whitelisted_caller();
     for id in 0..x {
         let smart_contract = T::BenchmarkHelper::get_smart_contract(id as u32);
@@ -308,20 +266,14 @@ fn trivial_fisher_yates_shuffle<T>(vector: &mut Vec<T>, random_seed: u64) {
 /// Returns max amount of rewards that can be claimed in a single claim reward call from a past period.
 ///
 /// Bounded by era reward span length & number of eras per period (not length but absolute number).
-pub(super) fn max_claim_size_past_period<T: Config>() -> u32
-where
-    BlockNumberFor<T>: IsType<BlockNumber>,
-{
+pub(super) fn max_claim_size_past_period<T: Config>() -> u32 {
     T::EraRewardSpanLength::get().min(T::CycleConfiguration::eras_per_build_and_earn_subperiod())
 }
 
 /// Returns max amount of rewards that can be claimed in a single claim reward call from an ongoing period.
 ///
 /// Bounded by era reward span length & number of eras per period (not length but absolute number).
-pub(super) fn max_claim_size_ongoing_period<T: Config>() -> u32
-where
-    BlockNumberFor<T>: IsType<BlockNumber>,
-{
+pub(super) fn max_claim_size_ongoing_period<T: Config>() -> u32 {
     T::EraRewardSpanLength::get()
         .min(T::CycleConfiguration::eras_per_build_and_earn_subperiod() - 1)
 }