mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-06-13 10:31:04 +00:00
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>
This commit is contained in:
gupnik
@@ -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)?;
|
||||
|
||||
@@ -169,13 +169,12 @@ impl frame_system::Config for Runtime {
|
||||
type BaseCallFilter = frame_support::traits::Everything;
|
||||
type RuntimeOrigin = RuntimeOrigin;
|
||||
type Index = u64;
|
||||
type BlockNumber = BlockNumber;
|
||||
type RuntimeCall = RuntimeCall;
|
||||
type Hash = sp_core::H256;
|
||||
type Hashing = sp_runtime::traits::BlakeTwo256;
|
||||
type AccountId = AccountId;
|
||||
type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
|
||||
type Header = sp_runtime::testing::Header;
|
||||
type Block = Block;
|
||||
type RuntimeEvent = RuntimeEvent;
|
||||
type BlockHashCount = ();
|
||||
type DbWeight = ();
|
||||
@@ -246,13 +245,9 @@ impl pools::Config for Runtime {
|
||||
type MaxPointsToBalance = frame_support::traits::ConstU8<10>;
|
||||
}
|
||||
|
||||
type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
|
||||
type Block = frame_system::mocking::MockBlock<Runtime>;
|
||||
frame_support::construct_runtime!(
|
||||
pub struct Runtime where
|
||||
Block = Block,
|
||||
NodeBlock = Block,
|
||||
UncheckedExtrinsic = UncheckedExtrinsic,
|
||||
pub struct Runtime
|
||||
{
|
||||
System: frame_system::{Pallet, Call, Storage, Event<T>, Config<T>},
|
||||
Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
|
||||
|
||||
Reference in New Issue
Block a user