Moves Block to frame_system instead of construct_runtime and removes Header and BlockNumber (#14437)

* Initial setup * Adds node block * Uses UncheckedExtrinsic and removes Where section * Updates frame_system to use Block * Adds deprecation warning * Fixes pallet-timestamp * Removes Header and BlockNumber * Addresses review comments * Addresses review comments * Adds comment about compiler bug * Removes where clause * Refactors code * Fixes errors in cargo check * Fixes errors in cargo check * Fixes warnings in cargo check * Formatting * Fixes construct_runtime tests * Uses import instead of full path for BlockNumber * Uses import instead of full path for Header * Formatting * Fixes construct_runtime tests * Fixes imports in benchmarks * Formatting * Fixes construct_runtime tests * Formatting * Minor updates * Fixes construct_runtime ui tests * Fixes construct_runtime ui tests with 1.70 * Fixes docs * Fixes docs * Adds u128 mock block type * Fixes split example * fixes for cumulus * ".git/.scripts/commands/fmt/fmt.sh" * Updates new tests * Fixes fully-qualified path in few places * Formatting * Update frame/examples/default-config/src/lib.rs Co-authored-by: Juan <juangirini@gmail.com> * Update frame/support/procedural/src/construct_runtime/mod.rs Co-authored-by: Juan <juangirini@gmail.com> * ".git/.scripts/commands/fmt/fmt.sh" * Addresses some review comments * Fixes build * ".git/.scripts/commands/fmt/fmt.sh" * Update frame/democracy/src/lib.rs Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Update frame/democracy/src/lib.rs Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Update frame/support/procedural/src/construct_runtime/mod.rs Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Update frame/support/procedural/src/construct_runtime/mod.rs Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Addresses review comments * Updates trait bounds * Minor fix * ".git/.scripts/commands/fmt/fmt.sh" * Removes unnecessary bound * ".git/.scripts/commands/fmt/fmt.sh" * Updates test * Fixes build * Adds a bound for header * ".git/.scripts/commands/fmt/fmt.sh" * Removes where block * Minor fix * Minor fix * Fixes tests * ".git/.scripts/commands/update-ui/update-ui.sh" 1.70 * Updates test * Update primitives/runtime/src/traits.rs Co-authored-by: Bastian Köcher <git@kchr.de> * Update primitives/runtime/src/traits.rs Co-authored-by: Bastian Köcher <git@kchr.de> * Updates doc * Updates doc --------- Co-authored-by: command-bot <> Co-authored-by: Juan <juangirini@gmail.com> Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> Co-authored-by: Bastian Köcher <git@kchr.de>
2026-06-15 03:21:06 +00:00 · 2023-07-13 17:31:34 +05:30
parent e42a669c50
commit 5e7b27e98c
277 changed files with 2017 additions and 2450 deletions
@@ -362,6 +362,7 @@ use frame_support::{
 	},
 	DefaultNoBound, PalletError,
 };
+use frame_system::pallet_prelude::BlockNumberFor;
 use scale_info::TypeInfo;
 use sp_core::U256;
 use sp_runtime::{
@@ -672,10 +673,10 @@ pub struct Commission<T: Config> {
 	pub max: Option<Perbill>,
 	/// Optional configuration around how often commission can be updated, and when the last
 	/// commission update took place.
-	pub change_rate: Option<CommissionChangeRate<T::BlockNumber>>,
+	pub change_rate: Option<CommissionChangeRate<BlockNumberFor<T>>>,
 	/// The block from where throttling should be checked from. This value will be updated on all
 	/// commission updates and when setting an initial `change_rate`.
-	pub throttle_from: Option<T::BlockNumber>,
+	pub throttle_from: Option<BlockNumberFor<T>>,
 }

 impl<T: Config> Commission<T> {
@@ -817,7 +818,7 @@ impl<T: Config> Commission<T> {
 	/// throttling can be checked from this block.
 	fn try_update_change_rate(
 		&mut self,
-		change_rate: CommissionChangeRate<T::BlockNumber>,
+		change_rate: CommissionChangeRate<BlockNumberFor<T>>,
 	) -> DispatchResult {
 		ensure!(!&self.less_restrictive(&change_rate), Error::<T>::CommissionChangeRateNotAllowed);

@@ -837,7 +838,7 @@ impl<T: Config> Commission<T> {
 	///
 	/// No change rate will always be less restrictive than some change rate, so where no
 	/// `change_rate` is currently set, `false` is returned.
-	fn less_restrictive(&self, new: &CommissionChangeRate<T::BlockNumber>) -> bool {
+	fn less_restrictive(&self, new: &CommissionChangeRate<BlockNumberFor<T>>) -> bool {
 		self.change_rate
 			.as_ref()
 			.map(|c| new.max_increase > c.max_increase || new.min_delay < c.min_delay)
@@ -1765,7 +1766,7 @@ pub mod pallet {
 		/// A pool's commission `change_rate` has been changed.
 		PoolCommissionChangeRateUpdated {
 			pool_id: PoolId,
-			change_rate: CommissionChangeRate<T::BlockNumber>,
+			change_rate: CommissionChangeRate<BlockNumberFor<T>>,
 		},
 		/// Pool commission has been claimed.
 		PoolCommissionClaimed { pool_id: PoolId, commission: BalanceOf<T> },
@@ -2603,7 +2604,7 @@ pub mod pallet {
 		pub fn set_commission_change_rate(
 			origin: OriginFor<T>,
 			pool_id: PoolId,
-			change_rate: CommissionChangeRate<T::BlockNumber>,
+			change_rate: CommissionChangeRate<BlockNumberFor<T>>,
 		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			let mut bonded_pool = BondedPool::<T>::get(pool_id).ok_or(Error::<T>::PoolNotFound)?;