Refactoring Checkpoint: (WIP)

bizinikiwi/pezframe/contracts/mock-network/Cargo.toml

@@ -37,7 +37,7 @@ pezsp-tracing = { workspace = true, default-features = true }
 xcm = { workspace = true }
 xcm-builder = { workspace = true, default-features = true }
 xcm-executor = { workspace = true }
-xcm-simulator = { workspace = true, default-features = true }
+xcm-pez-simulator = { workspace = true, default-features = true }
 
 [dev-dependencies]
 pezpallet-contracts-fixtures = { workspace = true }
@@ -80,6 +80,6 @@ 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",
 ]

bizinikiwi/pezframe/contracts/mock-network/src/lib.rs

@@ -27,8 +27,8 @@ pub use pezpallet_contracts::test_utils::{ALICE, BOB};
 use pezsp_runtime::BuildStorage;
 use xcm::latest::prelude::*;
 use xcm_executor::traits::ConvertLocation;
-pub use xcm_simulator::TestExt;
-use xcm_simulator::{decl_test_network, decl_test_relay_chain, decl_test_teyrchain};
+pub use xcm_pez_simulator::TestExt;
+use xcm_pez_simulator::{decl_test_network, decl_test_relay_chain, decl_test_teyrchain};
 
 // Accounts
 pub const ADMIN: pezsp_runtime::AccountId32 = pezsp_runtime::AccountId32::new([0u8; 32]);

bizinikiwi/pezframe/contracts/mock-network/src/mocks/relay_message_queue.rs

@@ -16,7 +16,7 @@
 
 use pezframe_support::{parameter_types, weights::Weight};
 use xcm::latest::prelude::*;
-use xcm_simulator::{
+use xcm_pez_simulator::{
 	AggregateMessageOrigin, ProcessMessage, ProcessMessageError, UmpQueueId, WeightMeter,
 };
 

bizinikiwi/pezframe/contracts/mock-network/src/tests.rs

@@ -28,7 +28,7 @@ use pezpallet_contracts::{test_utils::builder::*, Code};
 use pezpallet_contracts_fixtures::compile_module;
 use pezpallet_contracts_uapi::ReturnErrorCode;
 use xcm::{v4::prelude::*, VersionedLocation, VersionedXcm};
-use xcm_simulator::TestExt;
+use xcm_pez_simulator::TestExt;
 
 macro_rules! assert_return_code {
 	( $x:expr , $y:expr $(,)? ) => {{