mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-06-12 20:31: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
@@ -59,7 +59,7 @@ use frame_support::{
|
||||
weights::Weight,
|
||||
BoundedVec, RuntimeDebug,
|
||||
};
|
||||
use frame_system::{self as system, RawOrigin};
|
||||
use frame_system::{self as system, pallet_prelude::BlockNumberFor, RawOrigin};
|
||||
use scale_info::TypeInfo;
|
||||
use sp_io::hashing::blake2_256;
|
||||
use sp_runtime::{
|
||||
@@ -183,7 +183,7 @@ pub mod pallet {
|
||||
T::AccountId,
|
||||
Blake2_128Concat,
|
||||
[u8; 32],
|
||||
Multisig<T::BlockNumber, BalanceOf<T>, T::AccountId, T::MaxSignatories>,
|
||||
Multisig<BlockNumberFor<T>, BalanceOf<T>, T::AccountId, T::MaxSignatories>,
|
||||
>;
|
||||
|
||||
#[pallet::error]
|
||||
@@ -226,14 +226,14 @@ pub mod pallet {
|
||||
/// A multisig operation has been approved by someone.
|
||||
MultisigApproval {
|
||||
approving: T::AccountId,
|
||||
timepoint: Timepoint<T::BlockNumber>,
|
||||
timepoint: Timepoint<BlockNumberFor<T>>,
|
||||
multisig: T::AccountId,
|
||||
call_hash: CallHash,
|
||||
},
|
||||
/// A multisig operation has been executed.
|
||||
MultisigExecuted {
|
||||
approving: T::AccountId,
|
||||
timepoint: Timepoint<T::BlockNumber>,
|
||||
timepoint: Timepoint<BlockNumberFor<T>>,
|
||||
multisig: T::AccountId,
|
||||
call_hash: CallHash,
|
||||
result: DispatchResult,
|
||||
@@ -241,7 +241,7 @@ pub mod pallet {
|
||||
/// A multisig operation has been cancelled.
|
||||
MultisigCancelled {
|
||||
cancelling: T::AccountId,
|
||||
timepoint: Timepoint<T::BlockNumber>,
|
||||
timepoint: Timepoint<BlockNumberFor<T>>,
|
||||
multisig: T::AccountId,
|
||||
call_hash: CallHash,
|
||||
},
|
||||
@@ -366,7 +366,7 @@ pub mod pallet {
|
||||
origin: OriginFor<T>,
|
||||
threshold: u16,
|
||||
other_signatories: Vec<T::AccountId>,
|
||||
maybe_timepoint: Option<Timepoint<T::BlockNumber>>,
|
||||
maybe_timepoint: Option<Timepoint<BlockNumberFor<T>>>,
|
||||
call: Box<<T as Config>::RuntimeCall>,
|
||||
max_weight: Weight,
|
||||
) -> DispatchResultWithPostInfo {
|
||||
@@ -423,7 +423,7 @@ pub mod pallet {
|
||||
origin: OriginFor<T>,
|
||||
threshold: u16,
|
||||
other_signatories: Vec<T::AccountId>,
|
||||
maybe_timepoint: Option<Timepoint<T::BlockNumber>>,
|
||||
maybe_timepoint: Option<Timepoint<BlockNumberFor<T>>>,
|
||||
call_hash: [u8; 32],
|
||||
max_weight: Weight,
|
||||
) -> DispatchResultWithPostInfo {
|
||||
@@ -465,7 +465,7 @@ pub mod pallet {
|
||||
origin: OriginFor<T>,
|
||||
threshold: u16,
|
||||
other_signatories: Vec<T::AccountId>,
|
||||
timepoint: Timepoint<T::BlockNumber>,
|
||||
timepoint: Timepoint<BlockNumberFor<T>>,
|
||||
call_hash: [u8; 32],
|
||||
) -> DispatchResult {
|
||||
let who = ensure_signed(origin)?;
|
||||
@@ -511,7 +511,7 @@ impl<T: Config> Pallet<T> {
|
||||
who: T::AccountId,
|
||||
threshold: u16,
|
||||
other_signatories: Vec<T::AccountId>,
|
||||
maybe_timepoint: Option<Timepoint<T::BlockNumber>>,
|
||||
maybe_timepoint: Option<Timepoint<BlockNumberFor<T>>>,
|
||||
call_or_hash: CallOrHash<T>,
|
||||
max_weight: Weight,
|
||||
) -> DispatchResultWithPostInfo {
|
||||
@@ -637,7 +637,7 @@ impl<T: Config> Pallet<T> {
|
||||
}
|
||||
|
||||
/// The current `Timepoint`.
|
||||
pub fn timepoint() -> Timepoint<T::BlockNumber> {
|
||||
pub fn timepoint() -> Timepoint<BlockNumberFor<T>> {
|
||||
Timepoint {
|
||||
height: <system::Pallet<T>>::block_number(),
|
||||
index: <system::Pallet<T>>::extrinsic_index().unwrap_or_default(),
|
||||
|
||||
@@ -28,19 +28,14 @@ use frame_support::{
|
||||
};
|
||||
use sp_core::H256;
|
||||
use sp_runtime::{
|
||||
testing::Header,
|
||||
traits::{BlakeTwo256, IdentityLookup},
|
||||
BuildStorage, TokenError,
|
||||
};
|
||||
|
||||
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::{Pallet, Call, Config<T>, Storage, Event<T>},
|
||||
Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
|
||||
@@ -55,13 +50,12 @@ impl frame_system::Config for Test {
|
||||
type DbWeight = ();
|
||||
type RuntimeOrigin = RuntimeOrigin;
|
||||
type Index = u64;
|
||||
type BlockNumber = u64;
|
||||
type Hash = H256;
|
||||
type RuntimeCall = RuntimeCall;
|
||||
type Hashing = BlakeTwo256;
|
||||
type AccountId = u64;
|
||||
type Lookup = IdentityLookup<Self::AccountId>;
|
||||
type Header = Header;
|
||||
type Block = Block;
|
||||
type RuntimeEvent = RuntimeEvent;
|
||||
type BlockHashCount = ConstU64<250>;
|
||||
type Version = ();
|
||||
|
||||
Reference in New Issue
Block a user