mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-06-12 22:51:13 +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
@@ -32,7 +32,7 @@ use sp_core::H256;
|
||||
use sp_io;
|
||||
use sp_runtime::{
|
||||
curve::PiecewiseLinear,
|
||||
testing::{Header, UintAuthorityId},
|
||||
testing::UintAuthorityId,
|
||||
traits::{IdentityLookup, Zero},
|
||||
BuildStorage,
|
||||
};
|
||||
@@ -83,14 +83,10 @@ pub fn is_disabled(controller: AccountId) -> bool {
|
||||
Session::disabled_validators().contains(&validator_index)
|
||||
}
|
||||
|
||||
type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
|
||||
type Block = frame_system::mocking::MockBlock<Test>;
|
||||
|
||||
frame_support::construct_runtime!(
|
||||
pub enum Test where
|
||||
Block = Block,
|
||||
NodeBlock = Block,
|
||||
UncheckedExtrinsic = UncheckedExtrinsic,
|
||||
pub enum Test
|
||||
{
|
||||
System: frame_system,
|
||||
Authorship: pallet_authorship,
|
||||
@@ -129,13 +125,12 @@ impl frame_system::Config for Test {
|
||||
type DbWeight = RocksDbWeight;
|
||||
type RuntimeOrigin = RuntimeOrigin;
|
||||
type Index = AccountIndex;
|
||||
type BlockNumber = BlockNumber;
|
||||
type RuntimeCall = RuntimeCall;
|
||||
type Hash = H256;
|
||||
type Hashing = ::sp_runtime::traits::BlakeTwo256;
|
||||
type AccountId = AccountId;
|
||||
type Lookup = IdentityLookup<Self::AccountId>;
|
||||
type Header = Header;
|
||||
type Block = Block;
|
||||
type RuntimeEvent = RuntimeEvent;
|
||||
type BlockHashCount = frame_support::traits::ConstU64<250>;
|
||||
type Version = ();
|
||||
|
||||
@@ -1022,7 +1022,7 @@ impl<T: Config> ElectionDataProvider for Pallet<T> {
|
||||
Ok(Self::get_npos_targets(None))
|
||||
}
|
||||
|
||||
fn next_election_prediction(now: T::BlockNumber) -> T::BlockNumber {
|
||||
fn next_election_prediction(now: BlockNumberFor<T>) -> BlockNumberFor<T> {
|
||||
let current_era = Self::current_era().unwrap_or(0);
|
||||
let current_session = Self::current_planned_session();
|
||||
let current_era_start_session_index =
|
||||
@@ -1039,7 +1039,7 @@ impl<T: Config> ElectionDataProvider for Pallet<T> {
|
||||
|
||||
let session_length = T::NextNewSession::average_session_length();
|
||||
|
||||
let sessions_left: T::BlockNumber = match ForceEra::<T>::get() {
|
||||
let sessions_left: BlockNumberFor<T> = match ForceEra::<T>::get() {
|
||||
Forcing::ForceNone => Bounded::max_value(),
|
||||
Forcing::ForceNew | Forcing::ForceAlways => Zero::zero(),
|
||||
Forcing::NotForcing if era_progress >= T::SessionsPerEra::get() => Zero::zero(),
|
||||
@@ -1238,7 +1238,7 @@ impl<T: Config> historical::SessionManager<T::AccountId, Exposure<T::AccountId,
|
||||
|
||||
/// Add reward points to block authors:
|
||||
/// * 20 points to the block producer for producing a (non-uncle) block,
|
||||
impl<T> pallet_authorship::EventHandler<T::AccountId, T::BlockNumber> for Pallet<T>
|
||||
impl<T> pallet_authorship::EventHandler<T::AccountId, BlockNumberFor<T>> for Pallet<T>
|
||||
where
|
||||
T: Config + pallet_authorship::Config + pallet_session::Config,
|
||||
{
|
||||
|
||||
@@ -87,7 +87,7 @@ pub mod pallet {
|
||||
/// The staking balance.
|
||||
type Currency: LockableCurrency<
|
||||
Self::AccountId,
|
||||
Moment = Self::BlockNumber,
|
||||
Moment = BlockNumberFor<Self>,
|
||||
Balance = Self::CurrencyBalance,
|
||||
>;
|
||||
/// Just the `Currency::Balance` type; we have this item to allow us to constrain it to
|
||||
@@ -118,14 +118,14 @@ pub mod pallet {
|
||||
/// Something that provides the election functionality.
|
||||
type ElectionProvider: ElectionProvider<
|
||||
AccountId = Self::AccountId,
|
||||
BlockNumber = Self::BlockNumber,
|
||||
BlockNumber = BlockNumberFor<Self>,
|
||||
// we only accept an election provider that has staking as data provider.
|
||||
DataProvider = Pallet<Self>,
|
||||
>;
|
||||
/// Something that provides the election functionality at genesis.
|
||||
type GenesisElectionProvider: ElectionProvider<
|
||||
AccountId = Self::AccountId,
|
||||
BlockNumber = Self::BlockNumber,
|
||||
BlockNumber = BlockNumberFor<Self>,
|
||||
DataProvider = Pallet<Self>,
|
||||
>;
|
||||
|
||||
@@ -200,7 +200,7 @@ pub mod pallet {
|
||||
|
||||
/// Something that can estimate the next session change, accurately or as a best effort
|
||||
/// guess.
|
||||
type NextNewSession: EstimateNextNewSession<Self::BlockNumber>;
|
||||
type NextNewSession: EstimateNextNewSession<BlockNumberFor<Self>>;
|
||||
|
||||
/// The maximum number of nominators rewarded for each validator.
|
||||
///
|
||||
|
||||
Reference in New Issue
Block a user