Refactoring Checkpoint: (WIP)

pezcumulus/teyrchains/integration-tests/emulated/tests/assets/asset-hub-zagros/src/lib.rs

@@ -34,13 +34,13 @@ mod imports {
 	pub(crate) use xcm_executor::traits::TransferType;
 
 	// Pezcumulus
-	pub(crate) use asset_test_utils::xcm_helpers;
+	pub(crate) use asset_test_pezutils::xcm_helpers;
 	pub(crate) use emulated_integration_tests_common::{
 		accounts::DUMMY_EMPTY,
 		test_relay_is_trusted_teleporter, test_teyrchain_is_trusted_teleporter,
 		test_teyrchain_is_trusted_teleporter_for_relay,
 		test_xcm_fee_querying_apis_work_for_asset_hub,
-		xcm_emulator::{
+		xcm_pez_emulator::{
 			assert_expected_events, bx, Chain, RelayChain as Relay, Test, TestArgs, TestContext,
 			TestExt, Teyrchain as Para,
 		},
@@ -48,7 +48,7 @@ mod imports {
 			fee_asset, find_mq_processed_id, find_xcm_sent_message_id,
 			get_amount_from_versioned_assets, non_fee_asset, xcm_transact_paid_execution,
 		},
-		xcm_simulator::helpers::TopicIdTracker,
+		xcm_pez_simulator::helpers::TopicIdTracker,
 		PenpalATeleportableAssetLocation, ASSETS_PALLET_ID, RESERVABLE_ASSET_ID, USDT_ID, XCM_V3,
 	};
 	pub(crate) use teyrchains_common::{AccountId, Balance};
@@ -67,14 +67,14 @@ mod imports {
 			genesis::{AssetHubZagrosAssetOwner, ED as ASSET_HUB_ZAGROS_ED},
 			AssetHubZagrosParaPallet as AssetHubZagrosPallet,
 		},
-		bridge_hub_zagros_emulated_chain::{
-			bridge_hub_zagros_runtime::xcm_config::{self as bhw_xcm_config},
+		pezbridge_hub_zagros_emulated_chain::{
+			pezbridge_hub_zagros_runtime::xcm_config::{self as bhw_xcm_config},
 			BridgeHubZagrosParaPallet as BridgeHubZagrosPallet,
 		},
 		collectives_zagros_emulated_chain::CollectivesZagrosParaPallet as CollectivesZagrosPallet,
 		coretime_zagros_emulated_chain::CoretimeZagrosParaPallet as CoretimeZagrosPallet,
-		penpal_emulated_chain::{
-			penpal_runtime::xcm_config::{
+		pez_penpal_emulated_chain::{
+			pez_penpal_runtime::xcm_config::{
 				CustomizableAssetFromSystemAssetHub as PenpalCustomizableAssetFromSystemAssetHub,
 				LocalReservableFromAssetHub as PenpalLocalReservableFromAssetHub,
 				LocalTeleportableToAssetHub as PenpalLocalTeleportableToAssetHub,

pezcumulus/teyrchains/integration-tests/emulated/tests/assets/asset-hub-zagros/src/tests/exchange_asset.rs

@@ -23,7 +23,7 @@ use crate::{
 use asset_hub_zagros_runtime::{
 	xcm_config::ZagrosLocation, Balances, ForeignAssets, PezkuwiXcm, RuntimeOrigin,
 };
-use emulated_integration_tests_common::{accounts::ALICE, xcm_emulator::TestExt};
+use emulated_integration_tests_common::{accounts::ALICE, xcm_pez_emulator::TestExt};
 use pezframe_support::{
 	assert_err_ignore_postinfo, assert_ok,
 	traits::fungible::{Inspect, Mutate},

pezcumulus/teyrchains/integration-tests/emulated/tests/assets/asset-hub-zagros/src/tests/fellowship_treasury.rs

@@ -96,7 +96,7 @@ fn create_and_claim_treasury_spend() {
 					to: to == &alice,
 					amount: amount == &SPEND_AMOUNT,
 				},
-				RuntimeEvent::XcmpQueue(pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
+				RuntimeEvent::XcmpQueue(pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
 				RuntimeEvent::MessageQueue(pezpallet_message_queue::Event::Processed { success: true ,.. }) => {},
 			]
 		);

pezcumulus/teyrchains/integration-tests/emulated/tests/assets/asset-hub-zagros/src/tests/set_asset_claimer.rs

@@ -24,7 +24,7 @@ use pezframe_support::{assert_ok, pezsp_runtime::traits::Dispatchable};
 use xcm_executor::traits::ConvertLocation;
 use zagros_system_emulated_network::{
 	asset_hub_zagros_emulated_chain::asset_hub_zagros_runtime::RuntimeOrigin as AssetHubRuntimeOrigin,
-	bridge_hub_zagros_emulated_chain::bridge_hub_zagros_runtime::RuntimeOrigin as BridgeHubRuntimeOrigin,
+	pezbridge_hub_zagros_emulated_chain::pezbridge_hub_zagros_runtime::RuntimeOrigin as BridgeHubRuntimeOrigin,
 };
 
 #[test]

pezcumulus/teyrchains/integration-tests/emulated/tests/assets/asset-hub-zagros/src/tests/treasury.rs

@@ -97,7 +97,7 @@ fn create_and_claim_treasury_spend() {
 					to: to == &alice,
 					amount: amount == &SPEND_AMOUNT,
 				},
-				RuntimeEvent::TeyrchainSystem(pezcumulus_pallet_teyrchain_system::Event::UpwardMessageSent { .. }) => {},
+				RuntimeEvent::TeyrchainSystem(pezcumulus_pezpallet_teyrchain_system::Event::UpwardMessageSent { .. }) => {},
 				RuntimeEvent::MessageQueue(pezpallet_message_queue::Event::Processed { success: true ,.. }) => {},
 			]
 		);

pezcumulus/teyrchains/integration-tests/emulated/tests/assets/asset-hub-zagros/src/tests/xcm_fee_estimation.rs

@@ -19,7 +19,7 @@ use crate::{create_pool_with_wnd_on, imports::*};
 
 use emulated_integration_tests_common::test_can_estimate_and_pay_exact_fees;
 use pezframe_support::dispatch::RawOrigin;
-use xcm_runtime_apis::{
+use xcm_runtime_pezapis::{
 	dry_run::runtime_decl_for_dry_run_api::DryRunApiV2,
 	fees::runtime_decl_for_xcm_payment_api::XcmPaymentApiV2,
 };