Refactoring Checkpoint: (WIP)
This commit is contained in:
@@ -262,7 +262,7 @@ impl_runtime_apis! {
|
||||
use pezframe_benchmarking::BenchmarkList;
|
||||
use pezkuwi_sdk::pezframe_support::traits::StorageInfoTrait;
|
||||
use pezframe_system_benchmarking::Pallet as SystemBench;
|
||||
use pezcumulus_pallet_session_benchmarking::Pallet as SessionBench;
|
||||
use pezcumulus_pezpallet_session_benchmarking::Pallet as SessionBench;
|
||||
use super::*;
|
||||
|
||||
let mut list = Vec::<BenchmarkList>::new();
|
||||
@@ -287,12 +287,12 @@ impl_runtime_apis! {
|
||||
}
|
||||
|
||||
fn verify_set_code() {
|
||||
System::assert_last_event(pezcumulus_pallet_teyrchain_system::Event::<Runtime>::ValidationFunctionStored.into());
|
||||
System::assert_last_event(pezcumulus_pezpallet_teyrchain_system::Event::<Runtime>::ValidationFunctionStored.into());
|
||||
}
|
||||
}
|
||||
|
||||
use pezcumulus_pallet_session_benchmarking::Pallet as SessionBench;
|
||||
impl pezcumulus_pallet_session_benchmarking::Config for Runtime {}
|
||||
use pezcumulus_pezpallet_session_benchmarking::Pallet as SessionBench;
|
||||
impl pezcumulus_pezpallet_session_benchmarking::Config for Runtime {}
|
||||
|
||||
use pezkuwi_sdk::pezframe_support::traits::WhitelistedStorageKeys;
|
||||
let whitelist = AllPalletsWithSystem::whitelisted_storage_keys();
|
||||
|
||||
@@ -31,7 +31,7 @@ pezkuwi_sdk::pezframe_benchmarking::define_benchmarks!(
|
||||
[pezpallet_message_queue, MessageQueue]
|
||||
[pezpallet_sudo, Sudo]
|
||||
[pezpallet_collator_selection, CollatorSelection]
|
||||
[pezcumulus_pallet_teyrchain_system, TeyrchainSystem]
|
||||
[pezcumulus_pallet_xcmp_queue, XcmpQueue]
|
||||
[pezcumulus_pallet_weight_reclaim, WeightReclaim]
|
||||
[pezcumulus_pezpallet_teyrchain_system, TeyrchainSystem]
|
||||
[pezcumulus_pezpallet_xcmp_queue, XcmpQueue]
|
||||
[pezcumulus_pezpallet_weight_reclaim, WeightReclaim]
|
||||
);
|
||||
|
||||
@@ -30,7 +30,7 @@ use pezkuwi_sdk::{pezstaging_teyrchain_info as teyrchain_info, pezstaging_xcm as
|
||||
use pezkuwi_sdk::{pezstaging_xcm_builder as xcm_builder, pezstaging_xcm_executor as xcm_executor};
|
||||
|
||||
// Bizinikiwi and Pezkuwi dependencies
|
||||
use pezcumulus_pallet_teyrchain_system::RelayNumberMonotonicallyIncreases;
|
||||
use pezcumulus_pezpallet_teyrchain_system::RelayNumberMonotonicallyIncreases;
|
||||
use pezcumulus_primitives_core::{AggregateMessageOrigin, ParaId};
|
||||
use pezframe_support::{
|
||||
derive_impl,
|
||||
@@ -131,13 +131,13 @@ impl pezframe_system::Config for Runtime {
|
||||
/// This is used as an identifier of the chain. 42 is the generic bizinikiwi prefix.
|
||||
type SS58Prefix = SS58Prefix;
|
||||
/// The action to take on a Runtime Upgrade
|
||||
type OnSetCode = pezcumulus_pallet_teyrchain_system::TeyrchainSetCode<Self>;
|
||||
type OnSetCode = pezcumulus_pezpallet_teyrchain_system::TeyrchainSetCode<Self>;
|
||||
type MaxConsumers = pezframe_support::traits::ConstU32<16>;
|
||||
type SingleBlockMigrations = SingleBlockMigrations;
|
||||
}
|
||||
|
||||
/// Configure the palelt weight reclaim tx.
|
||||
impl pezcumulus_pallet_weight_reclaim::Config for Runtime {
|
||||
impl pezcumulus_pezpallet_weight_reclaim::Config for Runtime {
|
||||
type WeightInfo = ();
|
||||
}
|
||||
|
||||
@@ -204,7 +204,7 @@ parameter_types! {
|
||||
pub const RelayOrigin: AggregateMessageOrigin = AggregateMessageOrigin::Parent;
|
||||
}
|
||||
|
||||
impl pezcumulus_pallet_teyrchain_system::Config for Runtime {
|
||||
impl pezcumulus_pezpallet_teyrchain_system::Config for Runtime {
|
||||
type WeightInfo = ();
|
||||
type RuntimeEvent = RuntimeEvent;
|
||||
type OnSystemEvent = ();
|
||||
@@ -248,7 +248,7 @@ impl pezpallet_message_queue::Config for Runtime {
|
||||
type IdleMaxServiceWeight = ();
|
||||
}
|
||||
|
||||
impl pezcumulus_pallet_aura_ext::Config for Runtime {}
|
||||
impl pezcumulus_pezpallet_aura_ext::Config for Runtime {}
|
||||
|
||||
parameter_types! {
|
||||
/// The asset ID for the asset that we use to pay for message delivery fees.
|
||||
@@ -266,7 +266,7 @@ pub type PriceForSiblingTeyrchainDelivery =
|
||||
pub type PriceForParentDelivery =
|
||||
ExponentialPrice<FeeAssetId, ToParentBaseDeliveryFee, TransactionByteFee, TeyrchainSystem>;
|
||||
|
||||
impl pezcumulus_pallet_xcmp_queue::Config for Runtime {
|
||||
impl pezcumulus_pezpallet_xcmp_queue::Config for Runtime {
|
||||
type RuntimeEvent = RuntimeEvent;
|
||||
type ChannelInfo = TeyrchainSystem;
|
||||
type VersionWrapper = ();
|
||||
|
||||
@@ -35,7 +35,7 @@ use xcm_executor::XcmExecutor;
|
||||
parameter_types! {
|
||||
pub const RelayLocation: Location = Location::parent();
|
||||
pub const RelayNetwork: Option<NetworkId> = None;
|
||||
pub RelayChainOrigin: RuntimeOrigin = pezcumulus_pallet_xcm::Origin::Relay.into();
|
||||
pub RelayChainOrigin: RuntimeOrigin = pezcumulus_pezpallet_xcm::Origin::Relay.into();
|
||||
// For the real deployment, it is recommended to set `RelayNetwork` according to the relay chain
|
||||
// and prepend `UniversalLocation` with `GlobalConsensus(RelayNetwork::get())`.
|
||||
pub UniversalLocation: InteriorLocation = Teyrchain(TeyrchainInfo::teyrchain_id().into()).into();
|
||||
@@ -80,7 +80,7 @@ pub type XcmOriginToTransactDispatchOrigin = (
|
||||
RelayChainAsNative<RelayChainOrigin, RuntimeOrigin>,
|
||||
// Native converter for sibling Teyrchains; will convert to a `SiblingPara` origin when
|
||||
// recognized.
|
||||
SiblingTeyrchainAsNative<pezcumulus_pallet_xcm::Origin, RuntimeOrigin>,
|
||||
SiblingTeyrchainAsNative<pezcumulus_pezpallet_xcm::Origin, RuntimeOrigin>,
|
||||
// Native signed account converter; this just converts an `AccountId32` origin into a normal
|
||||
// `RuntimeOrigin::Signed` origin of the same 32-byte value.
|
||||
SignedAccountId32AsNative<RelayNetwork, RuntimeOrigin>,
|
||||
@@ -201,7 +201,7 @@ impl pezpallet_xcm::Config for Runtime {
|
||||
type AuthorizedAliasConsideration = Disabled;
|
||||
}
|
||||
|
||||
impl pezcumulus_pallet_xcm::Config for Runtime {
|
||||
impl pezcumulus_pezpallet_xcm::Config for Runtime {
|
||||
type RuntimeEvent = RuntimeEvent;
|
||||
type XcmExecutor = XcmExecutor<XcmConfig>;
|
||||
}
|
||||
|
||||
@@ -75,7 +75,7 @@ pub type BlockId = generic::BlockId<Block>;
|
||||
|
||||
/// The extension to the basic transaction logic.
|
||||
#[docify::export(template_signed_extra)]
|
||||
pub type TxExtension = pezcumulus_pallet_weight_reclaim::StorageWeightReclaim<
|
||||
pub type TxExtension = pezcumulus_pezpallet_weight_reclaim::StorageWeightReclaim<
|
||||
Runtime,
|
||||
(
|
||||
pezframe_system::AuthorizeCall<Runtime>,
|
||||
@@ -231,7 +231,7 @@ pub(crate) use async_backing_params::*;
|
||||
|
||||
#[docify::export]
|
||||
/// Aura consensus hook
|
||||
type ConsensusHook = pezcumulus_pallet_aura_ext::FixedVelocityConsensusHook<
|
||||
type ConsensusHook = pezcumulus_pezpallet_aura_ext::FixedVelocityConsensusHook<
|
||||
Runtime,
|
||||
RELAY_CHAIN_SLOT_DURATION_MILLIS,
|
||||
BLOCK_PROCESSING_VELOCITY,
|
||||
@@ -265,13 +265,13 @@ mod runtime {
|
||||
#[runtime::pezpallet_index(0)]
|
||||
pub type System = pezframe_system;
|
||||
#[runtime::pezpallet_index(1)]
|
||||
pub type TeyrchainSystem = pezcumulus_pallet_teyrchain_system;
|
||||
pub type TeyrchainSystem = pezcumulus_pezpallet_teyrchain_system;
|
||||
#[runtime::pezpallet_index(2)]
|
||||
pub type Timestamp = pezpallet_timestamp;
|
||||
#[runtime::pezpallet_index(3)]
|
||||
pub type TeyrchainInfo = teyrchain_info;
|
||||
#[runtime::pezpallet_index(4)]
|
||||
pub type WeightReclaim = pezcumulus_pallet_weight_reclaim;
|
||||
pub type WeightReclaim = pezcumulus_pezpallet_weight_reclaim;
|
||||
|
||||
// Monetary stuff.
|
||||
#[runtime::pezpallet_index(10)]
|
||||
@@ -293,15 +293,15 @@ mod runtime {
|
||||
#[runtime::pezpallet_index(23)]
|
||||
pub type Aura = pezpallet_aura;
|
||||
#[runtime::pezpallet_index(24)]
|
||||
pub type AuraExt = pezcumulus_pallet_aura_ext;
|
||||
pub type AuraExt = pezcumulus_pezpallet_aura_ext;
|
||||
|
||||
// XCM helpers.
|
||||
#[runtime::pezpallet_index(30)]
|
||||
pub type XcmpQueue = pezcumulus_pallet_xcmp_queue;
|
||||
pub type XcmpQueue = pezcumulus_pezpallet_xcmp_queue;
|
||||
#[runtime::pezpallet_index(31)]
|
||||
pub type PezkuwiXcm = pezpallet_xcm;
|
||||
#[runtime::pezpallet_index(32)]
|
||||
pub type CumulusXcm = pezcumulus_pallet_xcm;
|
||||
pub type CumulusXcm = pezcumulus_pezpallet_xcm;
|
||||
#[runtime::pezpallet_index(33)]
|
||||
pub type MessageQueue = pezpallet_message_queue;
|
||||
|
||||
@@ -311,7 +311,7 @@ mod runtime {
|
||||
}
|
||||
|
||||
#[docify::export(register_validate_block)]
|
||||
pezcumulus_pallet_teyrchain_system::register_validate_block! {
|
||||
pezcumulus_pezpallet_teyrchain_system::register_validate_block! {
|
||||
Runtime = Runtime,
|
||||
BlockExecutor = pezcumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,
|
||||
BlockExecutor = pezcumulus_pezpallet_aura_ext::BlockExecutor::<Runtime, Executive>,
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user