feat: Rebrand Polkadot/Substrate references to PezkuwiChain
This commit systematically rebrands various references from Parity Technologies' Polkadot/Substrate ecosystem to PezkuwiChain within the kurdistan-sdk. Key changes include: - Updated external repository URLs (zombienet-sdk, parity-db, parity-scale-codec, wasm-instrument) to point to pezkuwichain forks. - Modified internal documentation and code comments to reflect PezkuwiChain naming and structure. - Replaced direct references to with or specific paths within the for XCM, Pezkuwi, and other modules. - Cleaned up deprecated issue and PR references in various and files, particularly in and modules. - Adjusted image and logo URLs in documentation to point to PezkuwiChain assets. - Removed or rephrased comments related to external Polkadot/Substrate PRs and issues. This is a significant step towards fully customizing the SDK for the PezkuwiChain ecosystem.
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
[package]
|
||||
name = "staging-xcm-builder"
|
||||
name = "pezstaging-xcm-builder"
|
||||
description = "Tools & types for building with XCM and its executor."
|
||||
authors.workspace = true
|
||||
edition.workspace = true
|
||||
@@ -14,17 +14,17 @@ workspace = true
|
||||
[dependencies]
|
||||
codec = { features = ["derive"], workspace = true }
|
||||
environmental = { workspace = true }
|
||||
frame-support = { workspace = true }
|
||||
frame-system = { workspace = true }
|
||||
pezframe-support = { workspace = true }
|
||||
pezframe-system = { workspace = true }
|
||||
impl-trait-for-tuples = { workspace = true }
|
||||
pallet-asset-conversion = { workspace = true }
|
||||
pallet-transaction-payment = { workspace = true }
|
||||
pezpallet-asset-conversion = { workspace = true }
|
||||
pezpallet-transaction-payment = { workspace = true }
|
||||
scale-info = { features = ["derive"], workspace = true }
|
||||
sp-arithmetic = { workspace = true }
|
||||
sp-core = { workspace = true }
|
||||
sp-io = { workspace = true }
|
||||
sp-runtime = { workspace = true }
|
||||
sp-weights = { workspace = true }
|
||||
pezsp-arithmetic = { workspace = true }
|
||||
pezsp-core = { workspace = true }
|
||||
pezsp-io = { workspace = true }
|
||||
pezsp-runtime = { workspace = true }
|
||||
pezsp-weights = { workspace = true }
|
||||
tracing = { workspace = true }
|
||||
xcm = { workspace = true }
|
||||
xcm-executor = { workspace = true }
|
||||
@@ -33,10 +33,10 @@ xcm-executor = { workspace = true }
|
||||
pezkuwi-teyrchain-primitives = { workspace = true }
|
||||
|
||||
[dev-dependencies]
|
||||
pallet-assets = { workspace = true, default-features = true }
|
||||
pallet-balances = { workspace = true, default-features = true }
|
||||
pallet-salary = { workspace = true, default-features = true }
|
||||
pallet-xcm = { workspace = true, default-features = true }
|
||||
pezpallet-assets = { workspace = true, default-features = true }
|
||||
pezpallet-balances = { workspace = true, default-features = true }
|
||||
pezpallet-salary = { workspace = true, default-features = true }
|
||||
pezpallet-xcm = { workspace = true, default-features = true }
|
||||
pezkuwi-primitives = { workspace = true, default-features = true }
|
||||
pezkuwi-runtime-teyrchains = { workspace = true, default-features = true }
|
||||
pezkuwi-test-runtime = { workspace = true }
|
||||
@@ -45,26 +45,26 @@ primitive-types = { features = [
|
||||
"num-traits",
|
||||
"scale-info",
|
||||
], workspace = true }
|
||||
sp-tracing = { workspace = true, default-features = true }
|
||||
pezsp-tracing = { workspace = true, default-features = true }
|
||||
xcm-simulator = { workspace = true, default-features = true }
|
||||
|
||||
[features]
|
||||
default = ["std"]
|
||||
runtime-benchmarks = [
|
||||
"frame-support/runtime-benchmarks",
|
||||
"frame-system/runtime-benchmarks",
|
||||
"pallet-asset-conversion/runtime-benchmarks",
|
||||
"pallet-assets/runtime-benchmarks",
|
||||
"pallet-balances/runtime-benchmarks",
|
||||
"pallet-salary/runtime-benchmarks",
|
||||
"pallet-transaction-payment/runtime-benchmarks",
|
||||
"pallet-xcm/runtime-benchmarks",
|
||||
"pezframe-support/runtime-benchmarks",
|
||||
"pezframe-system/runtime-benchmarks",
|
||||
"pezpallet-asset-conversion/runtime-benchmarks",
|
||||
"pezpallet-assets/runtime-benchmarks",
|
||||
"pezpallet-balances/runtime-benchmarks",
|
||||
"pezpallet-salary/runtime-benchmarks",
|
||||
"pezpallet-transaction-payment/runtime-benchmarks",
|
||||
"pezpallet-xcm/runtime-benchmarks",
|
||||
"pezkuwi-primitives/runtime-benchmarks",
|
||||
"pezkuwi-runtime-teyrchains/runtime-benchmarks",
|
||||
"pezkuwi-test-runtime/runtime-benchmarks",
|
||||
"pezkuwi-teyrchain-primitives/runtime-benchmarks",
|
||||
"sp-io/runtime-benchmarks",
|
||||
"sp-runtime/runtime-benchmarks",
|
||||
"pezsp-io/runtime-benchmarks",
|
||||
"pezsp-runtime/runtime-benchmarks",
|
||||
"xcm-executor/runtime-benchmarks",
|
||||
"xcm-simulator/runtime-benchmarks",
|
||||
"xcm/runtime-benchmarks",
|
||||
@@ -72,18 +72,18 @@ runtime-benchmarks = [
|
||||
std = [
|
||||
"codec/std",
|
||||
"environmental/std",
|
||||
"frame-support/std",
|
||||
"frame-system/std",
|
||||
"pallet-asset-conversion/std",
|
||||
"pallet-transaction-payment/std",
|
||||
"pezframe-support/std",
|
||||
"pezframe-system/std",
|
||||
"pezpallet-asset-conversion/std",
|
||||
"pezpallet-transaction-payment/std",
|
||||
"pezkuwi-teyrchain-primitives/std",
|
||||
"primitive-types/std",
|
||||
"scale-info/std",
|
||||
"sp-arithmetic/std",
|
||||
"sp-core/std",
|
||||
"sp-io/std",
|
||||
"sp-runtime/std",
|
||||
"sp-weights/std",
|
||||
"pezsp-arithmetic/std",
|
||||
"pezsp-core/std",
|
||||
"pezsp-io/std",
|
||||
"pezsp-runtime/std",
|
||||
"pezsp-weights/std",
|
||||
"tracing/std",
|
||||
"xcm-executor/std",
|
||||
"xcm/std",
|
||||
|
||||
@@ -14,11 +14,11 @@
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Pezkuwi. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
//! Adapters to work with [`frame_support::traits::fungibles`] through XCM.
|
||||
//! Adapters to work with [`pezframe_support::traits::fungibles`] through XCM.
|
||||
|
||||
use core::{marker::PhantomData, result};
|
||||
use frame_support::traits::{Contains, Get};
|
||||
use sp_runtime::traits::MaybeEquivalence;
|
||||
use pezframe_support::traits::{Contains, Get};
|
||||
use pezsp_runtime::traits::MaybeEquivalence;
|
||||
use xcm::latest::prelude::*;
|
||||
use xcm_executor::traits::{
|
||||
Error as MatchError, MatchesFungibles, MatchesInstance, MatchesNonFungible, MatchesNonFungibles,
|
||||
@@ -215,7 +215,7 @@ mod tests {
|
||||
fn matched_converted_concrete_id_for_fungibles_works() {
|
||||
type AssetIdForTrustBackedAssets = u32;
|
||||
type Balance = u128;
|
||||
frame_support::parameter_types! {
|
||||
pezframe_support::parameter_types! {
|
||||
pub TrustBackedAssetsPalletLocation: Location = PalletInstance(50).into();
|
||||
}
|
||||
|
||||
@@ -280,7 +280,7 @@ mod tests {
|
||||
fn matched_converted_concrete_id_for_nonfungibles_works() {
|
||||
type ClassId = u32;
|
||||
type ClassInstanceId = u64;
|
||||
frame_support::parameter_types! {
|
||||
pezframe_support::parameter_types! {
|
||||
pub TrustBackedAssetsPalletLocation: Location = PalletInstance(50).into();
|
||||
}
|
||||
|
||||
|
||||
@@ -19,16 +19,16 @@
|
||||
extern crate alloc;
|
||||
use alloc::vec;
|
||||
use core::marker::PhantomData;
|
||||
use frame_support::{ensure, traits::tokens::fungibles};
|
||||
use pallet_asset_conversion::{QuotePrice, SwapCredit};
|
||||
use pezframe_support::{ensure, traits::tokens::fungibles};
|
||||
use pezpallet_asset_conversion::{QuotePrice, SwapCredit};
|
||||
use xcm::prelude::*;
|
||||
use xcm_executor::{
|
||||
traits::{AssetExchange, MatchesFungibles},
|
||||
AssetsInHolding,
|
||||
};
|
||||
|
||||
/// An adapter from [`pallet_asset_conversion::SwapCredit`] and
|
||||
/// [`pallet_asset_conversion::QuotePrice`] to [`xcm_executor::traits::AssetExchange`].
|
||||
/// An adapter from [`pezpallet_asset_conversion::SwapCredit`] and
|
||||
/// [`pezpallet_asset_conversion::QuotePrice`] to [`xcm_executor::traits::AssetExchange`].
|
||||
///
|
||||
/// This adapter takes just one fungible asset in `give` and allows only one fungible asset in
|
||||
/// `want`. If you need to handle more assets in either `give` or `want`, then you should use
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
//! Mock to test [`SingleAssetExchangeAdapter`].
|
||||
|
||||
use core::marker::PhantomData;
|
||||
use frame_support::{
|
||||
use pezframe_support::{
|
||||
assert_ok, construct_runtime, derive_impl, ord_parameter_types, parameter_types,
|
||||
traits::{
|
||||
fungible::{self, NativeFromLeft, NativeOrWithId},
|
||||
@@ -28,8 +28,8 @@ use frame_support::{
|
||||
},
|
||||
PalletId,
|
||||
};
|
||||
use sp_core::{ConstU128, ConstU32, Get};
|
||||
use sp_runtime::{
|
||||
use pezsp_core::{ConstU128, ConstU32, Get};
|
||||
use pezsp_runtime::{
|
||||
traits::{AccountIdConversion, IdentityLookup, MaybeEquivalence, TryConvert, TryConvertInto},
|
||||
BuildStorage, Permill,
|
||||
};
|
||||
@@ -38,41 +38,41 @@ use xcm_executor::{traits::ConvertLocation, XcmExecutor};
|
||||
|
||||
use crate::{FungibleAdapter, IsConcrete, MatchedConvertedConcreteId, StartsWith};
|
||||
|
||||
pub type Block = frame_system::mocking::MockBlock<Runtime>;
|
||||
pub type Block = pezframe_system::mocking::MockBlock<Runtime>;
|
||||
pub type AccountId = u64;
|
||||
pub type Balance = u128;
|
||||
|
||||
construct_runtime! {
|
||||
pub struct Runtime {
|
||||
System: frame_system,
|
||||
Balances: pallet_balances,
|
||||
AssetsPallet: pallet_assets::<Instance1>,
|
||||
PoolAssets: pallet_assets::<Instance2>,
|
||||
XcmPallet: pallet_xcm,
|
||||
AssetConversion: pallet_asset_conversion,
|
||||
System: pezframe_system,
|
||||
Balances: pezpallet_balances,
|
||||
AssetsPallet: pezpallet_assets::<Instance1>,
|
||||
PoolAssets: pezpallet_assets::<Instance2>,
|
||||
XcmPallet: pezpallet_xcm,
|
||||
AssetConversion: pezpallet_asset_conversion,
|
||||
}
|
||||
}
|
||||
|
||||
#[derive_impl(frame_system::config_preludes::TestDefaultConfig)]
|
||||
impl frame_system::Config for Runtime {
|
||||
#[derive_impl(pezframe_system::config_preludes::TestDefaultConfig)]
|
||||
impl pezframe_system::Config for Runtime {
|
||||
type Block = Block;
|
||||
type AccountId = AccountId;
|
||||
type Lookup = IdentityLookup<AccountId>;
|
||||
type AccountData = pallet_balances::AccountData<Balance>;
|
||||
type AccountData = pezpallet_balances::AccountData<Balance>;
|
||||
}
|
||||
|
||||
#[derive_impl(pallet_balances::config_preludes::TestDefaultConfig)]
|
||||
impl pallet_balances::Config for Runtime {
|
||||
#[derive_impl(pezpallet_balances::config_preludes::TestDefaultConfig)]
|
||||
impl pezpallet_balances::Config for Runtime {
|
||||
type Balance = Balance;
|
||||
type AccountStore = System;
|
||||
type ExistentialDeposit = ConstU128<1>;
|
||||
}
|
||||
|
||||
pub type TrustBackedAssetsInstance = pallet_assets::Instance1;
|
||||
pub type PoolAssetsInstance = pallet_assets::Instance2;
|
||||
pub type TrustBackedAssetsInstance = pezpallet_assets::Instance1;
|
||||
pub type PoolAssetsInstance = pezpallet_assets::Instance2;
|
||||
|
||||
#[derive_impl(pallet_assets::config_preludes::TestDefaultConfig)]
|
||||
impl pallet_assets::Config<TrustBackedAssetsInstance> for Runtime {
|
||||
#[derive_impl(pezpallet_assets::config_preludes::TestDefaultConfig)]
|
||||
impl pezpallet_assets::Config<TrustBackedAssetsInstance> for Runtime {
|
||||
type Currency = Balances;
|
||||
type Balance = Balance;
|
||||
type AssetDeposit = ConstU128<1>;
|
||||
@@ -80,15 +80,15 @@ impl pallet_assets::Config<TrustBackedAssetsInstance> for Runtime {
|
||||
type MetadataDepositBase = ConstU128<1>;
|
||||
type MetadataDepositPerByte = ConstU128<1>;
|
||||
type ApprovalDeposit = ConstU128<1>;
|
||||
type CreateOrigin = AsEnsureOriginWithArg<frame_system::EnsureSigned<AccountId>>;
|
||||
type ForceOrigin = frame_system::EnsureRoot<AccountId>;
|
||||
type CreateOrigin = AsEnsureOriginWithArg<pezframe_system::EnsureSigned<AccountId>>;
|
||||
type ForceOrigin = pezframe_system::EnsureRoot<AccountId>;
|
||||
type Freezer = ();
|
||||
type Holder = ();
|
||||
type CallbackHandle = ();
|
||||
}
|
||||
|
||||
#[derive_impl(pallet_assets::config_preludes::TestDefaultConfig)]
|
||||
impl pallet_assets::Config<PoolAssetsInstance> for Runtime {
|
||||
#[derive_impl(pezpallet_assets::config_preludes::TestDefaultConfig)]
|
||||
impl pezpallet_assets::Config<PoolAssetsInstance> for Runtime {
|
||||
type Currency = Balances;
|
||||
type Balance = Balance;
|
||||
type AssetDeposit = ConstU128<1>;
|
||||
@@ -96,8 +96,8 @@ impl pallet_assets::Config<PoolAssetsInstance> for Runtime {
|
||||
type MetadataDepositBase = ConstU128<1>;
|
||||
type MetadataDepositPerByte = ConstU128<1>;
|
||||
type ApprovalDeposit = ConstU128<1>;
|
||||
type CreateOrigin = AsEnsureOriginWithArg<frame_system::EnsureSigned<AccountId>>;
|
||||
type ForceOrigin = frame_system::EnsureRoot<AccountId>;
|
||||
type CreateOrigin = AsEnsureOriginWithArg<pezframe_system::EnsureSigned<AccountId>>;
|
||||
type ForceOrigin = pezframe_system::EnsureRoot<AccountId>;
|
||||
type Freezer = ();
|
||||
type Holder = ();
|
||||
type CallbackHandle = ();
|
||||
@@ -118,19 +118,19 @@ ord_parameter_types! {
|
||||
AccountIdConversion::<AccountId>::into_account_truncating(&AssetConversionPalletId::get());
|
||||
}
|
||||
|
||||
pub type PoolIdToAccountId = pallet_asset_conversion::AccountIdConverter<
|
||||
pub type PoolIdToAccountId = pezpallet_asset_conversion::AccountIdConverter<
|
||||
AssetConversionPalletId,
|
||||
(NativeOrWithId<u32>, NativeOrWithId<u32>),
|
||||
>;
|
||||
|
||||
impl pallet_asset_conversion::Config for Runtime {
|
||||
impl pezpallet_asset_conversion::Config for Runtime {
|
||||
type RuntimeEvent = RuntimeEvent;
|
||||
type Balance = Balance;
|
||||
type HigherPrecisionBalance = sp_core::U256;
|
||||
type HigherPrecisionBalance = pezsp_core::U256;
|
||||
type AssetKind = NativeOrWithId<u32>;
|
||||
type Assets = NativeAndAssets;
|
||||
type PoolId = (Self::AssetKind, Self::AssetKind);
|
||||
type PoolLocator = pallet_asset_conversion::WithFirstAsset<
|
||||
type PoolLocator = pezpallet_asset_conversion::WithFirstAsset<
|
||||
Native,
|
||||
AccountId,
|
||||
Self::AssetKind,
|
||||
@@ -184,10 +184,10 @@ pub type Weigher = crate::FixedWeightBounds<WeightPerInstruction, RuntimeCall, M
|
||||
pub struct LocationToAssetId;
|
||||
impl MaybeEquivalence<Location, NativeOrWithId<u32>> for LocationToAssetId {
|
||||
fn convert(location: &Location) -> Option<NativeOrWithId<u32>> {
|
||||
let pallet_instance = TrustBackedAssetsPalletIndex::get();
|
||||
let pezpallet_instance = TrustBackedAssetsPalletIndex::get();
|
||||
match location.unpack() {
|
||||
(0, [PalletInstance(instance), GeneralIndex(index)])
|
||||
if *instance == pallet_instance =>
|
||||
if *instance == pezpallet_instance =>
|
||||
Some(NativeOrWithId::WithId(*index as u32)),
|
||||
(0, []) => Some(NativeOrWithId::Native),
|
||||
_ => None,
|
||||
@@ -195,10 +195,10 @@ impl MaybeEquivalence<Location, NativeOrWithId<u32>> for LocationToAssetId {
|
||||
}
|
||||
|
||||
fn convert_back(asset_id: &NativeOrWithId<u32>) -> Option<Location> {
|
||||
let pallet_instance = TrustBackedAssetsPalletIndex::get();
|
||||
let pezpallet_instance = TrustBackedAssetsPalletIndex::get();
|
||||
Some(match asset_id {
|
||||
NativeOrWithId::WithId(id) =>
|
||||
Location::new(0, [PalletInstance(pallet_instance), GeneralIndex((*id).into())]),
|
||||
Location::new(0, [PalletInstance(pezpallet_instance), GeneralIndex((*id).into())]),
|
||||
NativeOrWithId::Native => Location::new(0, []),
|
||||
})
|
||||
}
|
||||
@@ -269,7 +269,7 @@ impl ConvertLocation<AccountId> for AccountIndex64Aliases {
|
||||
/// `Convert` implementation to convert from some a `Signed` (system) `Origin` into an
|
||||
/// `AccountIndex64`.
|
||||
///
|
||||
/// Typically used when configuring `pallet-xcm` in tests to allow `u64` accounts to dispatch an XCM
|
||||
/// Typically used when configuring `pezpallet-xcm` in tests to allow `u64` accounts to dispatch an XCM
|
||||
/// from an `AccountIndex64` origin.
|
||||
pub struct SignedToAccountIndex64<RuntimeOrigin, AccountId, Network>(
|
||||
PhantomData<(RuntimeOrigin, AccountId, Network)>,
|
||||
@@ -277,12 +277,12 @@ pub struct SignedToAccountIndex64<RuntimeOrigin, AccountId, Network>(
|
||||
impl<RuntimeOrigin: OriginTrait + Clone, AccountId: Into<u64>, Network: Get<Option<NetworkId>>>
|
||||
TryConvert<RuntimeOrigin, Location> for SignedToAccountIndex64<RuntimeOrigin, AccountId, Network>
|
||||
where
|
||||
RuntimeOrigin::PalletsOrigin: From<frame_system::RawOrigin<AccountId>>
|
||||
+ TryInto<frame_system::RawOrigin<AccountId>, Error = RuntimeOrigin::PalletsOrigin>,
|
||||
RuntimeOrigin::PalletsOrigin: From<pezframe_system::RawOrigin<AccountId>>
|
||||
+ TryInto<pezframe_system::RawOrigin<AccountId>, Error = RuntimeOrigin::PalletsOrigin>,
|
||||
{
|
||||
fn try_convert(o: RuntimeOrigin) -> Result<Location, RuntimeOrigin> {
|
||||
o.try_with_caller(|caller| match caller.try_into() {
|
||||
Ok(frame_system::RawOrigin::Signed(who)) =>
|
||||
Ok(pezframe_system::RawOrigin::Signed(who)) =>
|
||||
Ok(Junction::AccountIndex64 { network: Network::get(), index: who.into() }.into()),
|
||||
Ok(other) => Err(other.into()),
|
||||
Err(other) => Err(other),
|
||||
@@ -298,7 +298,7 @@ parameter_types! {
|
||||
/// sending/executing XCMs.
|
||||
pub type LocalOriginToLocation = SignedToAccountIndex64<RuntimeOrigin, AccountId, NoNetwork>;
|
||||
|
||||
impl pallet_xcm::Config for Runtime {
|
||||
impl pezpallet_xcm::Config for Runtime {
|
||||
// We turn off sending for these tests
|
||||
type SendXcmOrigin = crate::EnsureXcmOrigin<RuntimeOrigin, ()>;
|
||||
type XcmRouter = ();
|
||||
@@ -318,12 +318,12 @@ impl pallet_xcm::Config for Runtime {
|
||||
type UniversalLocation = UniversalLocation;
|
||||
// No version discovery needed
|
||||
const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 0;
|
||||
type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion;
|
||||
type AdminOrigin = frame_system::EnsureRoot<AccountId>;
|
||||
type AdvertisedXcmVersion = pezpallet_xcm::CurrentXcmVersion;
|
||||
type AdminOrigin = pezframe_system::EnsureRoot<AccountId>;
|
||||
// No locking
|
||||
type TrustedLockers = ();
|
||||
type MaxLockers = frame_support::traits::ConstU32<0>;
|
||||
type MaxRemoteLockConsumers = frame_support::traits::ConstU32<0>;
|
||||
type MaxLockers = pezframe_support::traits::ConstU32<0>;
|
||||
type MaxRemoteLockConsumers = pezframe_support::traits::ConstU32<0>;
|
||||
type RemoteLockConsumerIdentifier = ();
|
||||
// How to turn locations into accounts
|
||||
type SovereignAccountOf = LocationToAccountId;
|
||||
@@ -331,7 +331,7 @@ impl pallet_xcm::Config for Runtime {
|
||||
type Currency = Balances;
|
||||
type CurrencyMatcher = crate::IsConcrete<HereLocation>;
|
||||
// Pallet benchmarks, no need for this recipe
|
||||
type WeightInfo = pallet_xcm::TestWeightInfo;
|
||||
type WeightInfo = pezpallet_xcm::TestWeightInfo;
|
||||
// Runtime types
|
||||
type RuntimeOrigin = RuntimeOrigin;
|
||||
type RuntimeCall = RuntimeCall;
|
||||
@@ -342,10 +342,10 @@ impl pallet_xcm::Config for Runtime {
|
||||
|
||||
pub const INITIAL_BALANCE: Balance = 1_000_000_000;
|
||||
|
||||
pub fn new_test_ext() -> sp_io::TestExternalities {
|
||||
let mut t = frame_system::GenesisConfig::<Runtime>::default().build_storage().unwrap();
|
||||
pub fn new_test_ext() -> pezsp_io::TestExternalities {
|
||||
let mut t = pezframe_system::GenesisConfig::<Runtime>::default().build_storage().unwrap();
|
||||
|
||||
pallet_balances::GenesisConfig::<Runtime> {
|
||||
pezpallet_balances::GenesisConfig::<Runtime> {
|
||||
balances: vec![(0, INITIAL_BALANCE), (1, INITIAL_BALANCE), (2, INITIAL_BALANCE)],
|
||||
..Default::default()
|
||||
}
|
||||
@@ -354,7 +354,7 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
|
||||
|
||||
let owner = 0;
|
||||
|
||||
let mut ext = sp_io::TestExternalities::new(t);
|
||||
let mut ext = pezsp_io::TestExternalities::new(t);
|
||||
ext.execute_with(|| {
|
||||
System::set_block_number(1);
|
||||
assert_ok!(AssetsPallet::force_create(RuntimeOrigin::root(), 1, owner, false, 1,));
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
use crate::{CreateMatcher, MatchXcm};
|
||||
use core::{cell::Cell, marker::PhantomData, ops::ControlFlow, result::Result};
|
||||
use frame_support::{
|
||||
use pezframe_support::{
|
||||
ensure,
|
||||
traits::{Contains, ContainsPair, Get, Nothing, ProcessMessageError},
|
||||
};
|
||||
@@ -29,7 +29,7 @@ use xcm_executor::traits::{CheckSuspension, DenyExecution, OnResponse, Propertie
|
||||
/// Execution barrier that just takes `max_weight` from `properties.weight_credit`.
|
||||
///
|
||||
/// Useful to allow XCM execution by local chain users via extrinsics.
|
||||
/// E.g. `pallet_xcm::reserve_asset_transfer` to transfer a reserve asset
|
||||
/// E.g. `pezpallet_xcm::reserve_asset_transfer` to transfer a reserve asset
|
||||
/// out of the local chain to another one.
|
||||
pub struct TakeWeightCredit;
|
||||
impl ShouldExecute for TakeWeightCredit {
|
||||
@@ -546,7 +546,7 @@ where
|
||||
}
|
||||
}
|
||||
|
||||
// See issue <https://github.com/paritytech/polkadot/issues/5233>
|
||||
// See issue <https://github.com/pezkuwichain/kurdistan-sdk/issues/155>
|
||||
pub struct DenyReserveTransferToRelayChain;
|
||||
impl DenyExecution for DenyReserveTransferToRelayChain {
|
||||
fn deny_execution<RuntimeCall>(
|
||||
@@ -627,7 +627,7 @@ impl<Inner: DenyExecution> DenyRecursively<Inner> {
|
||||
}).flatten().ok_or(ProcessMessageError::StackLimitReached)?;
|
||||
|
||||
// Ensure the counter is decremented even if an early return occurs.
|
||||
sp_core::defer! {
|
||||
pezsp_core::defer! {
|
||||
recursion_count::with(|count| {
|
||||
*count = count.saturating_sub(1);
|
||||
});
|
||||
|
||||
@@ -19,9 +19,9 @@
|
||||
//! from `xcm-executor` to perform their tasks.
|
||||
|
||||
use alloc::boxed::Box;
|
||||
use frame_support::{
|
||||
use pezframe_support::{
|
||||
dispatch::{DispatchErrorWithPostInfo, WithPostDispatchInfo},
|
||||
pallet_prelude::DispatchError,
|
||||
pezpallet_prelude::DispatchError,
|
||||
};
|
||||
use xcm::prelude::*;
|
||||
pub use xcm_executor::traits::QueryHandler;
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Pezkuwi. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
//! Adapters to work with `frame_support::traits::Currency` through XCM.
|
||||
//! Adapters to work with `pezframe_support::traits::Currency` through XCM.
|
||||
|
||||
#![allow(deprecated)]
|
||||
|
||||
use super::MintLocation;
|
||||
use core::{fmt::Debug, marker::PhantomData, result};
|
||||
use frame_support::traits::{ExistenceRequirement::AllowDeath, Get, WithdrawReasons};
|
||||
use sp_runtime::traits::CheckedSub;
|
||||
use pezframe_support::traits::{ExistenceRequirement::AllowDeath, Get, WithdrawReasons};
|
||||
use pezsp_runtime::traits::CheckedSub;
|
||||
use xcm::latest::{Asset, Error as XcmError, Location, Result, XcmContext};
|
||||
use xcm_executor::{
|
||||
traits::{ConvertLocation, MatchesFungible, TransactAsset},
|
||||
@@ -52,13 +52,13 @@ impl From<Error> for XcmError {
|
||||
/// # Example
|
||||
/// ```
|
||||
/// use codec::Decode;
|
||||
/// use frame_support::{parameter_types, PalletId};
|
||||
/// use sp_runtime::traits::{AccountIdConversion, TrailingZeroInput};
|
||||
/// use pezframe_support::{parameter_types, PalletId};
|
||||
/// use pezsp_runtime::traits::{AccountIdConversion, TrailingZeroInput};
|
||||
/// use xcm::latest::prelude::*;
|
||||
/// use staging_xcm_builder::{ParentIsPreset, CurrencyAdapter, IsConcrete};
|
||||
/// use pezstaging_xcm_builder::{ParentIsPreset, CurrencyAdapter, IsConcrete};
|
||||
///
|
||||
/// /// Our chain's account id.
|
||||
/// type AccountId = sp_runtime::AccountId32;
|
||||
/// type AccountId = pezsp_runtime::AccountId32;
|
||||
///
|
||||
/// /// Our relay chain's location.
|
||||
/// parameter_types! {
|
||||
@@ -93,7 +93,7 @@ pub struct CurrencyAdapter<Currency, Matcher, AccountIdConverter, AccountId, Che
|
||||
);
|
||||
|
||||
impl<
|
||||
Currency: frame_support::traits::Currency<AccountId>,
|
||||
Currency: pezframe_support::traits::Currency<AccountId>,
|
||||
Matcher: MatchesFungible<Currency::Balance>,
|
||||
AccountIdConverter: ConvertLocation<AccountId>,
|
||||
AccountId: Clone, // can't get away without it since Currency is generic over it.
|
||||
@@ -129,7 +129,7 @@ impl<
|
||||
if ok {
|
||||
Currency::reactivate(amount);
|
||||
} else {
|
||||
frame_support::defensive!(
|
||||
pezframe_support::defensive!(
|
||||
"`can_check_in` must have returned `true` immediately prior; qed"
|
||||
);
|
||||
}
|
||||
@@ -137,7 +137,7 @@ impl<
|
||||
}
|
||||
|
||||
impl<
|
||||
Currency: frame_support::traits::Currency<AccountId>,
|
||||
Currency: pezframe_support::traits::Currency<AccountId>,
|
||||
Matcher: MatchesFungible<Currency::Balance>,
|
||||
AccountIdConverter: ConvertLocation<AccountId>,
|
||||
AccountId: Clone + Debug, // can't get away without it since Currency is generic over it.
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
// along with Pezkuwi. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
use core::marker::PhantomData;
|
||||
use frame_support::traits::{Contains, Get};
|
||||
use pezframe_support::traits::{Contains, Get};
|
||||
use xcm::prelude::*;
|
||||
use xcm_executor::traits::{FeeManager, FeeReason, TransactAsset};
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
use alloc::vec::Vec;
|
||||
use core::marker::PhantomData;
|
||||
use frame_support::traits::{Contains, ContainsPair, Get};
|
||||
use pezframe_support::traits::{Contains, ContainsPair, Get};
|
||||
use xcm::latest::{Asset, AssetFilter, AssetId, Location, WildAsset};
|
||||
|
||||
/// Accepts an asset iff it is a native asset.
|
||||
@@ -83,12 +83,12 @@ impl Get<Vec<AssetFilter>> for AllAssets {
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use frame_support::traits::Equals;
|
||||
use pezframe_support::traits::Equals;
|
||||
use xcm::latest::prelude::*;
|
||||
|
||||
#[test]
|
||||
fn location_with_asset_filters_works() {
|
||||
frame_support::parameter_types! {
|
||||
pezframe_support::parameter_types! {
|
||||
pub ParaA: Location = Location::new(1, [Teyrchain(1001)]);
|
||||
pub ParaB: Location = Location::new(1, [Teyrchain(1002)]);
|
||||
pub ParaC: Location = Location::new(1, [Teyrchain(1003)]);
|
||||
|
||||
@@ -14,11 +14,11 @@
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Pezkuwi. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
//! Adapters to work with [`frame_support::traits::fungible`] through XCM.
|
||||
//! Adapters to work with [`pezframe_support::traits::fungible`] through XCM.
|
||||
|
||||
use super::MintLocation;
|
||||
use core::{fmt::Debug, marker::PhantomData, result};
|
||||
use frame_support::traits::{
|
||||
use pezframe_support::traits::{
|
||||
tokens::{
|
||||
fungible, Fortitude::Polite, Precision::Exact, Preservation::Expendable, Provenance::Minted,
|
||||
},
|
||||
|
||||
@@ -14,10 +14,10 @@
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Pezkuwi. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
//! Adapters to work with [`frame_support::traits::fungibles`] through XCM.
|
||||
//! Adapters to work with [`pezframe_support::traits::fungibles`] through XCM.
|
||||
|
||||
use core::{fmt::Debug, marker::PhantomData, result};
|
||||
use frame_support::traits::{
|
||||
use pezframe_support::traits::{
|
||||
tokens::{
|
||||
fungibles, Fortitude::Polite, Precision::Exact, Preservation::Expendable,
|
||||
Provenance::Minted,
|
||||
|
||||
@@ -18,9 +18,9 @@ use crate::universal_exports::ensure_is_remote;
|
||||
use alloc::vec::Vec;
|
||||
use codec::{Compact, Decode, Encode};
|
||||
use core::marker::PhantomData;
|
||||
use frame_support::traits::Get;
|
||||
use sp_io::hashing::blake2_256;
|
||||
use sp_runtime::traits::{AccountIdConversion, TrailingZeroInput, TryConvert};
|
||||
use pezframe_support::traits::Get;
|
||||
use pezsp_io::hashing::blake2_256;
|
||||
use pezsp_runtime::traits::{AccountIdConversion, TrailingZeroInput, TryConvert};
|
||||
use xcm::latest::prelude::*;
|
||||
use xcm_executor::traits::ConvertLocation;
|
||||
|
||||
@@ -521,7 +521,7 @@ mod tests {
|
||||
pub type ForeignChainAliasTreasuryAccount<AccountId> =
|
||||
HashedDescription<AccountId, DescribeFamily<DescribeTreasuryVoiceTerminal>>;
|
||||
|
||||
use frame_support::parameter_types;
|
||||
use pezframe_support::parameter_types;
|
||||
use xcm::latest::Junction;
|
||||
|
||||
fn account20() -> Junction {
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
//! XCM matcher API, used primarily for writing barrier conditions.
|
||||
|
||||
use core::ops::ControlFlow;
|
||||
use frame_support::traits::ProcessMessageError;
|
||||
use pezframe_support::traits::ProcessMessageError;
|
||||
use xcm::latest::{Instruction, Location};
|
||||
|
||||
/// Creates an instruction matcher from an XCM. Since XCM versions differ, we need to make a trait
|
||||
@@ -48,9 +48,9 @@ impl<'a, Call> CreateMatcher for &'a mut [Instruction<Call>] {
|
||||
///
|
||||
/// Example:
|
||||
/// ```rust
|
||||
/// use frame_support::traits::ProcessMessageError;
|
||||
/// use pezframe_support::traits::ProcessMessageError;
|
||||
/// use xcm::latest::Instruction;
|
||||
/// use staging_xcm_builder::{CreateMatcher, MatchXcm};
|
||||
/// use pezstaging_xcm_builder::{CreateMatcher, MatchXcm};
|
||||
///
|
||||
/// let mut msg = [Instruction::<()>::ClearOrigin];
|
||||
/// let res = msg
|
||||
|
||||
@@ -18,8 +18,8 @@
|
||||
//! `InteriorLocation` types.
|
||||
|
||||
use core::marker::PhantomData;
|
||||
use frame_support::traits::{Contains, Get};
|
||||
use sp_runtime::traits::MaybeEquivalence;
|
||||
use pezframe_support::traits::{Contains, Get};
|
||||
use pezsp_runtime::traits::MaybeEquivalence;
|
||||
use xcm::latest::{InteriorLocation, Location, NetworkId};
|
||||
|
||||
/// An implementation of `Contains` that checks for `Location` or
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
//! Various implementations for the `MatchesFungible` trait.
|
||||
|
||||
use core::marker::PhantomData;
|
||||
use frame_support::traits::Get;
|
||||
use pezframe_support::traits::Get;
|
||||
use xcm::latest::{
|
||||
Asset, AssetId, AssetInstance,
|
||||
Fungibility::{Fungible, NonFungible},
|
||||
@@ -32,10 +32,10 @@ use xcm_executor::traits::{MatchesFungible, MatchesNonFungible};
|
||||
///
|
||||
/// ```
|
||||
/// use xcm::latest::{Location, Parent};
|
||||
/// use staging_xcm_builder::IsConcrete;
|
||||
/// use pezstaging_xcm_builder::IsConcrete;
|
||||
/// use xcm_executor::traits::MatchesFungible;
|
||||
///
|
||||
/// frame_support::parameter_types! {
|
||||
/// pezframe_support::parameter_types! {
|
||||
/// pub TargetLocation: Location = Parent.into();
|
||||
/// }
|
||||
///
|
||||
|
||||
@@ -14,11 +14,11 @@
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Pezkuwi. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
//! Adapters to work with [`frame_support::traits::tokens::nonfungible`] through XCM.
|
||||
//! Adapters to work with [`pezframe_support::traits::tokens::nonfungible`] through XCM.
|
||||
|
||||
use crate::MintLocation;
|
||||
use core::{fmt::Debug, marker::PhantomData, result};
|
||||
use frame_support::{
|
||||
use pezframe_support::{
|
||||
ensure,
|
||||
traits::{tokens::nonfungible, Get},
|
||||
};
|
||||
|
||||
@@ -14,11 +14,11 @@
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Pezkuwi. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
//! Adapters to work with [`frame_support::traits::tokens::nonfungibles`] through XCM.
|
||||
//! Adapters to work with [`pezframe_support::traits::tokens::nonfungibles`] through XCM.
|
||||
|
||||
use crate::{AssetChecking, MintLocation};
|
||||
use core::{fmt::Debug, marker::PhantomData, result};
|
||||
use frame_support::{
|
||||
use pezframe_support::{
|
||||
ensure,
|
||||
traits::{tokens::nonfungibles, Get},
|
||||
};
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
//! Implementation for `ContainsPair<Location, Location>`.
|
||||
|
||||
use core::marker::PhantomData;
|
||||
use frame_support::traits::{Contains, ContainsPair, Get};
|
||||
use pezframe_support::traits::{Contains, ContainsPair, Get};
|
||||
use xcm::latest::prelude::*;
|
||||
|
||||
/// Alias a Foreign `AccountId32` with a local `AccountId32` if the foreign `AccountId32` matches
|
||||
|
||||
@@ -17,10 +17,10 @@
|
||||
//! Various implementations for `ConvertOrigin`.
|
||||
|
||||
use core::marker::PhantomData;
|
||||
use frame_support::traits::{Contains, EnsureOrigin, Get, GetBacking, OriginTrait};
|
||||
use frame_system::RawOrigin as SystemRawOrigin;
|
||||
use pezframe_support::traits::{Contains, EnsureOrigin, Get, GetBacking, OriginTrait};
|
||||
use pezframe_system::RawOrigin as SystemRawOrigin;
|
||||
use pezkuwi_teyrchain_primitives::primitives::IsSystem;
|
||||
use sp_runtime::traits::TryConvert;
|
||||
use pezsp_runtime::traits::TryConvert;
|
||||
use xcm::latest::{BodyId, BodyPart, Junction, Junctions::*, Location, NetworkId, OriginKind};
|
||||
use xcm_executor::traits::{ConvertLocation, ConvertOrigin};
|
||||
|
||||
@@ -263,7 +263,7 @@ where
|
||||
/// `Convert` implementation to convert from some a `Signed` (system) `Origin` into an
|
||||
/// `AccountId32`.
|
||||
///
|
||||
/// Typically used when configuring `pallet-xcm` for allowing normal accounts to dispatch an XCM
|
||||
/// Typically used when configuring `pezpallet-xcm` for allowing normal accounts to dispatch an XCM
|
||||
/// from an `AccountId32` origin.
|
||||
pub struct SignedToAccountId32<RuntimeOrigin, AccountId, Network>(
|
||||
PhantomData<(RuntimeOrigin, AccountId, Network)>,
|
||||
@@ -290,7 +290,7 @@ where
|
||||
/// `Convert` implementation to convert from some an origin which implements `Backing` into a
|
||||
/// corresponding `Plurality` `Location`.
|
||||
///
|
||||
/// Typically used when configuring `pallet-xcm` for allowing a collective's Origin to dispatch an
|
||||
/// Typically used when configuring `pezpallet-xcm` for allowing a collective's Origin to dispatch an
|
||||
/// XCM from a `Plurality` origin.
|
||||
pub struct BackingToPlurality<RuntimeOrigin, COrigin, Body>(
|
||||
PhantomData<(RuntimeOrigin, COrigin, Body)>,
|
||||
@@ -363,20 +363,20 @@ impl<WhitelistedSuperuserLocations: Contains<Location>, RuntimeOrigin: OriginTra
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use frame_support::{construct_runtime, derive_impl, parameter_types, traits::Equals};
|
||||
use pezframe_support::{construct_runtime, derive_impl, parameter_types, traits::Equals};
|
||||
use xcm::latest::{Junction::*, OriginKind};
|
||||
|
||||
type Block = frame_system::mocking::MockBlock<Test>;
|
||||
type Block = pezframe_system::mocking::MockBlock<Test>;
|
||||
|
||||
construct_runtime!(
|
||||
pub enum Test
|
||||
{
|
||||
System: frame_system,
|
||||
System: pezframe_system,
|
||||
}
|
||||
);
|
||||
|
||||
#[derive_impl(frame_system::config_preludes::TestDefaultConfig)]
|
||||
impl frame_system::Config for Test {
|
||||
#[derive_impl(pezframe_system::config_preludes::TestDefaultConfig)]
|
||||
impl pezframe_system::Config for Test {
|
||||
type Block = Block;
|
||||
}
|
||||
|
||||
|
||||
@@ -18,15 +18,15 @@
|
||||
|
||||
use crate::{transfer::TransferOverXcmHelperT, TransferOverXcmHelper};
|
||||
use core::marker::PhantomData;
|
||||
use frame_support::traits::{
|
||||
use pezframe_support::traits::{
|
||||
tokens::{Pay, PaymentStatus},
|
||||
Get,
|
||||
};
|
||||
use sp_runtime::traits::TryConvert;
|
||||
use pezsp_runtime::traits::TryConvert;
|
||||
use xcm::prelude::*;
|
||||
use xcm_executor::traits::WaiveDeliveryFees;
|
||||
|
||||
/// Implementation of the `frame_support::traits::tokens::Pay` trait, to allow
|
||||
/// Implementation of the `pezframe_support::traits::tokens::Pay` trait, to allow
|
||||
/// for XCM-based payments of a given `Balance` of some asset ID existing on some chain under
|
||||
/// ownership of some `Interior` location of the local chain to a particular `Beneficiary`. The
|
||||
/// `AssetKind` value is not itself bounded (to avoid the issue of needing to wrap some preexisting
|
||||
@@ -129,7 +129,7 @@ where
|
||||
/// Specialization of the [`PayOverXcm`] trait to allow `[u8; 32]`-based `AccountId` values to be
|
||||
/// paid on a remote chain.
|
||||
///
|
||||
/// Implementation of the [`frame_support::traits::tokens::Pay`] trait, to allow
|
||||
/// Implementation of the [`pezframe_support::traits::tokens::Pay`] trait, to allow
|
||||
/// for XCM payments of a given `Balance` of `AssetKind` existing on a `DestinationChain` under
|
||||
/// ownership of some `Interior` location of the local chain to a particular `Beneficiary`.
|
||||
///
|
||||
|
||||
@@ -18,12 +18,12 @@
|
||||
|
||||
use codec::{Decode, DecodeLimit, FullCodec, MaxEncodedLen};
|
||||
use core::{fmt::Debug, marker::PhantomData};
|
||||
use frame_support::{
|
||||
use pezframe_support::{
|
||||
dispatch::GetDispatchInfo,
|
||||
traits::{ProcessMessage, ProcessMessageError},
|
||||
};
|
||||
use scale_info::TypeInfo;
|
||||
use sp_weights::{Weight, WeightMeter};
|
||||
use pezsp_weights::{Weight, WeightMeter};
|
||||
use xcm::{prelude::*, MAX_XCM_DECODE_DEPTH};
|
||||
|
||||
const LOG_TARGET: &str = "xcm::process-message";
|
||||
@@ -133,7 +133,7 @@ mod tests {
|
||||
use super::*;
|
||||
use alloc::vec;
|
||||
use codec::Encode;
|
||||
use frame_support::{
|
||||
use pezframe_support::{
|
||||
assert_err, assert_ok,
|
||||
traits::{ProcessMessageError, ProcessMessageError::*},
|
||||
};
|
||||
@@ -156,7 +156,7 @@ mod tests {
|
||||
#[test]
|
||||
fn process_message_trivial_fails() {
|
||||
// Trap makes it fail.
|
||||
sp_io::TestExternalities::default().execute_with(|| {
|
||||
pezsp_io::TestExternalities::default().execute_with(|| {
|
||||
assert!(!process(v3_xcm(false)).unwrap());
|
||||
assert!(!process(v4_xcm(false)).unwrap());
|
||||
assert!(!process(v5_xcm(false)).unwrap());
|
||||
@@ -216,7 +216,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn process_message_overweight_fails() {
|
||||
sp_io::TestExternalities::default().execute_with(|| {
|
||||
pezsp_io::TestExternalities::default().execute_with(|| {
|
||||
for msg in [v4_xcm(true), v4_xcm(false), v4_xcm(false), v3_xcm(false)] {
|
||||
let msg = &msg.encode()[..];
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
use alloc::vec::Vec;
|
||||
use codec::Encode;
|
||||
use core::{marker::PhantomData, result::Result};
|
||||
use frame_system::unique;
|
||||
use pezframe_system::unique;
|
||||
use xcm::prelude::*;
|
||||
use xcm_executor::{traits::FeeReason, FeesMode};
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
// Shared test utilities and implementations for the XCM Builder.
|
||||
|
||||
use alloc::vec::Vec;
|
||||
use frame_support::{
|
||||
use pezframe_support::{
|
||||
parameter_types,
|
||||
traits::{Contains, CrateVersion, PalletInfoData, PalletsInfoAccess},
|
||||
};
|
||||
@@ -125,13 +125,13 @@ impl PalletsInfoAccess for TestPalletsInfo {
|
||||
PalletInfoData {
|
||||
index: 0,
|
||||
name: "System",
|
||||
module_name: "pallet_system",
|
||||
module_name: "pezpallet_system",
|
||||
crate_version: CrateVersion { major: 1, minor: 10, patch: 1 },
|
||||
},
|
||||
PalletInfoData {
|
||||
index: 1,
|
||||
name: "Balances",
|
||||
module_name: "pallet_balances",
|
||||
module_name: "pezpallet_balances",
|
||||
crate_version: CrateVersion { major: 1, minor: 42, patch: 69 },
|
||||
},
|
||||
]
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
use super::mock::*;
|
||||
use crate::{universal_exports::*, WithTopicSource};
|
||||
use frame_support::{parameter_types, traits::Get};
|
||||
use pezframe_support::{parameter_types, traits::Get};
|
||||
use std::{cell::RefCell, marker::PhantomData};
|
||||
use xcm::AlwaysLatest;
|
||||
use xcm_executor::{
|
||||
|
||||
@@ -19,7 +19,7 @@ use crate::test_utils::TrappedAssets;
|
||||
|
||||
#[test]
|
||||
fn sovereign_paid_remote_exporter_produces_xcm_which_does_not_trap_assets() {
|
||||
frame_support::parameter_types! {
|
||||
pezframe_support::parameter_types! {
|
||||
pub BridgeFeeAsset: Location = Parent.into();
|
||||
pub LocalNetwork: NetworkId = ExecutorUniversalLocation::get().global_consensus().expect("valid `NetworkId`");
|
||||
pub LocalBridgeLocation: Location = match &ExecutorUniversalLocation::get().split_global() {
|
||||
@@ -54,7 +54,7 @@ fn sovereign_paid_remote_exporter_produces_xcm_which_does_not_trap_assets() {
|
||||
)
|
||||
.expect("valid message");
|
||||
let message = Xcm::<TestCall>::from(message.0 .1);
|
||||
let mut message_id = message.using_encoded(sp_io::hashing::blake2_256);
|
||||
let mut message_id = message.using_encoded(pezsp_io::hashing::blake2_256);
|
||||
|
||||
// allow origin to pass barrier
|
||||
let origin = Location::new(1, Teyrchain(50));
|
||||
|
||||
@@ -24,7 +24,7 @@ fn expect_pallet_should_work() {
|
||||
let message = Xcm(vec![ExpectPallet {
|
||||
index: 1,
|
||||
name: b"Balances".as_ref().into(),
|
||||
module_name: b"pallet_balances".as_ref().into(),
|
||||
module_name: b"pezpallet_balances".as_ref().into(),
|
||||
crate_major: 1,
|
||||
min_crate_minor: 42,
|
||||
}]);
|
||||
@@ -41,7 +41,7 @@ fn expect_pallet_should_work() {
|
||||
let message = Xcm(vec![ExpectPallet {
|
||||
index: 1,
|
||||
name: b"Balances".as_ref().into(),
|
||||
module_name: b"pallet_balances".as_ref().into(),
|
||||
module_name: b"pezpallet_balances".as_ref().into(),
|
||||
crate_major: 1,
|
||||
min_crate_minor: 41,
|
||||
}]);
|
||||
@@ -62,7 +62,7 @@ fn expect_pallet_should_fail_correctly() {
|
||||
let message = Xcm(vec![ExpectPallet {
|
||||
index: 1,
|
||||
name: b"Balances".as_ref().into(),
|
||||
module_name: b"pallet_balances".as_ref().into(),
|
||||
module_name: b"pezpallet_balances".as_ref().into(),
|
||||
crate_major: 1,
|
||||
min_crate_minor: 60,
|
||||
}]);
|
||||
@@ -85,7 +85,7 @@ fn expect_pallet_should_fail_correctly() {
|
||||
let message = Xcm(vec![ExpectPallet {
|
||||
index: 1,
|
||||
name: b"System".as_ref().into(),
|
||||
module_name: b"pallet_balances".as_ref().into(),
|
||||
module_name: b"pezpallet_balances".as_ref().into(),
|
||||
crate_major: 1,
|
||||
min_crate_minor: 42,
|
||||
}]);
|
||||
@@ -108,7 +108,7 @@ fn expect_pallet_should_fail_correctly() {
|
||||
let message = Xcm(vec![ExpectPallet {
|
||||
index: 1,
|
||||
name: b"Balances".as_ref().into(),
|
||||
module_name: b"pallet_system".as_ref().into(),
|
||||
module_name: b"pezpallet_system".as_ref().into(),
|
||||
crate_major: 1,
|
||||
min_crate_minor: 42,
|
||||
}]);
|
||||
@@ -131,7 +131,7 @@ fn expect_pallet_should_fail_correctly() {
|
||||
let message = Xcm(vec![ExpectPallet {
|
||||
index: 0,
|
||||
name: b"Balances".as_ref().into(),
|
||||
module_name: b"pallet_balances".as_ref().into(),
|
||||
module_name: b"pezpallet_balances".as_ref().into(),
|
||||
crate_major: 1,
|
||||
min_crate_minor: 42,
|
||||
}]);
|
||||
@@ -154,7 +154,7 @@ fn expect_pallet_should_fail_correctly() {
|
||||
let message = Xcm(vec![ExpectPallet {
|
||||
index: 2,
|
||||
name: b"Balances".as_ref().into(),
|
||||
module_name: b"pallet_balances".as_ref().into(),
|
||||
module_name: b"pezpallet_balances".as_ref().into(),
|
||||
crate_major: 1,
|
||||
min_crate_minor: 42,
|
||||
}]);
|
||||
@@ -177,7 +177,7 @@ fn expect_pallet_should_fail_correctly() {
|
||||
let message = Xcm(vec![ExpectPallet {
|
||||
index: 1,
|
||||
name: b"Balances".as_ref().into(),
|
||||
module_name: b"pallet_balances".as_ref().into(),
|
||||
module_name: b"pezpallet_balances".as_ref().into(),
|
||||
crate_major: 2,
|
||||
min_crate_minor: 42,
|
||||
}]);
|
||||
@@ -200,7 +200,7 @@ fn expect_pallet_should_fail_correctly() {
|
||||
let message = Xcm(vec![ExpectPallet {
|
||||
index: 1,
|
||||
name: b"Balances".as_ref().into(),
|
||||
module_name: b"pallet_balances".as_ref().into(),
|
||||
module_name: b"pezpallet_balances".as_ref().into(),
|
||||
crate_major: 0,
|
||||
min_crate_minor: 42,
|
||||
}]);
|
||||
@@ -223,7 +223,7 @@ fn expect_pallet_should_fail_correctly() {
|
||||
let message = Xcm(vec![ExpectPallet {
|
||||
index: 1,
|
||||
name: b"Balances".as_ref().into(),
|
||||
module_name: b"pallet_balances".as_ref().into(),
|
||||
module_name: b"pezpallet_balances".as_ref().into(),
|
||||
crate_major: 1,
|
||||
min_crate_minor: 43,
|
||||
}]);
|
||||
|
||||
@@ -33,11 +33,11 @@ pub use core::{
|
||||
fmt::Debug,
|
||||
ops::ControlFlow,
|
||||
};
|
||||
use frame_support::traits::{ContainsPair, Everything};
|
||||
pub use frame_support::{
|
||||
use pezframe_support::traits::{ContainsPair, Everything};
|
||||
pub use pezframe_support::{
|
||||
dispatch::{DispatchInfo, DispatchResultWithPostInfo, GetDispatchInfo, PostDispatchInfo},
|
||||
ensure, parameter_types,
|
||||
sp_runtime::{traits::Dispatchable, DispatchError, DispatchErrorWithPostInfo},
|
||||
pezsp_runtime::{traits::Dispatchable, DispatchError, DispatchErrorWithPostInfo},
|
||||
traits::{Contains, Get, IsInVec},
|
||||
};
|
||||
pub use xcm::latest::{prelude::*, QueryId, Weight};
|
||||
@@ -418,7 +418,7 @@ pub fn response(query_id: u64) -> Option<Response> {
|
||||
/// Mock implementation of the [`QueryHandler`] trait for creating XCM success queries and expecting
|
||||
/// responses.
|
||||
pub struct TestQueryHandler<T, BlockNumber>(core::marker::PhantomData<(T, BlockNumber)>);
|
||||
impl<T: Config, BlockNumber: sp_runtime::traits::Zero + Encode> QueryHandler
|
||||
impl<T: Config, BlockNumber: pezsp_runtime::traits::Zero + Encode> QueryHandler
|
||||
for TestQueryHandler<T, BlockNumber>
|
||||
{
|
||||
type BlockNumber = BlockNumber;
|
||||
@@ -778,5 +778,5 @@ pub fn fungible_multi_asset(location: Location, amount: u128) -> Asset {
|
||||
}
|
||||
|
||||
pub fn fake_message_hash<T>(message: &Xcm<T>) -> XcmHash {
|
||||
message.using_encoded(sp_io::hashing::blake2_256)
|
||||
message.using_encoded(pezsp_io::hashing::blake2_256)
|
||||
}
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
use super::{test_utils::*, *};
|
||||
use alloc::{vec, vec::Vec};
|
||||
use frame_support::{
|
||||
use pezframe_support::{
|
||||
assert_err,
|
||||
traits::{ConstU32, ContainsPair, ProcessMessageError},
|
||||
weights::constants::{WEIGHT_PROOF_SIZE_PER_MB, WEIGHT_REF_TIME_PER_SECOND},
|
||||
|
||||
@@ -16,28 +16,28 @@
|
||||
|
||||
use super::*;
|
||||
|
||||
use frame_support::{
|
||||
use pezframe_support::{
|
||||
construct_runtime, derive_impl, parameter_types,
|
||||
traits::{AsEnsureOriginWithArg, ConstU32, Disabled, Everything, Nothing},
|
||||
};
|
||||
use frame_system::{EnsureRoot, EnsureSigned};
|
||||
use pezframe_system::{EnsureRoot, EnsureSigned};
|
||||
use pezkuwi_primitives::{AccountIndex, BlakeTwo256, Signature};
|
||||
use sp_runtime::{generic, traits::MaybeEquivalence, AccountId32, BuildStorage};
|
||||
use pezsp_runtime::{generic, traits::MaybeEquivalence, AccountId32, BuildStorage};
|
||||
use xcm_executor::{traits::ConvertLocation, XcmExecutor};
|
||||
use xcm_simulator::ParaId;
|
||||
|
||||
pub type TxExtension = (
|
||||
frame_system::AuthorizeCall<Test>,
|
||||
frame_system::CheckNonZeroSender<Test>,
|
||||
frame_system::CheckSpecVersion<Test>,
|
||||
frame_system::CheckTxVersion<Test>,
|
||||
frame_system::CheckGenesis<Test>,
|
||||
frame_system::CheckMortality<Test>,
|
||||
frame_system::CheckNonce<Test>,
|
||||
frame_system::CheckWeight<Test>,
|
||||
frame_system::WeightReclaim<Test>,
|
||||
pezframe_system::AuthorizeCall<Test>,
|
||||
pezframe_system::CheckNonZeroSender<Test>,
|
||||
pezframe_system::CheckSpecVersion<Test>,
|
||||
pezframe_system::CheckTxVersion<Test>,
|
||||
pezframe_system::CheckGenesis<Test>,
|
||||
pezframe_system::CheckMortality<Test>,
|
||||
pezframe_system::CheckNonce<Test>,
|
||||
pezframe_system::CheckWeight<Test>,
|
||||
pezframe_system::WeightReclaim<Test>,
|
||||
);
|
||||
pub type Address = sp_runtime::MultiAddress<AccountId, AccountIndex>;
|
||||
pub type Address = pezsp_runtime::MultiAddress<AccountId, AccountIndex>;
|
||||
pub type UncheckedExtrinsic =
|
||||
generic::UncheckedExtrinsic<Address, RuntimeCall, Signature, TxExtension>;
|
||||
pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
|
||||
@@ -48,20 +48,20 @@ pub type AccountId = AccountId32;
|
||||
|
||||
construct_runtime!(
|
||||
pub enum Test {
|
||||
System: frame_system,
|
||||
Balances: pallet_balances,
|
||||
Assets: pallet_assets,
|
||||
Salary: pallet_salary,
|
||||
XcmPallet: pallet_xcm,
|
||||
System: pezframe_system,
|
||||
Balances: pezpallet_balances,
|
||||
Assets: pezpallet_assets,
|
||||
Salary: pezpallet_salary,
|
||||
XcmPallet: pezpallet_xcm,
|
||||
}
|
||||
);
|
||||
|
||||
#[derive_impl(frame_system::config_preludes::TestDefaultConfig)]
|
||||
impl frame_system::Config for Test {
|
||||
#[derive_impl(pezframe_system::config_preludes::TestDefaultConfig)]
|
||||
impl pezframe_system::Config for Test {
|
||||
type Block = Block;
|
||||
type AccountData = pallet_balances::AccountData<Balance>;
|
||||
type AccountData = pezpallet_balances::AccountData<Balance>;
|
||||
type AccountId = AccountId;
|
||||
type Lookup = sp_runtime::traits::IdentityLookup<AccountId>;
|
||||
type Lookup = pezsp_runtime::traits::IdentityLookup<AccountId>;
|
||||
}
|
||||
|
||||
pub type Balance = u128;
|
||||
@@ -70,7 +70,7 @@ parameter_types! {
|
||||
pub const ExistentialDeposit: Balance = 1;
|
||||
}
|
||||
|
||||
impl pallet_balances::Config for Test {
|
||||
impl pezpallet_balances::Config for Test {
|
||||
type MaxLocks = ConstU32<0>;
|
||||
type Balance = Balance;
|
||||
type RuntimeEvent = RuntimeEvent;
|
||||
@@ -97,7 +97,7 @@ parameter_types! {
|
||||
pub const RemoveItemsLimit: u32 = 50;
|
||||
}
|
||||
|
||||
impl pallet_assets::Config for Test {
|
||||
impl pezpallet_assets::Config for Test {
|
||||
type RuntimeEvent = RuntimeEvent;
|
||||
type Balance = Balance;
|
||||
type AssetId = AssetIdForAssets;
|
||||
@@ -145,7 +145,7 @@ pub struct AssetKind {
|
||||
}
|
||||
|
||||
pub struct LocatableAssetKindConverter;
|
||||
impl sp_runtime::traits::TryConvert<AssetKind, LocatableAssetId> for LocatableAssetKindConverter {
|
||||
impl pezsp_runtime::traits::TryConvert<AssetKind, LocatableAssetId> for LocatableAssetKindConverter {
|
||||
fn try_convert(value: AssetKind) -> Result<LocatableAssetId, AssetKind> {
|
||||
Ok(LocatableAssetId { asset_id: value.asset_id, location: value.destination })
|
||||
}
|
||||
@@ -196,7 +196,7 @@ pub type LocalAssetsTransactor = FungiblesAdapter<
|
||||
>;
|
||||
|
||||
type OriginConverter = (
|
||||
pallet_xcm::XcmPassthrough<RuntimeOrigin>,
|
||||
pezpallet_xcm::XcmPassthrough<RuntimeOrigin>,
|
||||
SignedAccountId32AsNative<AnyNetwork, RuntimeOrigin>,
|
||||
);
|
||||
type Barrier = AllowUnpaidExecutionFrom<Everything>;
|
||||
@@ -273,7 +273,7 @@ pub(crate) type SovereignAccountOf = (
|
||||
HashedDescription<AccountId, DescribeFamily<DescribeAllTerminal>>,
|
||||
);
|
||||
|
||||
impl pallet_xcm::Config for Test {
|
||||
impl pezpallet_xcm::Config for Test {
|
||||
type RuntimeEvent = RuntimeEvent;
|
||||
type SendXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
|
||||
type XcmRouter = TestMessageSender;
|
||||
@@ -287,15 +287,15 @@ impl pallet_xcm::Config for Test {
|
||||
type RuntimeOrigin = RuntimeOrigin;
|
||||
type RuntimeCall = RuntimeCall;
|
||||
const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100;
|
||||
type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion;
|
||||
type AdvertisedXcmVersion = pezpallet_xcm::CurrentXcmVersion;
|
||||
type TrustedLockers = ();
|
||||
type SovereignAccountOf = SovereignAccountOf;
|
||||
type Currency = Balances;
|
||||
type CurrencyMatcher = IsConcrete<RelayLocation>;
|
||||
type MaxLockers = frame_support::traits::ConstU32<8>;
|
||||
type MaxRemoteLockConsumers = frame_support::traits::ConstU32<0>;
|
||||
type MaxLockers = pezframe_support::traits::ConstU32<8>;
|
||||
type MaxRemoteLockConsumers = pezframe_support::traits::ConstU32<0>;
|
||||
type RemoteLockConsumerIdentifier = ();
|
||||
type WeightInfo = pallet_xcm::TestWeightInfo;
|
||||
type WeightInfo = pezpallet_xcm::TestWeightInfo;
|
||||
type AdminOrigin = EnsureRoot<AccountId>;
|
||||
type AuthorizedAliasConsideration = Disabled;
|
||||
}
|
||||
@@ -310,10 +310,10 @@ pub fn sibling_chain_account_id(para_id: u32, account: [u8; 32]) -> AccountId {
|
||||
SovereignAccountOf::convert_location(&location).unwrap()
|
||||
}
|
||||
|
||||
pub fn new_test_ext() -> sp_io::TestExternalities {
|
||||
let mut t = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();
|
||||
pub fn new_test_ext() -> pezsp_io::TestExternalities {
|
||||
let mut t = pezframe_system::GenesisConfig::<Test>::default().build_storage().unwrap();
|
||||
let admin_account: AccountId = AccountId::new([0u8; 32]);
|
||||
pallet_assets::GenesisConfig::<Test> {
|
||||
pezpallet_assets::GenesisConfig::<Test> {
|
||||
assets: vec![
|
||||
(0, admin_account.clone(), true, MINIMUM_BALANCE),
|
||||
(1, admin_account.clone(), true, MINIMUM_BALANCE),
|
||||
@@ -334,7 +334,7 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
|
||||
}
|
||||
.assimilate_storage(&mut t)
|
||||
.unwrap();
|
||||
let mut ext = sp_io::TestExternalities::new(t);
|
||||
let mut ext = pezsp_io::TestExternalities::new(t);
|
||||
ext.execute_with(|| System::set_block_number(1));
|
||||
ext
|
||||
}
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
//! correct destination
|
||||
|
||||
use super::{mock::*, *};
|
||||
use frame_support::{assert_ok, traits::tokens::Pay};
|
||||
use pezframe_support::{assert_ok, traits::tokens::Pay};
|
||||
|
||||
parameter_types! {
|
||||
pub SenderAccount: AccountId = AccountId::new([3u8; 32]);
|
||||
|
||||
@@ -18,11 +18,11 @@
|
||||
|
||||
use super::{mock::*, *};
|
||||
|
||||
use frame_support::{
|
||||
use pezframe_support::{
|
||||
assert_ok,
|
||||
traits::{tokens::GetSalary, RankedMembers},
|
||||
};
|
||||
use sp_runtime::{traits::ConvertToValue, DispatchResult};
|
||||
use pezsp_runtime::{traits::ConvertToValue, DispatchResult};
|
||||
|
||||
parameter_types! {
|
||||
pub Interior: InteriorLocation = Plurality { id: BodyId::Treasury, part: BodyPart::Voice }.into();
|
||||
@@ -73,7 +73,7 @@ impl RankedMembers for TestClub {
|
||||
}
|
||||
fn demote(who: &Self::AccountId) -> DispatchResult {
|
||||
CLUB.with(|club| match club.borrow().get(who) {
|
||||
None => Err(sp_runtime::DispatchError::Unavailable),
|
||||
None => Err(pezsp_runtime::DispatchError::Unavailable),
|
||||
Some(&0) => {
|
||||
club.borrow_mut().remove(&who);
|
||||
Ok(())
|
||||
@@ -104,7 +104,7 @@ impl GetSalary<Rank, AccountId, Balance> for FixedSalary {
|
||||
}
|
||||
}
|
||||
|
||||
impl pallet_salary::Config for Test {
|
||||
impl pezpallet_salary::Config for Test {
|
||||
type WeightInfo = ();
|
||||
type RuntimeEvent = RuntimeEvent;
|
||||
type Paymaster = SalaryPayOverXcm;
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
use super::{mock::*, *};
|
||||
use crate::AliasesIntoAccountId32;
|
||||
use frame_support::{
|
||||
use pezframe_support::{
|
||||
assert_ok, parameter_types,
|
||||
traits::{fungible::Mutate, fungibles::Mutate as FungiblesMutate},
|
||||
};
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn pallet_query_should_work() {
|
||||
fn pezpallet_query_should_work() {
|
||||
AllowUnpaidFrom::set(vec![[Teyrchain(1)].into()]);
|
||||
// They want to transfer 100 of our native asset from sovereign account of teyrchain #1 into #2
|
||||
// and let them know to hand it to account #3.
|
||||
@@ -52,12 +52,12 @@ fn pallet_query_should_work() {
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn pallet_query_with_results_should_work() {
|
||||
fn pezpallet_query_with_results_should_work() {
|
||||
AllowUnpaidFrom::set(vec![[Teyrchain(1)].into()]);
|
||||
// They want to transfer 100 of our native asset from sovereign account of teyrchain #1 into #2
|
||||
// and let them know to hand it to account #3.
|
||||
let message = Xcm(vec![QueryPallet {
|
||||
module_name: "pallet_balances".into(),
|
||||
module_name: "pezpallet_balances".into(),
|
||||
response_info: QueryResponseInfo {
|
||||
destination: Teyrchain(1).into(),
|
||||
query_id: 1,
|
||||
@@ -82,7 +82,7 @@ fn pallet_query_with_results_should_work() {
|
||||
vec![PalletInfo::new(
|
||||
1,
|
||||
b"Balances".as_ref().into(),
|
||||
b"pallet_balances".as_ref().into(),
|
||||
b"pezpallet_balances".as_ref().into(),
|
||||
1,
|
||||
42,
|
||||
69,
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
// along with Pezkuwi. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
use super::*;
|
||||
use frame_support::{assert_ok, traits::Everything};
|
||||
use pezframe_support::{assert_ok, traits::Everything};
|
||||
use xcm_executor::traits::Properties;
|
||||
|
||||
fn props() -> Properties {
|
||||
@@ -42,7 +42,7 @@ fn trailing_set_topic_as_id_with_unique_topic_should_work() {
|
||||
);
|
||||
|
||||
// simulate sending `valid_xcm` with the `WithUniqueTopic` router
|
||||
let mut sent_xcm = sp_io::TestExternalities::default().execute_with(|| {
|
||||
let mut sent_xcm = pezsp_io::TestExternalities::default().execute_with(|| {
|
||||
assert_ok!(send_xcm::<WithUniqueTopic<TestMessageSender>>(Location::parent(), valid_xcm,));
|
||||
sent_xcm()
|
||||
});
|
||||
|
||||
@@ -162,9 +162,9 @@ fn errors_should_return_unused_weight() {
|
||||
|
||||
#[test]
|
||||
fn weight_bounds_should_respect_instructions_limit() {
|
||||
use sp_tracing::capture_test_logs;
|
||||
use pezsp_tracing::capture_test_logs;
|
||||
|
||||
sp_tracing::init_for_tests();
|
||||
pezsp_tracing::init_for_tests();
|
||||
MaxInstructions::set(3);
|
||||
// 4 instructions are too many.
|
||||
let log_capture = capture_test_logs!({
|
||||
|
||||
@@ -14,8 +14,8 @@
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Pezkuwi. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
use frame_support::storage::{with_transaction, TransactionOutcome};
|
||||
use sp_runtime::DispatchError;
|
||||
use pezframe_support::storage::{with_transaction, TransactionOutcome};
|
||||
use pezsp_runtime::DispatchError;
|
||||
use xcm::latest::prelude::*;
|
||||
use xcm_executor::traits::ProcessTransaction;
|
||||
|
||||
|
||||
@@ -19,12 +19,12 @@
|
||||
use crate::LocatableAssetId;
|
||||
use alloc::vec;
|
||||
use core::{fmt::Debug, marker::PhantomData};
|
||||
use frame_support::traits::Get;
|
||||
use sp_runtime::traits::TryConvert;
|
||||
use pezframe_support::traits::Get;
|
||||
use pezsp_runtime::traits::TryConvert;
|
||||
use xcm::{latest::Error, opaque::lts::Weight, prelude::*};
|
||||
use xcm_executor::traits::{FeeManager, FeeReason, QueryHandler, QueryResponseStatus};
|
||||
|
||||
pub use frame_support::traits::tokens::transfer::{Transfer, TransferStatus};
|
||||
pub use pezframe_support::traits::tokens::transfer::{Transfer, TransferStatus};
|
||||
|
||||
const LOG_TARGET: &str = "xcm::transfer_over_xcm";
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
// along with Pezkuwi. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
use core::marker::PhantomData;
|
||||
use frame_support::traits::tokens::asset_ops::{
|
||||
use pezframe_support::traits::tokens::asset_ops::{
|
||||
common_strategies::{
|
||||
ChangeOwnerFrom, ConfigValue, DeriveAndReportId, IfOwnedBy, Owner, WithConfig,
|
||||
WithConfigValue,
|
||||
|
||||
@@ -16,9 +16,9 @@
|
||||
|
||||
//! XCM utilities to work with NFT-like entities (unique instances).
|
||||
//! The adapters and other utility types use the
|
||||
//! [`asset_ops`](frame_support::traits::tokens::asset_ops) traits.
|
||||
//! [`asset_ops`](pezframe_support::traits::tokens::asset_ops) traits.
|
||||
|
||||
use sp_runtime::{traits::Convert, DispatchError};
|
||||
use pezsp_runtime::{traits::Convert, DispatchError};
|
||||
use xcm::latest::prelude::*;
|
||||
|
||||
pub mod adapter;
|
||||
|
||||
@@ -22,7 +22,7 @@ use crate::InspectMessageQueues;
|
||||
use alloc::{vec, vec::Vec};
|
||||
use codec::{Decode, Encode};
|
||||
use core::{convert::TryInto, marker::PhantomData};
|
||||
use frame_support::{ensure, traits::Get};
|
||||
use pezframe_support::{ensure, traits::Get};
|
||||
use xcm::prelude::*;
|
||||
use xcm_executor::traits::{validate_export, ExportXcm};
|
||||
use SendError::*;
|
||||
@@ -132,7 +132,7 @@ impl<Exporter: ExportXcm, UniversalLocation: Get<InteriorLocation>> SendXcm
|
||||
let xcm = msg.take().ok_or(MissingArgument)?;
|
||||
|
||||
let hash =
|
||||
(Some(Location::here()), &remote_location).using_encoded(sp_io::hashing::blake2_128);
|
||||
(Some(Location::here()), &remote_location).using_encoded(pezsp_io::hashing::blake2_128);
|
||||
let channel = u32::decode(&mut hash.as_ref()).unwrap_or(0);
|
||||
|
||||
validate_export::<Exporter>(
|
||||
@@ -662,7 +662,7 @@ impl<
|
||||
tracing::debug!(target: "xcm::universal_exports", "Failed to convert destination to versioned location");
|
||||
SendError::DestinationUnsupported })?;
|
||||
|
||||
let id = maybe_id.unwrap_or_else(|| message.using_encoded(sp_io::hashing::blake2_256));
|
||||
let id = maybe_id.unwrap_or_else(|| message.using_encoded(pezsp_io::hashing::blake2_256));
|
||||
let blob = BridgeMessage { universal_dest, message }.encode();
|
||||
Ok(((blob, id), Price::get()))
|
||||
}
|
||||
@@ -676,7 +676,7 @@ impl<
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use frame_support::{
|
||||
use pezframe_support::{
|
||||
assert_err, assert_ok,
|
||||
traits::{Contains, Equals},
|
||||
};
|
||||
@@ -769,7 +769,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn local_exporters_works() {
|
||||
frame_support::parameter_types! {
|
||||
pezframe_support::parameter_types! {
|
||||
pub Local: NetworkId = ByGenesis([0; 32]);
|
||||
pub UniversalLocation: InteriorLocation = [GlobalConsensus(Local::get()), Teyrchain(1234)].into();
|
||||
pub DifferentRemote: NetworkId = ByGenesis([22; 32]);
|
||||
@@ -825,7 +825,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn remote_exporters_works() {
|
||||
frame_support::parameter_types! {
|
||||
pezframe_support::parameter_types! {
|
||||
pub Local: NetworkId = ByGenesis([0; 32]);
|
||||
pub UniversalLocation: InteriorLocation = [GlobalConsensus(Local::get()), Teyrchain(1234)].into();
|
||||
pub DifferentRemote: NetworkId = ByGenesis([22; 32]);
|
||||
@@ -934,7 +934,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn network_export_table_works() {
|
||||
frame_support::parameter_types! {
|
||||
pezframe_support::parameter_types! {
|
||||
pub NetworkA: NetworkId = ByGenesis([0; 32]);
|
||||
pub Teyrchain1000InNetworkA: InteriorLocation = [Teyrchain(1000)].into();
|
||||
pub Teyrchain2000InNetworkA: InteriorLocation = [Teyrchain(2000)].into();
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
use codec::Decode;
|
||||
use core::{marker::PhantomData, result::Result};
|
||||
use frame_support::{
|
||||
use pezframe_support::{
|
||||
dispatch::GetDispatchInfo,
|
||||
traits::{
|
||||
fungible::{Balanced, Credit, Inspect},
|
||||
@@ -27,7 +27,7 @@ use frame_support::{
|
||||
WeightToFee as WeightToFeeT,
|
||||
},
|
||||
};
|
||||
use sp_runtime::traits::{SaturatedConversion, Saturating, Zero};
|
||||
use pezsp_runtime::traits::{SaturatedConversion, Saturating, Zero};
|
||||
use xcm::latest::{prelude::*, GetWeight, Weight};
|
||||
use xcm_executor::{
|
||||
traits::{WeightBounds, WeightTrader},
|
||||
|
||||
@@ -15,21 +15,21 @@
|
||||
// along with Pezkuwi. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
use core::cell::RefCell;
|
||||
use frame_support::{
|
||||
use pezframe_support::{
|
||||
construct_runtime, derive_impl, parameter_types,
|
||||
traits::{Disabled, Everything, Nothing},
|
||||
weights::Weight,
|
||||
};
|
||||
use frame_system::EnsureRoot;
|
||||
use pezframe_system::EnsureRoot;
|
||||
use primitive_types::H256;
|
||||
use sp_runtime::{traits::IdentityLookup, AccountId32, BuildStorage};
|
||||
use pezsp_runtime::{traits::IdentityLookup, AccountId32, BuildStorage};
|
||||
|
||||
use pezkuwi_runtime_teyrchains::{configuration, origin, shared};
|
||||
use pezkuwi_teyrchain_primitives::primitives::Id as ParaId;
|
||||
use xcm::latest::{opaque, prelude::*};
|
||||
use xcm_executor::XcmExecutor;
|
||||
|
||||
use staging_xcm_builder as xcm_builder;
|
||||
use pezstaging_xcm_builder as xcm_builder;
|
||||
|
||||
use xcm_builder::{
|
||||
AccountId32Aliases, AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom,
|
||||
@@ -74,13 +74,13 @@ pub type TestXcmRouter = EnsureDecodableXcm<TestSendXcm>;
|
||||
pub const UNITS: Balance = 1_000_000_000_000;
|
||||
pub const CENTS: Balance = UNITS / 30_000;
|
||||
|
||||
#[derive_impl(frame_system::config_preludes::TestDefaultConfig)]
|
||||
impl frame_system::Config for Runtime {
|
||||
#[derive_impl(pezframe_system::config_preludes::TestDefaultConfig)]
|
||||
impl pezframe_system::Config for Runtime {
|
||||
type RuntimeOrigin = RuntimeOrigin;
|
||||
type RuntimeCall = RuntimeCall;
|
||||
type Nonce = u64;
|
||||
type Hash = H256;
|
||||
type Hashing = ::sp_runtime::traits::BlakeTwo256;
|
||||
type Hashing = ::pezsp_runtime::traits::BlakeTwo256;
|
||||
type AccountId = AccountId;
|
||||
type Lookup = IdentityLookup<Self::AccountId>;
|
||||
type Block = Block;
|
||||
@@ -89,7 +89,7 @@ impl frame_system::Config for Runtime {
|
||||
type BlockLength = ();
|
||||
type Version = ();
|
||||
type PalletInfo = PalletInfo;
|
||||
type AccountData = pallet_balances::AccountData<Balance>;
|
||||
type AccountData = pezpallet_balances::AccountData<Balance>;
|
||||
type OnNewAccount = ();
|
||||
type OnKilledAccount = ();
|
||||
type DbWeight = ();
|
||||
@@ -97,15 +97,15 @@ impl frame_system::Config for Runtime {
|
||||
type SystemWeightInfo = ();
|
||||
type SS58Prefix = ();
|
||||
type OnSetCode = ();
|
||||
type MaxConsumers = frame_support::traits::ConstU32<16>;
|
||||
type MaxConsumers = pezframe_support::traits::ConstU32<16>;
|
||||
}
|
||||
|
||||
parameter_types! {
|
||||
pub ExistentialDeposit: Balance = 1 * CENTS;
|
||||
}
|
||||
|
||||
#[derive_impl(pallet_balances::config_preludes::TestDefaultConfig)]
|
||||
impl pallet_balances::Config for Runtime {
|
||||
#[derive_impl(pezpallet_balances::config_preludes::TestDefaultConfig)]
|
||||
impl pezpallet_balances::Config for Runtime {
|
||||
type Balance = Balance;
|
||||
type ExistentialDeposit = ExistentialDeposit;
|
||||
type AccountStore = System;
|
||||
@@ -202,7 +202,7 @@ impl xcm_executor::Config for XcmConfig {
|
||||
/// sending/executing XCMs.
|
||||
pub type LocalOriginToLocation = SignedToAccountId32<RuntimeOrigin, AccountId, KusamaNetwork>;
|
||||
|
||||
impl pallet_xcm::Config for Runtime {
|
||||
impl pezpallet_xcm::Config for Runtime {
|
||||
type RuntimeEvent = RuntimeEvent;
|
||||
type UniversalLocation = UniversalLocation;
|
||||
type SendXcmOrigin = xcm_builder::EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
|
||||
@@ -217,15 +217,15 @@ impl pallet_xcm::Config for Runtime {
|
||||
type RuntimeCall = RuntimeCall;
|
||||
type RuntimeOrigin = RuntimeOrigin;
|
||||
const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100;
|
||||
type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion;
|
||||
type AdvertisedXcmVersion = pezpallet_xcm::CurrentXcmVersion;
|
||||
type TrustedLockers = ();
|
||||
type SovereignAccountOf = ();
|
||||
type Currency = Balances;
|
||||
type CurrencyMatcher = IsConcrete<KsmLocation>;
|
||||
type MaxLockers = frame_support::traits::ConstU32<8>;
|
||||
type MaxRemoteLockConsumers = frame_support::traits::ConstU32<0>;
|
||||
type MaxLockers = pezframe_support::traits::ConstU32<8>;
|
||||
type MaxRemoteLockConsumers = pezframe_support::traits::ConstU32<0>;
|
||||
type RemoteLockConsumerIdentifier = ();
|
||||
type WeightInfo = pallet_xcm::TestWeightInfo;
|
||||
type WeightInfo = pezpallet_xcm::TestWeightInfo;
|
||||
type AdminOrigin = EnsureRoot<AccountId>;
|
||||
// Aliasing is disabled: xcm_executor::Config::Aliasers is set to `Nothing`.
|
||||
type AuthorizedAliasConsideration = Disabled;
|
||||
@@ -233,26 +233,26 @@ impl pallet_xcm::Config for Runtime {
|
||||
|
||||
impl origin::Config for Runtime {}
|
||||
|
||||
type Block = frame_system::mocking::MockBlock<Runtime>;
|
||||
type Block = pezframe_system::mocking::MockBlock<Runtime>;
|
||||
|
||||
construct_runtime!(
|
||||
pub enum Runtime
|
||||
{
|
||||
System: frame_system,
|
||||
Balances: pallet_balances,
|
||||
System: pezframe_system,
|
||||
Balances: pezpallet_balances,
|
||||
ParasOrigin: origin,
|
||||
XcmPallet: pallet_xcm,
|
||||
XcmPallet: pezpallet_xcm,
|
||||
}
|
||||
);
|
||||
|
||||
pub fn kusama_like_with_balances(balances: Vec<(AccountId, Balance)>) -> sp_io::TestExternalities {
|
||||
let mut t = frame_system::GenesisConfig::<Runtime>::default().build_storage().unwrap();
|
||||
pub fn kusama_like_with_balances(balances: Vec<(AccountId, Balance)>) -> pezsp_io::TestExternalities {
|
||||
let mut t = pezframe_system::GenesisConfig::<Runtime>::default().build_storage().unwrap();
|
||||
|
||||
pallet_balances::GenesisConfig::<Runtime> { balances, ..Default::default() }
|
||||
pezpallet_balances::GenesisConfig::<Runtime> { balances, ..Default::default() }
|
||||
.assimilate_storage(&mut t)
|
||||
.unwrap();
|
||||
|
||||
let mut ext = sp_io::TestExternalities::new(t);
|
||||
let mut ext = pezsp_io::TestExternalities::new(t);
|
||||
ext.execute_with(|| System::set_block_number(1));
|
||||
ext
|
||||
}
|
||||
|
||||
@@ -21,7 +21,7 @@ use mock::{
|
||||
CENTS,
|
||||
};
|
||||
use pezkuwi_teyrchain_primitives::primitives::Id as ParaId;
|
||||
use sp_runtime::traits::AccountIdConversion;
|
||||
use pezsp_runtime::traits::AccountIdConversion;
|
||||
use xcm::latest::{prelude::*, Error::UntrustedTeleportLocation};
|
||||
use xcm_executor::XcmExecutor;
|
||||
use xcm_simulator::fake_message_hash;
|
||||
@@ -96,7 +96,7 @@ fn transfer_asset_works() {
|
||||
weight,
|
||||
);
|
||||
System::assert_last_event(
|
||||
pallet_balances::Event::Transfer { from: ALICE, to: bob.clone(), amount }.into(),
|
||||
pezpallet_balances::Event::Transfer { from: ALICE, to: bob.clone(), amount }.into(),
|
||||
);
|
||||
assert_eq!(r, Outcome::Complete { used: weight });
|
||||
assert_eq!(Balances::free_balance(ALICE), INITIAL_BALANCE - amount);
|
||||
@@ -332,8 +332,8 @@ fn reserve_based_transfer_works() {
|
||||
#[test]
|
||||
fn recursive_xcm_execution_fail() {
|
||||
use crate::mock::*;
|
||||
use frame_support::traits::{Everything, Nothing, ProcessMessageError};
|
||||
use staging_xcm_builder::*;
|
||||
use pezframe_support::traits::{Everything, Nothing, ProcessMessageError};
|
||||
use pezstaging_xcm_builder::*;
|
||||
use std::ops::ControlFlow;
|
||||
use xcm::opaque::latest::prelude::*;
|
||||
use xcm_executor::traits::{DenyExecution, Properties, ShouldExecute};
|
||||
|
||||
Reference in New Issue
Block a user