mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-04-27 08:07:58 +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
@@ -40,7 +40,7 @@ use frame_support::{
|
||||
traits::{Currency, Get, InstanceFilter, IsSubType, IsType, OriginTrait, ReservableCurrency},
|
||||
RuntimeDebug,
|
||||
};
|
||||
use frame_system::{self as system, ensure_signed};
|
||||
use frame_system::{self as system, ensure_signed, pallet_prelude::BlockNumberFor};
|
||||
pub use pallet::*;
|
||||
use scale_info::TypeInfo;
|
||||
use sp_io::hashing::blake2_256;
|
||||
@@ -227,7 +227,7 @@ pub mod pallet {
|
||||
origin: OriginFor<T>,
|
||||
delegate: AccountIdLookupOf<T>,
|
||||
proxy_type: T::ProxyType,
|
||||
delay: T::BlockNumber,
|
||||
delay: BlockNumberFor<T>,
|
||||
) -> DispatchResult {
|
||||
let who = ensure_signed(origin)?;
|
||||
let delegate = T::Lookup::lookup(delegate)?;
|
||||
@@ -247,7 +247,7 @@ pub mod pallet {
|
||||
origin: OriginFor<T>,
|
||||
delegate: AccountIdLookupOf<T>,
|
||||
proxy_type: T::ProxyType,
|
||||
delay: T::BlockNumber,
|
||||
delay: BlockNumberFor<T>,
|
||||
) -> DispatchResult {
|
||||
let who = ensure_signed(origin)?;
|
||||
let delegate = T::Lookup::lookup(delegate)?;
|
||||
@@ -291,7 +291,7 @@ pub mod pallet {
|
||||
pub fn create_pure(
|
||||
origin: OriginFor<T>,
|
||||
proxy_type: T::ProxyType,
|
||||
delay: T::BlockNumber,
|
||||
delay: BlockNumberFor<T>,
|
||||
index: u16,
|
||||
) -> DispatchResult {
|
||||
let who = ensure_signed(origin)?;
|
||||
@@ -341,7 +341,7 @@ pub mod pallet {
|
||||
spawner: AccountIdLookupOf<T>,
|
||||
proxy_type: T::ProxyType,
|
||||
index: u16,
|
||||
#[pallet::compact] height: T::BlockNumber,
|
||||
#[pallet::compact] height: BlockNumberFor<T>,
|
||||
#[pallet::compact] ext_index: u32,
|
||||
) -> DispatchResult {
|
||||
let who = ensure_signed(origin)?;
|
||||
@@ -535,14 +535,14 @@ pub mod pallet {
|
||||
delegator: T::AccountId,
|
||||
delegatee: T::AccountId,
|
||||
proxy_type: T::ProxyType,
|
||||
delay: T::BlockNumber,
|
||||
delay: BlockNumberFor<T>,
|
||||
},
|
||||
/// A proxy was removed.
|
||||
ProxyRemoved {
|
||||
delegator: T::AccountId,
|
||||
delegatee: T::AccountId,
|
||||
proxy_type: T::ProxyType,
|
||||
delay: T::BlockNumber,
|
||||
delay: BlockNumberFor<T>,
|
||||
},
|
||||
}
|
||||
|
||||
@@ -575,7 +575,10 @@ pub mod pallet {
|
||||
Twox64Concat,
|
||||
T::AccountId,
|
||||
(
|
||||
BoundedVec<ProxyDefinition<T::AccountId, T::ProxyType, T::BlockNumber>, T::MaxProxies>,
|
||||
BoundedVec<
|
||||
ProxyDefinition<T::AccountId, T::ProxyType, BlockNumberFor<T>>,
|
||||
T::MaxProxies,
|
||||
>,
|
||||
BalanceOf<T>,
|
||||
),
|
||||
ValueQuery,
|
||||
@@ -589,7 +592,7 @@ pub mod pallet {
|
||||
Twox64Concat,
|
||||
T::AccountId,
|
||||
(
|
||||
BoundedVec<Announcement<T::AccountId, CallHashOf<T>, T::BlockNumber>, T::MaxPending>,
|
||||
BoundedVec<Announcement<T::AccountId, CallHashOf<T>, BlockNumberFor<T>>, T::MaxPending>,
|
||||
BalanceOf<T>,
|
||||
),
|
||||
ValueQuery,
|
||||
@@ -612,7 +615,7 @@ impl<T: Config> Pallet<T> {
|
||||
who: &T::AccountId,
|
||||
proxy_type: &T::ProxyType,
|
||||
index: u16,
|
||||
maybe_when: Option<(T::BlockNumber, u32)>,
|
||||
maybe_when: Option<(BlockNumberFor<T>, u32)>,
|
||||
) -> T::AccountId {
|
||||
let (height, ext_index) = maybe_when.unwrap_or_else(|| {
|
||||
(
|
||||
@@ -638,7 +641,7 @@ impl<T: Config> Pallet<T> {
|
||||
delegator: &T::AccountId,
|
||||
delegatee: T::AccountId,
|
||||
proxy_type: T::ProxyType,
|
||||
delay: T::BlockNumber,
|
||||
delay: BlockNumberFor<T>,
|
||||
) -> DispatchResult {
|
||||
ensure!(delegator != &delegatee, Error::<T>::NoSelfProxy);
|
||||
Proxies::<T>::try_mutate(delegator, |(ref mut proxies, ref mut deposit)| {
|
||||
@@ -678,7 +681,7 @@ impl<T: Config> Pallet<T> {
|
||||
delegator: &T::AccountId,
|
||||
delegatee: T::AccountId,
|
||||
proxy_type: T::ProxyType,
|
||||
delay: T::BlockNumber,
|
||||
delay: BlockNumberFor<T>,
|
||||
) -> DispatchResult {
|
||||
Proxies::<T>::try_mutate_exists(delegator, |x| {
|
||||
let (mut proxies, old_deposit) = x.take().ok_or(Error::<T>::NotFound)?;
|
||||
@@ -734,7 +737,7 @@ impl<T: Config> Pallet<T> {
|
||||
}
|
||||
|
||||
fn edit_announcements<
|
||||
F: FnMut(&Announcement<T::AccountId, CallHashOf<T>, T::BlockNumber>) -> bool,
|
||||
F: FnMut(&Announcement<T::AccountId, CallHashOf<T>, BlockNumberFor<T>>) -> bool,
|
||||
>(
|
||||
delegate: &T::AccountId,
|
||||
f: F,
|
||||
@@ -760,8 +763,8 @@ impl<T: Config> Pallet<T> {
|
||||
real: &T::AccountId,
|
||||
delegate: &T::AccountId,
|
||||
force_proxy_type: Option<T::ProxyType>,
|
||||
) -> Result<ProxyDefinition<T::AccountId, T::ProxyType, T::BlockNumber>, DispatchError> {
|
||||
let f = |x: &ProxyDefinition<T::AccountId, T::ProxyType, T::BlockNumber>| -> bool {
|
||||
) -> Result<ProxyDefinition<T::AccountId, T::ProxyType, BlockNumberFor<T>>, DispatchError> {
|
||||
let f = |x: &ProxyDefinition<T::AccountId, T::ProxyType, BlockNumberFor<T>>| -> bool {
|
||||
&x.delegate == delegate &&
|
||||
force_proxy_type.as_ref().map_or(true, |y| &x.proxy_type == y)
|
||||
};
|
||||
@@ -769,7 +772,7 @@ impl<T: Config> Pallet<T> {
|
||||
}
|
||||
|
||||
fn do_proxy(
|
||||
def: ProxyDefinition<T::AccountId, T::ProxyType, T::BlockNumber>,
|
||||
def: ProxyDefinition<T::AccountId, T::ProxyType, BlockNumberFor<T>>,
|
||||
real: T::AccountId,
|
||||
call: <T as Config>::RuntimeCall,
|
||||
) {
|
||||
|
||||
Reference in New Issue
Block a user