mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-04-26 14:37:57 +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
@@ -16,8 +16,10 @@
|
||||
// limitations under the License.
|
||||
|
||||
use codec::Encode;
|
||||
use frame_support::{storage::unhashed, StoragePrefixedMap};
|
||||
use sp_core::sr25519;
|
||||
use frame_support::{derive_impl, storage::unhashed, StoragePrefixedMap};
|
||||
use frame_system::pallet_prelude::BlockNumberFor;
|
||||
|
||||
use sp_core::{sr25519, ConstU32};
|
||||
use sp_io::{
|
||||
hashing::{blake2_128, twox_128, twox_64},
|
||||
TestExternalities,
|
||||
@@ -31,7 +33,6 @@ use sp_runtime::{
|
||||
mod no_instance {
|
||||
use super::*;
|
||||
use frame_support::pallet_prelude::*;
|
||||
use frame_support_test as frame_system;
|
||||
|
||||
#[pallet::pallet]
|
||||
pub struct Pallet<T>(_);
|
||||
@@ -59,7 +60,7 @@ mod no_instance {
|
||||
|
||||
#[pallet::storage]
|
||||
#[pallet::getter(fn test_generic_value)]
|
||||
pub type TestGenericValue<T: Config> = StorageValue<_, T::BlockNumber, OptionQuery>;
|
||||
pub type TestGenericValue<T: Config> = StorageValue<_, BlockNumberFor<T>, OptionQuery>;
|
||||
#[pallet::storage]
|
||||
#[pallet::getter(fn foo2)]
|
||||
pub type TestGenericDoubleMap<T: Config> = StorageDoubleMap<
|
||||
@@ -67,7 +68,7 @@ mod no_instance {
|
||||
Blake2_128Concat,
|
||||
u32,
|
||||
Blake2_128Concat,
|
||||
T::BlockNumber,
|
||||
BlockNumberFor<T>,
|
||||
u32,
|
||||
ValueQuery,
|
||||
>;
|
||||
@@ -75,8 +76,8 @@ mod no_instance {
|
||||
#[pallet::genesis_config]
|
||||
pub struct GenesisConfig<T: Config> {
|
||||
pub value: u32,
|
||||
pub test_generic_value: T::BlockNumber,
|
||||
pub test_generic_double_map: Vec<(u32, T::BlockNumber, u32)>,
|
||||
pub test_generic_value: BlockNumberFor<T>,
|
||||
pub test_generic_double_map: Vec<(u32, BlockNumberFor<T>, u32)>,
|
||||
}
|
||||
|
||||
impl<T: Config> Default for GenesisConfig<T> {
|
||||
@@ -105,7 +106,6 @@ mod no_instance {
|
||||
mod instance {
|
||||
use super::*;
|
||||
use frame_support::pallet_prelude::*;
|
||||
use frame_support_test as frame_system;
|
||||
|
||||
#[pallet::pallet]
|
||||
pub struct Pallet<T, I = ()>(PhantomData<(T, I)>);
|
||||
@@ -136,7 +136,7 @@ mod instance {
|
||||
#[pallet::storage]
|
||||
#[pallet::getter(fn test_generic_value)]
|
||||
pub type TestGenericValue<T: Config<I>, I: 'static = ()> =
|
||||
StorageValue<_, T::BlockNumber, OptionQuery>;
|
||||
StorageValue<_, BlockNumberFor<T>, OptionQuery>;
|
||||
#[pallet::storage]
|
||||
#[pallet::getter(fn foo2)]
|
||||
pub type TestGenericDoubleMap<T: Config<I>, I: 'static = ()> = StorageDoubleMap<
|
||||
@@ -144,7 +144,7 @@ mod instance {
|
||||
Blake2_128Concat,
|
||||
u32,
|
||||
Blake2_128Concat,
|
||||
T::BlockNumber,
|
||||
BlockNumberFor<T>,
|
||||
u32,
|
||||
ValueQuery,
|
||||
>;
|
||||
@@ -152,8 +152,8 @@ mod instance {
|
||||
#[pallet::genesis_config]
|
||||
pub struct GenesisConfig<T: Config<I>, I: 'static = ()> {
|
||||
pub value: u32,
|
||||
pub test_generic_value: T::BlockNumber,
|
||||
pub test_generic_double_map: Vec<(u32, T::BlockNumber, u32)>,
|
||||
pub test_generic_value: BlockNumberFor<T>,
|
||||
pub test_generic_double_map: Vec<(u32, BlockNumberFor<T>, u32)>,
|
||||
pub phantom: PhantomData<I>,
|
||||
}
|
||||
|
||||
@@ -201,27 +201,25 @@ pub type Block = generic::Block<Header, UncheckedExtrinsic>;
|
||||
|
||||
frame_support::construct_runtime!(
|
||||
pub enum Runtime
|
||||
where
|
||||
Block = Block,
|
||||
NodeBlock = Block,
|
||||
UncheckedExtrinsic = UncheckedExtrinsic,
|
||||
|
||||
{
|
||||
System: frame_support_test,
|
||||
System: frame_system,
|
||||
FinalKeysNone: no_instance,
|
||||
FinalKeysSome: instance,
|
||||
Instance2FinalKeysSome: instance::<Instance2>,
|
||||
}
|
||||
);
|
||||
|
||||
impl frame_support_test::Config for Runtime {
|
||||
type BlockNumber = BlockNumber;
|
||||
type AccountId = AccountId;
|
||||
#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
|
||||
impl frame_system::Config for Runtime {
|
||||
type BaseCallFilter = frame_support::traits::Everything;
|
||||
type Block = Block;
|
||||
type BlockHashCount = ConstU32<10>;
|
||||
type RuntimeOrigin = RuntimeOrigin;
|
||||
type RuntimeCall = RuntimeCall;
|
||||
type RuntimeEvent = RuntimeEvent;
|
||||
type PalletInfo = PalletInfo;
|
||||
type DbWeight = ();
|
||||
type OnSetCode = ();
|
||||
}
|
||||
|
||||
impl no_instance::Config for Runtime {}
|
||||
|
||||
Reference in New Issue
Block a user