Refactoring Checkpoint: (WIP)
This commit is contained in:
@@ -44,7 +44,7 @@ use xcm_executor::{
|
||||
traits::{ConvertLocation, TransferType},
|
||||
XcmExecutor,
|
||||
};
|
||||
use xcm_runtime_apis::fees::{
|
||||
use xcm_runtime_pezapis::fees::{
|
||||
runtime_decl_for_xcm_payment_api::XcmPaymentApiV2, Error as XcmPaymentApiError,
|
||||
};
|
||||
|
||||
@@ -77,8 +77,8 @@ pub fn teleports_for_native_asset_works<
|
||||
+ pezpallet_xcm::Config
|
||||
+ teyrchain_info::Config
|
||||
+ pezpallet_collator_selection::Config
|
||||
+ pezcumulus_pallet_teyrchain_system::Config
|
||||
+ pezcumulus_pallet_xcmp_queue::Config
|
||||
+ pezcumulus_pezpallet_teyrchain_system::Config
|
||||
+ pezcumulus_pezpallet_xcmp_queue::Config
|
||||
+ pezpallet_timestamp::Config,
|
||||
AllPalletsWithoutSystem:
|
||||
OnInitialize<BlockNumberFor<Runtime>> + OnFinalize<BlockNumberFor<Runtime>>,
|
||||
@@ -95,7 +95,7 @@ pub fn teleports_for_native_asset_works<
|
||||
XcmConfig: xcm_executor::Config,
|
||||
CheckingAccount: Get<Option<AccountIdOf<Runtime>>>,
|
||||
HrmpChannelOpener: pezframe_support::inherent::ProvideInherent<
|
||||
Call = pezcumulus_pallet_teyrchain_system::Call<Runtime>,
|
||||
Call = pezcumulus_pezpallet_teyrchain_system::Call<Runtime>,
|
||||
>,
|
||||
{
|
||||
let buy_execution_fee_amount_eta =
|
||||
@@ -194,7 +194,7 @@ pub fn teleports_for_native_asset_works<
|
||||
let native_asset_to_teleport_away = native_asset_amount_unit * 3.into();
|
||||
// 2. try to teleport asset back to the relaychain
|
||||
{
|
||||
<pezcumulus_pallet_teyrchain_system::Pallet<Runtime> as UpwardMessageSender>::ensure_successful_delivery();
|
||||
<pezcumulus_pezpallet_teyrchain_system::Pallet<Runtime> as UpwardMessageSender>::ensure_successful_delivery();
|
||||
|
||||
let dest = Location::parent();
|
||||
let mut dest_beneficiary = Location::parent()
|
||||
@@ -372,7 +372,7 @@ pub fn teleports_for_foreign_assets_works<
|
||||
asset_owner: AccountIdOf<Runtime>,
|
||||
unwrap_pallet_xcm_event: Box<dyn Fn(Vec<u8>) -> Option<pezpallet_xcm::Event<Runtime>>>,
|
||||
unwrap_xcmp_queue_event: Box<
|
||||
dyn Fn(Vec<u8>) -> Option<pezcumulus_pallet_xcmp_queue::Event<Runtime>>,
|
||||
dyn Fn(Vec<u8>) -> Option<pezcumulus_pezpallet_xcmp_queue::Event<Runtime>>,
|
||||
>,
|
||||
) where
|
||||
Runtime: pezframe_system::Config
|
||||
@@ -381,8 +381,8 @@ pub fn teleports_for_foreign_assets_works<
|
||||
+ pezpallet_xcm::Config
|
||||
+ teyrchain_info::Config
|
||||
+ pezpallet_collator_selection::Config
|
||||
+ pezcumulus_pallet_teyrchain_system::Config
|
||||
+ pezcumulus_pallet_xcmp_queue::Config
|
||||
+ pezcumulus_pezpallet_teyrchain_system::Config
|
||||
+ pezcumulus_pezpallet_xcmp_queue::Config
|
||||
+ pezpallet_assets::Config<ForeignAssetsPalletInstance, ReserveData = ForeignAssetReserveData>
|
||||
+ pezpallet_timestamp::Config,
|
||||
AllPalletsWithoutSystem:
|
||||
@@ -393,7 +393,7 @@ pub fn teleports_for_foreign_assets_works<
|
||||
XcmConfig: xcm_executor::Config,
|
||||
CheckingAccount: Get<AccountIdOf<Runtime>>,
|
||||
HrmpChannelOpener: pezframe_support::inherent::ProvideInherent<
|
||||
Call = pezcumulus_pallet_teyrchain_system::Call<Runtime>,
|
||||
Call = pezcumulus_pezpallet_teyrchain_system::Call<Runtime>,
|
||||
>,
|
||||
WeightToFee: pezframe_support::weights::WeightToFee<Balance = Balance>,
|
||||
<WeightToFee as pezframe_support::weights::WeightToFee>::Balance: From<u128> + Into<u128>,
|
||||
@@ -747,7 +747,7 @@ pub fn asset_transactor_transfer_with_local_consensus_currency_works<Runtime, Xc
|
||||
+ pezpallet_xcm::Config
|
||||
+ teyrchain_info::Config
|
||||
+ pezpallet_collator_selection::Config
|
||||
+ pezcumulus_pallet_teyrchain_system::Config
|
||||
+ pezcumulus_pezpallet_teyrchain_system::Config
|
||||
+ pezpallet_timestamp::Config,
|
||||
AccountIdOf<Runtime>: Into<[u8; 32]>,
|
||||
ValidatorIdOf<Runtime>: From<AccountIdOf<Runtime>>,
|
||||
@@ -872,7 +872,7 @@ pub fn asset_transactor_transfer_with_pallet_assets_instance_works<
|
||||
+ pezpallet_xcm::Config
|
||||
+ teyrchain_info::Config
|
||||
+ pezpallet_collator_selection::Config
|
||||
+ pezcumulus_pallet_teyrchain_system::Config
|
||||
+ pezcumulus_pezpallet_teyrchain_system::Config
|
||||
+ pezpallet_assets::Config<AssetsPalletInstance>
|
||||
+ pezpallet_timestamp::Config,
|
||||
AccountIdOf<Runtime>: Into<[u8; 32]>,
|
||||
@@ -1140,7 +1140,7 @@ pub fn create_and_manage_foreign_assets_for_local_consensus_teyrchain_assets_wor
|
||||
+ pezpallet_xcm::Config
|
||||
+ teyrchain_info::Config
|
||||
+ pezpallet_collator_selection::Config
|
||||
+ pezcumulus_pallet_teyrchain_system::Config
|
||||
+ pezcumulus_pezpallet_teyrchain_system::Config
|
||||
+ pezpallet_assets::Config<ForeignAssetsPalletInstance>
|
||||
+ pezpallet_timestamp::Config,
|
||||
AccountIdOf<Runtime>: Into<[u8; 32]>,
|
||||
@@ -1461,7 +1461,7 @@ pub fn reserve_transfer_native_asset_to_non_teleport_para_works<
|
||||
alice_account: AccountIdOf<Runtime>,
|
||||
unwrap_pallet_xcm_event: Box<dyn Fn(Vec<u8>) -> Option<pezpallet_xcm::Event<Runtime>>>,
|
||||
unwrap_xcmp_queue_event: Box<
|
||||
dyn Fn(Vec<u8>) -> Option<pezcumulus_pallet_xcmp_queue::Event<Runtime>>,
|
||||
dyn Fn(Vec<u8>) -> Option<pezcumulus_pezpallet_xcmp_queue::Event<Runtime>>,
|
||||
>,
|
||||
weight_limit: WeightLimit,
|
||||
) where
|
||||
@@ -1471,8 +1471,8 @@ pub fn reserve_transfer_native_asset_to_non_teleport_para_works<
|
||||
+ pezpallet_xcm::Config
|
||||
+ teyrchain_info::Config
|
||||
+ pezpallet_collator_selection::Config
|
||||
+ pezcumulus_pallet_teyrchain_system::Config
|
||||
+ pezcumulus_pallet_xcmp_queue::Config
|
||||
+ pezcumulus_pezpallet_teyrchain_system::Config
|
||||
+ pezcumulus_pezpallet_xcmp_queue::Config
|
||||
+ pezpallet_timestamp::Config,
|
||||
AllPalletsWithoutSystem:
|
||||
OnInitialize<BlockNumberFor<Runtime>> + OnFinalize<BlockNumberFor<Runtime>>,
|
||||
@@ -1488,7 +1488,7 @@ pub fn reserve_transfer_native_asset_to_non_teleport_para_works<
|
||||
From<<Runtime as pezframe_system::Config>::AccountId>,
|
||||
<Runtime as pezframe_system::Config>::AccountId: From<AccountId>,
|
||||
HrmpChannelOpener: pezframe_support::inherent::ProvideInherent<
|
||||
Call = pezcumulus_pallet_teyrchain_system::Call<Runtime>,
|
||||
Call = pezcumulus_pezpallet_teyrchain_system::Call<Runtime>,
|
||||
>,
|
||||
HrmpChannelSource: XcmpMessageSource,
|
||||
{
|
||||
@@ -1599,7 +1599,7 @@ pub fn reserve_transfer_native_asset_to_non_teleport_para_works<
|
||||
.into_iter()
|
||||
.filter_map(|e| unwrap_xcmp_queue_event(e.event.encode()))
|
||||
.find_map(|e| match e {
|
||||
pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { message_hash } =>
|
||||
pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { message_hash } =>
|
||||
Some(message_hash),
|
||||
_ => None,
|
||||
});
|
||||
@@ -1657,8 +1657,8 @@ where
|
||||
+ pezpallet_xcm::Config
|
||||
+ teyrchain_info::Config
|
||||
+ pezpallet_collator_selection::Config
|
||||
+ pezcumulus_pallet_teyrchain_system::Config
|
||||
+ pezcumulus_pallet_xcmp_queue::Config
|
||||
+ pezcumulus_pezpallet_teyrchain_system::Config
|
||||
+ pezcumulus_pezpallet_xcmp_queue::Config
|
||||
+ pezpallet_timestamp::Config
|
||||
+ pezpallet_assets::Config<
|
||||
pezpallet_assets::Instance1,
|
||||
@@ -1844,8 +1844,8 @@ pub fn xcm_payment_api_foreign_asset_pool_works<
|
||||
+ pezpallet_xcm::Config
|
||||
+ teyrchain_info::Config
|
||||
+ pezpallet_collator_selection::Config
|
||||
+ pezcumulus_pallet_teyrchain_system::Config
|
||||
+ pezcumulus_pallet_xcmp_queue::Config
|
||||
+ pezcumulus_pezpallet_teyrchain_system::Config
|
||||
+ pezcumulus_pezpallet_xcmp_queue::Config
|
||||
+ pezpallet_timestamp::Config
|
||||
+ pezpallet_assets::Config<
|
||||
pezpallet_assets::Instance2,
|
||||
|
||||
@@ -60,7 +60,7 @@ pub fn limited_reserve_transfer_assets_for_native_asset_works<
|
||||
alice_account: AccountIdOf<Runtime>,
|
||||
unwrap_pallet_xcm_event: Box<dyn Fn(Vec<u8>) -> Option<pezpallet_xcm::Event<Runtime>>>,
|
||||
unwrap_xcmp_queue_event: Box<
|
||||
dyn Fn(Vec<u8>) -> Option<pezcumulus_pallet_xcmp_queue::Event<Runtime>>,
|
||||
dyn Fn(Vec<u8>) -> Option<pezcumulus_pezpallet_xcmp_queue::Event<Runtime>>,
|
||||
>,
|
||||
prepare_configuration: fn() -> TestBridgingConfig,
|
||||
weight_limit: WeightLimit,
|
||||
@@ -73,8 +73,8 @@ pub fn limited_reserve_transfer_assets_for_native_asset_works<
|
||||
+ pezpallet_xcm::Config
|
||||
+ teyrchain_info::Config
|
||||
+ pezpallet_collator_selection::Config
|
||||
+ pezcumulus_pallet_teyrchain_system::Config
|
||||
+ pezcumulus_pallet_xcmp_queue::Config
|
||||
+ pezcumulus_pezpallet_teyrchain_system::Config
|
||||
+ pezcumulus_pezpallet_xcmp_queue::Config
|
||||
+ pezpallet_timestamp::Config,
|
||||
AllPalletsWithoutSystem:
|
||||
OnInitialize<BlockNumberFor<Runtime>> + OnFinalize<BlockNumberFor<Runtime>>,
|
||||
@@ -90,7 +90,7 @@ pub fn limited_reserve_transfer_assets_for_native_asset_works<
|
||||
From<<Runtime as pezframe_system::Config>::AccountId>,
|
||||
<Runtime as pezframe_system::Config>::AccountId: From<AccountId>,
|
||||
HrmpChannelOpener: pezframe_support::inherent::ProvideInherent<
|
||||
Call = pezcumulus_pallet_teyrchain_system::Call<Runtime>,
|
||||
Call = pezcumulus_pezpallet_teyrchain_system::Call<Runtime>,
|
||||
>,
|
||||
HrmpChannelSource: XcmpMessageSource,
|
||||
{
|
||||
@@ -220,7 +220,7 @@ pub fn limited_reserve_transfer_assets_for_native_asset_works<
|
||||
.into_iter()
|
||||
.filter_map(|e| unwrap_xcmp_queue_event(e.event.encode()))
|
||||
.find_map(|e| match e {
|
||||
pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { message_hash } =>
|
||||
pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { message_hash } =>
|
||||
Some(message_hash),
|
||||
_ => None,
|
||||
});
|
||||
@@ -357,8 +357,8 @@ pub fn receive_reserve_asset_deposited_from_different_consensus_works<
|
||||
+ pezpallet_xcm::Config
|
||||
+ teyrchain_info::Config
|
||||
+ pezpallet_collator_selection::Config
|
||||
+ pezcumulus_pallet_teyrchain_system::Config
|
||||
+ pezcumulus_pallet_xcmp_queue::Config
|
||||
+ pezcumulus_pezpallet_teyrchain_system::Config
|
||||
+ pezcumulus_pezpallet_xcmp_queue::Config
|
||||
+ pezpallet_assets::Config<ForeignAssetsPalletInstance, ReserveData = ForeignAssetReserveData>
|
||||
+ pezpallet_timestamp::Config,
|
||||
AllPalletsWithoutSystem:
|
||||
@@ -528,8 +528,8 @@ pub fn report_bridge_status_from_xcm_bridge_router_works<
|
||||
+ pezpallet_xcm::Config
|
||||
+ teyrchain_info::Config
|
||||
+ pezpallet_collator_selection::Config
|
||||
+ pezcumulus_pallet_teyrchain_system::Config
|
||||
+ pezcumulus_pallet_xcmp_queue::Config
|
||||
+ pezcumulus_pezpallet_teyrchain_system::Config
|
||||
+ pezcumulus_pezpallet_xcmp_queue::Config
|
||||
+ pezpallet_xcm_bridge_hub_router::Config<XcmBridgeHubRouterInstance>
|
||||
+ pezpallet_timestamp::Config,
|
||||
AllPalletsWithoutSystem:
|
||||
|
||||
Reference in New Issue
Block a user