mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-06-20 17:31:02 +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
@@ -24,7 +24,7 @@ use super::*;
|
||||
use frame_benchmarking::v1::{
|
||||
account, benchmarks_instance_pallet, whitelisted_caller, BenchmarkError,
|
||||
};
|
||||
use frame_system::RawOrigin;
|
||||
use frame_system::{pallet_prelude::BlockNumberFor, RawOrigin};
|
||||
use sp_runtime::traits::Bounded;
|
||||
|
||||
use crate::Pallet as Bounties;
|
||||
@@ -77,7 +77,7 @@ fn create_bounty<T: Config<I>, I: 'static>(
|
||||
let approve_origin =
|
||||
T::SpendOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
|
||||
Bounties::<T, I>::approve_bounty(approve_origin.clone(), bounty_id)?;
|
||||
Treasury::<T, I>::on_initialize(T::BlockNumber::zero());
|
||||
Treasury::<T, I>::on_initialize(BlockNumberFor::<T>::zero());
|
||||
Bounties::<T, I>::propose_curator(approve_origin, bounty_id, curator_lookup.clone(), fee)?;
|
||||
Bounties::<T, I>::accept_curator(RawOrigin::Signed(curator).into(), bounty_id)?;
|
||||
Ok((curator_lookup, bounty_id))
|
||||
@@ -115,14 +115,14 @@ benchmarks_instance_pallet! {
|
||||
let bounty_id = BountyCount::<T, I>::get() - 1;
|
||||
let approve_origin = T::SpendOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
|
||||
Bounties::<T, I>::approve_bounty(approve_origin.clone(), bounty_id)?;
|
||||
Treasury::<T, I>::on_initialize(T::BlockNumber::zero());
|
||||
Treasury::<T, I>::on_initialize(BlockNumberFor::<T>::zero());
|
||||
}: _<T::RuntimeOrigin>(approve_origin, bounty_id, curator_lookup, fee)
|
||||
|
||||
// Worst case when curator is inactive and any sender unassigns the curator.
|
||||
unassign_curator {
|
||||
setup_pot_account::<T, I>();
|
||||
let (curator_lookup, bounty_id) = create_bounty::<T, I>()?;
|
||||
Treasury::<T, I>::on_initialize(T::BlockNumber::zero());
|
||||
Treasury::<T, I>::on_initialize(BlockNumberFor::<T>::zero());
|
||||
let bounty_id = BountyCount::<T, I>::get() - 1;
|
||||
frame_system::Pallet::<T>::set_block_number(T::BountyUpdatePeriod::get() + 2u32.into());
|
||||
let caller = whitelisted_caller();
|
||||
@@ -136,14 +136,14 @@ benchmarks_instance_pallet! {
|
||||
let bounty_id = BountyCount::<T, I>::get() - 1;
|
||||
let approve_origin = T::SpendOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
|
||||
Bounties::<T, I>::approve_bounty(approve_origin.clone(), bounty_id)?;
|
||||
Treasury::<T, I>::on_initialize(T::BlockNumber::zero());
|
||||
Treasury::<T, I>::on_initialize(BlockNumberFor::<T>::zero());
|
||||
Bounties::<T, I>::propose_curator(approve_origin, bounty_id, curator_lookup, fee)?;
|
||||
}: _(RawOrigin::Signed(curator), bounty_id)
|
||||
|
||||
award_bounty {
|
||||
setup_pot_account::<T, I>();
|
||||
let (curator_lookup, bounty_id) = create_bounty::<T, I>()?;
|
||||
Treasury::<T, I>::on_initialize(T::BlockNumber::zero());
|
||||
Treasury::<T, I>::on_initialize(BlockNumberFor::<T>::zero());
|
||||
|
||||
let bounty_id = BountyCount::<T, I>::get() - 1;
|
||||
let curator = T::Lookup::lookup(curator_lookup).map_err(<&str>::from)?;
|
||||
@@ -154,7 +154,7 @@ benchmarks_instance_pallet! {
|
||||
claim_bounty {
|
||||
setup_pot_account::<T, I>();
|
||||
let (curator_lookup, bounty_id) = create_bounty::<T, I>()?;
|
||||
Treasury::<T, I>::on_initialize(T::BlockNumber::zero());
|
||||
Treasury::<T, I>::on_initialize(BlockNumberFor::<T>::zero());
|
||||
|
||||
let bounty_id = BountyCount::<T, I>::get() - 1;
|
||||
let curator = T::Lookup::lookup(curator_lookup).map_err(<&str>::from)?;
|
||||
@@ -183,7 +183,7 @@ benchmarks_instance_pallet! {
|
||||
close_bounty_active {
|
||||
setup_pot_account::<T, I>();
|
||||
let (curator_lookup, bounty_id) = create_bounty::<T, I>()?;
|
||||
Treasury::<T, I>::on_initialize(T::BlockNumber::zero());
|
||||
Treasury::<T, I>::on_initialize(BlockNumberFor::<T>::zero());
|
||||
let bounty_id = BountyCount::<T, I>::get() - 1;
|
||||
let approve_origin =
|
||||
T::ApproveOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
|
||||
@@ -195,7 +195,7 @@ benchmarks_instance_pallet! {
|
||||
extend_bounty_expiry {
|
||||
setup_pot_account::<T, I>();
|
||||
let (curator_lookup, bounty_id) = create_bounty::<T, I>()?;
|
||||
Treasury::<T, I>::on_initialize(T::BlockNumber::zero());
|
||||
Treasury::<T, I>::on_initialize(BlockNumberFor::<T>::zero());
|
||||
|
||||
let bounty_id = BountyCount::<T, I>::get() - 1;
|
||||
let curator = T::Lookup::lookup(curator_lookup).map_err(<&str>::from)?;
|
||||
|
||||
Reference in New Issue
Block a user