Refactoring Checkpoint: (WIP)

pezkuwi/xcm/pezpallet-xcm/Cargo.toml

@@ -30,7 +30,7 @@ pezsp-runtime = { workspace = true }
 xcm = { workspace = true }
 xcm-builder = { workspace = true }
 xcm-executor = { workspace = true }
-xcm-runtime-apis = { workspace = true }
+xcm-runtime-pezapis = { workspace = true }
 
 # marked optional, used in benchmarking
 pezframe-benchmarking = { optional = true, workspace = true }
@@ -42,7 +42,7 @@ pezpallet-assets = { workspace = true, default-features = true }
 pezkuwi-runtime-teyrchains = { workspace = true, default-features = true }
 pezkuwi-teyrchain-primitives = { workspace = true, default-features = true }
 pezsp-tracing = { workspace = true, default-features = true }
-xcm-simulator = { workspace = true, default-features = true }
+xcm-pez-simulator = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
@@ -61,7 +61,7 @@ std = [
   "tracing/std",
   "xcm-builder/std",
   "xcm-executor/std",
-  "xcm-runtime-apis/std",
+  "xcm-runtime-pezapis/std",
   "xcm/std",
 ]
 runtime-benchmarks = [
@@ -76,8 +76,8 @@ runtime-benchmarks = [
   "pezsp-runtime/runtime-benchmarks",
   "xcm-builder/runtime-benchmarks",
   "xcm-executor/runtime-benchmarks",
-  "xcm-runtime-apis/runtime-benchmarks",
-  "xcm-simulator/runtime-benchmarks",
+  "xcm-runtime-pezapis/runtime-benchmarks",
+  "xcm-pez-simulator/runtime-benchmarks",
   "xcm/runtime-benchmarks",
 ]
 test-utils = ["std"]

pezkuwi/xcm/pezpallet-xcm/precompiles/Cargo.toml

@@ -36,7 +36,7 @@ scale-info = { workspace = true, default-features = true }
 pezsp-io = { workspace = true, default-features = true }
 pezsp-runtime = { workspace = true, default-features = true }
 xcm-builder = { workspace = true, default-features = true }
-xcm-simulator = { workspace = true, default-features = true }
+xcm-pez-simulator = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
@@ -71,7 +71,7 @@ runtime-benchmarks = [
   "pezsp-runtime/runtime-benchmarks",
   "xcm-builder/runtime-benchmarks",
   "xcm-executor/runtime-benchmarks",
-  "xcm-simulator/runtime-benchmarks",
+  "xcm-pez-simulator/runtime-benchmarks",
   "xcm/runtime-benchmarks",
 ]
 try-runtime = [

pezkuwi/xcm/pezpallet-xcm/precompiles/src/mock.rs

@@ -40,7 +40,7 @@ use xcm_executor::{
 	traits::{Identity, JustTry},
 	XcmExecutor,
 };
-use xcm_simulator::helpers::derive_topic_id;
+use xcm_pez_simulator::helpers::derive_topic_id;
 
 use crate::XcmPrecompile;
 

pezkuwi/xcm/pezpallet-xcm/src/lib.rs

@@ -72,7 +72,7 @@ use xcm_executor::{
 	},
 	AssetsInHolding,
 };
-use xcm_runtime_apis::{
+use xcm_runtime_pezapis::{
 	authorized_aliases::{Error as AuthorizedAliasersApiError, OriginAliaser},
 	dry_run::{CallDryRunEffects, Error as XcmDryRunApiError, XcmDryRunEffects},
 	fees::Error as XcmPaymentApiError,
@@ -3063,7 +3063,7 @@ impl<T: Config> Pallet<T> {
 	///
 	/// Returns not only the call result and events, but also the local XCM, if any,
 	/// and any XCMs forwarded to other locations.
-	/// Meant to be used in the `xcm_runtime_apis::dry_run::DryRunApi` runtime API.
+	/// Meant to be used in the `xcm_runtime_pezapis::dry_run::DryRunApi` runtime API.
 	pub fn dry_run_call<Runtime, Router, OriginCaller, RuntimeCall>(
 		origin: OriginCaller,
 		call: RuntimeCall,
@@ -3119,7 +3119,7 @@ impl<T: Config> Pallet<T> {
 	/// Dry-runs `xcm` with the given `origin_location`.
 	///
 	/// Returns execution result, events, and any forwarded XCMs to other locations.
-	/// Meant to be used in the `xcm_runtime_apis::dry_run::DryRunApi` runtime API.
+	/// Meant to be used in the `xcm_runtime_pezapis::dry_run::DryRunApi` runtime API.
 	pub fn dry_run_xcm<Router>(
 		origin_location: VersionedLocation,
 		xcm: VersionedXcm<<T as Config>::RuntimeCall>,
@@ -3326,7 +3326,7 @@ impl<T: Config> Pallet<T> {
 
 		let asset_id = versioned_asset_id.clone().try_into().map_err(|()| {
 			tracing::trace!(
-				target: "xcm::xcm_runtime_apis::query_delivery_fees",
+				target: "xcm::xcm_runtime_pezapis::query_delivery_fees",
 				"Failed to convert asset id: {versioned_asset_id:?}!"
 			);
 			XcmPaymentApiError::VersionedConversionFailed

pezkuwi/xcm/pezpallet-xcm/src/migration.rs

@@ -456,7 +456,7 @@ pub mod v1 {
 }
 
 /// When adding a new XCM version, we need to run this migration for `pezpallet_xcm` to ensure that all
-/// previously stored data with subkey prefix `XCM_VERSION-1` (and below) are migrated to the
+/// previously stored data with pez_subkey prefix `XCM_VERSION-1` (and below) are migrated to the
 /// `XCM_VERSION`.
 ///
 /// NOTE: This migration can be permanently added to the runtime migrations.

pezkuwi/xcm/pezpallet-xcm/src/mock.rs

@@ -45,7 +45,7 @@ use xcm_executor::{
 	traits::{Identity, JustTry},
 	XcmExecutor,
 };
-use xcm_simulator::helpers::derive_topic_id;
+use xcm_pez_simulator::helpers::derive_topic_id;
 
 use crate::{self as pezpallet_xcm, TestWeightInfo};
 

pezkuwi/xcm/pezpallet-xcm/src/tests/mod.rs

@@ -46,7 +46,7 @@ use xcm_executor::{
 	traits::{Properties, QueryHandler, QueryResponseStatus, ShouldExecute},
 	XcmExecutor,
 };
-use xcm_simulator::fake_message_hash;
+use xcm_pez_simulator::fake_message_hash;
 
 const ALICE: AccountId = AccountId::new([0u8; 32]);
 const BOB: AccountId = AccountId::new([1u8; 32]);