mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-05-30 10:31:03 +00:00
Moves Block to frame_system instead of construct_runtime and removes Header and BlockNumber (#2790)
* Fixes
* Removes unused import
* Uses Block and removes BlockNumber/Header from Chain
* Fixes bridges
* Fixes
* Removes unused import
* Fixes build
* Uses correct RelayBlock
* Minor fix
* Fixes glutton-kusama
* Uses correct RelayBlock
* Minor fix
* Fixes benchmark for pallet-bridge-parachains
* Adds appropriate constraints
* Minor fixes
* Removes unused import
* Fixes integrity tests
* Minor fixes
* Updates trait bounds
* Uses custom bound for AsPrimitive
* Fixes trait bounds
* Revert "Fixes trait bounds"
This reverts commit 0b0f42f583f3a616a88afe45fcd06d31e7d9a06f.
* Revert "Uses custom bound for AsPrimitive"
This reverts commit 838e5281adf8b6e9632a2abb9cd550db4ae24126.
* No AsPrimitive trait bound for now
* Removes bounds on Number
* update lockfile for {"substrate", "polkadot"}
* Formatting
* ".git/.scripts/commands/fmt/fmt.sh"
* Minor fix
---------
Co-authored-by: parity-processbot <>
This commit is contained in:
@@ -87,7 +87,7 @@ use bridge_runtime_common::{
|
||||
messages_xcm_extension::{XcmAsPlainPayload, XcmBlobMessageDispatch},
|
||||
};
|
||||
use parachains_common::{
|
||||
impls::DealWithFees, opaque, AccountId, Balance, BlockNumber, Hash, Header, Index, Signature,
|
||||
impls::DealWithFees, AccountId, Balance, BlockNumber, Hash, Header, Index, Signature,
|
||||
AVERAGE_ON_INITIALIZE_RATIO, HOURS, MAXIMUM_BLOCK_WEIGHT, NORMAL_DISPATCH_RATIO, SLOT_DURATION,
|
||||
};
|
||||
use xcm_executor::XcmExecutor;
|
||||
@@ -195,14 +195,12 @@ impl frame_system::Config for Runtime {
|
||||
type Lookup = AccountIdLookup<AccountId, ()>;
|
||||
/// The index type for storing how many extrinsics an account has signed.
|
||||
type Index = Index;
|
||||
/// The index type for blocks.
|
||||
type BlockNumber = BlockNumber;
|
||||
/// The type for hashing blocks and tries.
|
||||
type Hash = Hash;
|
||||
/// The hashing algorithm used.
|
||||
type Hashing = BlakeTwo256;
|
||||
/// The header type.
|
||||
type Header = generic::Header<BlockNumber, BlakeTwo256>;
|
||||
/// The block type.
|
||||
type Block = Block;
|
||||
/// The ubiquitous event type.
|
||||
type RuntimeEvent = RuntimeEvent;
|
||||
/// The ubiquitous origin type.
|
||||
@@ -545,10 +543,7 @@ impl pallet_bridge_relayers::Config for Runtime {
|
||||
|
||||
// Create the runtime by composing the FRAME pallets that were previously configured.
|
||||
construct_runtime!(
|
||||
pub enum Runtime where
|
||||
Block = Block,
|
||||
NodeBlock = opaque::Block,
|
||||
UncheckedExtrinsic = UncheckedExtrinsic,
|
||||
pub enum Runtime
|
||||
{
|
||||
// System support stuff.
|
||||
System: frame_system::{Pallet, Call, Config<T>, Storage, Event<T>} = 0,
|
||||
|
||||
@@ -27,6 +27,7 @@ use bridge_hub_rococo_runtime::{
|
||||
};
|
||||
use codec::{Decode, Encode};
|
||||
use frame_support::parameter_types;
|
||||
use frame_system::pallet_prelude::HeaderFor;
|
||||
use parachains_common::{AccountId, AuraId, Balance};
|
||||
use sp_keyring::AccountKeyring::Alice;
|
||||
use sp_runtime::{
|
||||
@@ -81,7 +82,7 @@ fn construct_and_apply_extrinsic(
|
||||
r.unwrap()
|
||||
}
|
||||
|
||||
fn executive_init_block(header: &<Runtime as frame_system::Config>::Header) {
|
||||
fn executive_init_block(header: &HeaderFor<Runtime>) {
|
||||
Executive::initialize_block(header)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user