chore: regenerate umbrella crate, fix feature propagation

pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/people/people-pezkuwichain/src/genesis.rs

@@ -17,10 +17,10 @@
 use pezsp_core::storage::Storage;
 
 // Pezcumulus
-use pezcumulus_primitives_core::ParaId;
 use emulated_integration_tests_common::{
 	accounts, build_genesis_storage, collators, SAFE_XCM_VERSION,
 };
+use pezcumulus_primitives_core::ParaId;
 use teyrchains_common::Balance;
 
 pub const PARA_ID: u32 = 1004;

pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/people/people-zagros/src/genesis.rs

@@ -17,10 +17,10 @@
 use pezsp_core::storage::Storage;
 
 // Pezcumulus
-use pezcumulus_primitives_core::ParaId;
 use emulated_integration_tests_common::{
 	accounts, build_genesis_storage, collators, SAFE_XCM_VERSION,
 };
+use pezcumulus_primitives_core::ParaId;
 use teyrchains_common::Balance;
 
 pub const PARA_ID: u32 = 1004;

pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/pezbridges/bridge-hub-pezkuwichain/src/genesis.rs

@@ -49,8 +49,8 @@ pub fn genesis() -> Storage {
 				.into_iter()
 				.map(|(acc, aura)| {
 					(
-						acc.clone(),                                           // account id
-						acc,                                                   // validator id
+						acc.clone(),                                              // account id
+						acc,                                                      // validator id
 						pezbridge_hub_pezkuwichain_runtime::SessionKeys { aura }, // session keys
 					)
 				})
@@ -69,17 +69,18 @@ pub fn genesis() -> Storage {
 			owner: Some(Keyring::Bob.to_account_id()),
 			..Default::default()
 		},
-		xcm_over_bridge_hub_zagros: pezbridge_hub_pezkuwichain_runtime::XcmOverBridgeHubZagrosConfig {
-			opened_bridges: vec![
-				// open AHR -> AHW bridge
-				(
-					Location::new(1, [Teyrchain(1000)]),
-					Junctions::from([ByGenesis(ZAGROS_GENESIS_HASH).into(), Teyrchain(1000)]),
-					Some(bp_messages::LegacyLaneId([0, 0, 0, 2])),
-				),
-			],
-			..Default::default()
-		},
+		xcm_over_bridge_hub_zagros:
+			pezbridge_hub_pezkuwichain_runtime::XcmOverBridgeHubZagrosConfig {
+				opened_bridges: vec![
+					// open AHR -> AHW bridge
+					(
+						Location::new(1, [Teyrchain(1000)]),
+						Junctions::from([ByGenesis(ZAGROS_GENESIS_HASH).into(), Teyrchain(1000)]),
+						Some(bp_messages::LegacyLaneId([0, 0, 0, 2])),
+					),
+				],
+				..Default::default()
+			},
 		ethereum_system: pezbridge_hub_pezkuwichain_runtime::EthereumSystemConfig {
 			para_id: PARA_ID.into(),
 			asset_hub_para_id: ASSETHUB_PARA_ID.into(),

pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/pezbridges/bridge-hub-zagros/src/genesis.rs

@@ -49,8 +49,8 @@ pub fn genesis() -> Storage {
 				.into_iter()
 				.map(|(acc, aura)| {
 					(
-						acc.clone(),                                     // account id
-						acc,                                             // validator id
+						acc.clone(),                                        // account id
+						acc,                                                // validator id
 						pezbridge_hub_zagros_runtime::SessionKeys { aura }, // session keys
 					)
 				})
@@ -61,14 +61,16 @@ pub fn genesis() -> Storage {
 			safe_xcm_version: Some(SAFE_XCM_VERSION),
 			..Default::default()
 		},
-		bridge_pezkuwichain_grandpa: pezbridge_hub_zagros_runtime::BridgePezkuwichainGrandpaConfig {
-			owner: Some(Keyring::Bob.to_account_id()),
-			..Default::default()
-		},
-		bridge_pezkuwichain_messages: pezbridge_hub_zagros_runtime::BridgePezkuwichainMessagesConfig {
-			owner: Some(Keyring::Bob.to_account_id()),
-			..Default::default()
-		},
+		bridge_pezkuwichain_grandpa:
+			pezbridge_hub_zagros_runtime::BridgePezkuwichainGrandpaConfig {
+				owner: Some(Keyring::Bob.to_account_id()),
+				..Default::default()
+			},
+		bridge_pezkuwichain_messages:
+			pezbridge_hub_zagros_runtime::BridgePezkuwichainMessagesConfig {
+				owner: Some(Keyring::Bob.to_account_id()),
+				..Default::default()
+			},
 		xcm_over_bridge_hub_pezkuwichain:
 			pezbridge_hub_zagros_runtime::XcmOverBridgeHubPezkuwichainConfig {
 				opened_bridges: vec![

pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/testing/penpal/src/genesis.rs

@@ -22,7 +22,9 @@ use pezsp_keyring::Sr25519Keyring as Keyring;
 use emulated_integration_tests_common::{
 	accounts, build_genesis_storage, collators, SAFE_XCM_VERSION,
 };
-use pez_penpal_runtime::xcm_config::{LocalReservableFromAssetHub, RelayLocation, UsdtFromAssetHub};
+use pez_penpal_runtime::xcm_config::{
+	LocalReservableFromAssetHub, RelayLocation, UsdtFromAssetHub,
+};
 use teyrchains_common::{AccountId, Balance};
 // Penpal
 pub const PARA_ID_A: u32 = 2000;
@@ -56,8 +58,8 @@ pub fn genesis(para_id: u32) -> Storage {
 				.into_iter()
 				.map(|(acc, aura)| {
 					(
-						acc.clone(),                          // account id
-						acc,                                  // validator id
+						acc.clone(),                              // account id
+						acc,                                      // validator id
 						pez_penpal_runtime::SessionKeys { aura }, // session keys
 					)
 				})

pezcumulus/teyrchains/integration-tests/emulated/common/src/impls.rs

@@ -65,7 +65,9 @@ use bp_messages::{
 	MessageKey, OutboundLaneData,
 };
 pub use bp_xcm_bridge_hub::XcmBridgeHubCall;
-use pezpallet_bridge_messages::{Config as BridgeMessagesConfig, LaneIdOf, OutboundLanes, Pezpallet};
+use pezpallet_bridge_messages::{
+	Config as BridgeMessagesConfig, LaneIdOf, OutboundLanes, Pezpallet,
+};
 pub use pezpallet_bridge_messages::{
 	Instance1 as BridgeMessagesInstance1, Instance2 as BridgeMessagesInstance2,
 	Instance3 as BridgeMessagesInstance3,
@@ -112,9 +114,10 @@ where
 				OutboundLanes::<S, SI>::get(lane).unwrap().latest_received_nonce;
 
 			(latest_received_nonce + 1..=latest_generated_nonce).for_each(|nonce| {
-				let encoded_payload: Vec<u8> = Pezpallet::<S, SI>::outbound_message_data(lane, nonce)
-					.expect("Bridge message does not exist")
-					.into();
+				let encoded_payload: Vec<u8> =
+					Pezpallet::<S, SI>::outbound_message_data(lane, nonce)
+						.expect("Bridge message does not exist")
+						.into();
 				let payload = Vec::<u8>::decode(&mut &encoded_payload[..])
 					.expect("Decoding XCM message failed");
 				let message = BridgeMessage { lane_id: LaneIdWrapper(lane).into(), nonce, payload };

pezcumulus/teyrchains/integration-tests/emulated/networks/pezkuwichain-system/src/lib.rs

@@ -14,17 +14,17 @@
 // limitations under the License.
 
 pub use asset_hub_pezkuwichain_emulated_chain;
-pub use pezbridge_hub_pezkuwichain_emulated_chain;
 pub use coretime_pezkuwichain_emulated_chain;
-pub use pez_penpal_emulated_chain;
 pub use people_pezkuwichain_emulated_chain;
+pub use pez_penpal_emulated_chain;
+pub use pezbridge_hub_pezkuwichain_emulated_chain;
 pub use pezkuwichain_emulated_chain;
 
 use asset_hub_pezkuwichain_emulated_chain::AssetHubPezkuwichain;
-use pezbridge_hub_pezkuwichain_emulated_chain::BridgeHubPezkuwichain;
 use coretime_pezkuwichain_emulated_chain::CoretimePezkuwichain;
-use pez_penpal_emulated_chain::{PenpalA, PenpalB};
 use people_pezkuwichain_emulated_chain::PeoplePezkuwichain;
+use pez_penpal_emulated_chain::{PenpalA, PenpalB};
+use pezbridge_hub_pezkuwichain_emulated_chain::BridgeHubPezkuwichain;
 use pezkuwichain_emulated_chain::Pezkuwichain;
 
 // Pezcumulus

pezcumulus/teyrchains/integration-tests/emulated/networks/pezkuwichain-zagros-system/src/lib.rs

@@ -15,17 +15,17 @@
 
 pub use asset_hub_pezkuwichain_emulated_chain;
 pub use asset_hub_zagros_emulated_chain;
+pub use pez_penpal_emulated_chain;
 pub use pezbridge_hub_pezkuwichain_emulated_chain;
 pub use pezbridge_hub_zagros_emulated_chain;
-pub use pez_penpal_emulated_chain;
 pub use pezkuwichain_emulated_chain;
 pub use zagros_emulated_chain;
 
 use asset_hub_pezkuwichain_emulated_chain::AssetHubPezkuwichain;
 use asset_hub_zagros_emulated_chain::AssetHubZagros;
+use pez_penpal_emulated_chain::{PenpalA, PenpalB};
 use pezbridge_hub_pezkuwichain_emulated_chain::BridgeHubPezkuwichain;
 use pezbridge_hub_zagros_emulated_chain::BridgeHubZagros;
-use pez_penpal_emulated_chain::{PenpalA, PenpalB};
 use pezkuwichain_emulated_chain::Pezkuwichain;
 use zagros_emulated_chain::Zagros;
 

pezcumulus/teyrchains/integration-tests/emulated/networks/zagros-system/src/lib.rs

@@ -14,19 +14,19 @@
 // limitations under the License.
 
 pub use asset_hub_zagros_emulated_chain;
-pub use pezbridge_hub_zagros_emulated_chain;
 pub use collectives_zagros_emulated_chain;
 pub use coretime_zagros_emulated_chain;
-pub use pez_penpal_emulated_chain;
 pub use people_zagros_emulated_chain;
+pub use pez_penpal_emulated_chain;
+pub use pezbridge_hub_zagros_emulated_chain;
 pub use zagros_emulated_chain;
 
 use asset_hub_zagros_emulated_chain::AssetHubZagros;
-use pezbridge_hub_zagros_emulated_chain::BridgeHubZagros;
 use collectives_zagros_emulated_chain::CollectivesZagros;
 use coretime_zagros_emulated_chain::CoretimeZagros;
-use pez_penpal_emulated_chain::{PenpalA, PenpalB};
 use people_zagros_emulated_chain::PeopleZagros;
+use pez_penpal_emulated_chain::{PenpalA, PenpalB};
+use pezbridge_hub_zagros_emulated_chain::BridgeHubZagros;
 use zagros_emulated_chain::Zagros;
 
 // Pezcumulus

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

@@ -39,13 +39,13 @@ mod imports {
 		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_helpers::{
+			fee_asset, get_amount_from_versioned_assets, non_fee_asset, xcm_transact_paid_execution,
+		},
 		xcm_pez_emulator::{
 			assert_expected_events, bx, Chain, RelayChain as Relay, Test, TestArgs, TestContext,
 			TestExt, Teyrchain as Para,
 		},
-		xcm_helpers::{
-			fee_asset, get_amount_from_versioned_assets, non_fee_asset, xcm_transact_paid_execution,
-		},
 		PenpalATeleportableAssetLocation, ASSETS_PALLET_ID, RESERVABLE_ASSET_ID, XCM_V3,
 	};
 	pub(crate) use pezkuwichain_system_emulated_network::{

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

@@ -113,15 +113,16 @@ fn spend_roc_on_asset_hub() {
 		let asset_hub_location: Location = [Teyrchain(1000)].into();
 		let native_asset = Location::parent();
 
-		let treasury_spend_call = RuntimeCall::Treasury(pezpallet_treasury::Call::<Runtime>::spend {
-			asset_kind: bx!(VersionedLocatableAsset::from((
-				asset_hub_location.clone(),
-				native_asset.into()
-			))),
-			amount: treasury_spend_balance,
-			beneficiary: bx!(VersionedLocation::from(alice_location)),
-			valid_from: None,
-		});
+		let treasury_spend_call =
+			RuntimeCall::Treasury(pezpallet_treasury::Call::<Runtime>::spend {
+				asset_kind: bx!(VersionedLocatableAsset::from((
+					asset_hub_location.clone(),
+					native_asset.into()
+				))),
+				amount: treasury_spend_balance,
+				beneficiary: bx!(VersionedLocation::from(alice_location)),
+				valid_from: None,
+			});
 
 		assert_ok!(treasury_spend_call.dispatch(treasury_origin));
 

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

@@ -40,14 +40,14 @@ mod imports {
 		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_pez_emulator::{
-			assert_expected_events, bx, Chain, RelayChain as Relay, Test, TestArgs, TestContext,
-			TestExt, Teyrchain as Para,
-		},
 		xcm_helpers::{
 			fee_asset, find_mq_processed_id, find_xcm_sent_message_id,
 			get_amount_from_versioned_assets, non_fee_asset, xcm_transact_paid_execution,
 		},
+		xcm_pez_emulator::{
+			assert_expected_events, bx, Chain, RelayChain as Relay, Test, TestArgs, TestContext,
+			TestExt, Teyrchain as Para,
+		},
 		xcm_pez_simulator::helpers::TopicIdTracker,
 		PenpalATeleportableAssetLocation, ASSETS_PALLET_ID, RESERVABLE_ASSET_ID, USDT_ID, XCM_V3,
 	};
@@ -67,12 +67,9 @@ mod imports {
 			genesis::{AssetHubZagrosAssetOwner, ED as ASSET_HUB_ZAGROS_ED},
 			AssetHubZagrosParaPallet as AssetHubZagrosPallet,
 		},
-		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,
+		people_zagros_emulated_chain::PeopleZagrosParaPallet as PeopleZagrosPallet,
 		pez_penpal_emulated_chain::{
 			pez_penpal_runtime::xcm_config::{
 				CustomizableAssetFromSystemAssetHub as PenpalCustomizableAssetFromSystemAssetHub,
@@ -84,7 +81,10 @@ mod imports {
 			PenpalAParaPallet as PenpalAPallet, PenpalAssetOwner,
 			PenpalBParaPallet as PenpalBPallet,
 		},
-		people_zagros_emulated_chain::PeopleZagrosParaPallet as PeopleZagrosPallet,
+		pezbridge_hub_zagros_emulated_chain::{
+			pezbridge_hub_zagros_runtime::xcm_config::{self as bhw_xcm_config},
+			BridgeHubZagrosParaPallet as BridgeHubZagrosPallet,
+		},
 		zagros_emulated_chain::{
 			genesis::ED as ZAGROS_ED,
 			zagros_runtime::{

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

@@ -15,7 +15,9 @@
 
 use crate::imports::*;
 use codec::Encode;
-use pezframe_support::{assert_ok, pezsp_runtime::traits::Dispatchable, traits::schedule::DispatchTime};
+use pezframe_support::{
+	assert_ok, pezsp_runtime::traits::Dispatchable, traits::schedule::DispatchTime,
+};
 use xcm_executor::traits::ConvertLocation;
 
 #[test]

pezcumulus/teyrchains/integration-tests/emulated/tests/collectives/collectives-zagros/src/lib.rs

@@ -29,7 +29,6 @@ mod imports {
 			asset_hub_zagros_runtime::xcm_config::LocationToAccountId as AssetHubLocationToAccountId,
 			genesis::ED as ASSET_HUB_ZAGROS_ED, AssetHubZagrosParaPallet as AssetHubZagrosPallet,
 		},
-		pezbridge_hub_zagros_emulated_chain::BridgeHubZagrosParaPallet as BridgeHubZagrosPallet,
 		collectives_zagros_emulated_chain::{
 			collectives_zagros_runtime::{
 				fellowship as collectives_fellowship,
@@ -39,8 +38,9 @@ mod imports {
 			CollectivesZagrosParaPallet as CollectivesZagrosPallet,
 		},
 		coretime_zagros_emulated_chain::CoretimeZagrosParaPallet as CoretimeZagrosPallet,
-		pez_penpal_emulated_chain::{PenpalAssetOwner, PenpalBParaPallet as PenpalBPallet},
 		people_zagros_emulated_chain::PeopleZagrosParaPallet as PeopleZagrosPallet,
+		pez_penpal_emulated_chain::{PenpalAssetOwner, PenpalBParaPallet as PenpalBPallet},
+		pezbridge_hub_zagros_emulated_chain::BridgeHubZagrosParaPallet as BridgeHubZagrosPallet,
 		zagros_emulated_chain::{
 			genesis::ED as ZAGROS_ED,
 			zagros_runtime::{governance as zagros_governance, OriginCaller as ZagrosOriginCaller},

pezcumulus/teyrchains/integration-tests/emulated/tests/collectives/collectives-zagros/src/tests/fellowship_treasury.rs

@@ -110,15 +110,16 @@ fn fellowship_treasury_spend() {
 		let asset_hub_location: Location = [Teyrchain(1000)].into();
 		let native_asset = Location::parent();
 
-		let treasury_spend_call = RuntimeCall::Treasury(pezpallet_treasury::Call::<Runtime>::spend {
-			asset_kind: bx!(VersionedLocatableAsset::from((
-				asset_hub_location.clone(),
-				native_asset.into()
-			))),
-			amount: fellowship_treasury_balance,
-			beneficiary: bx!(VersionedLocation::from(fellowship_treasury_location)),
-			valid_from: None,
-		});
+		let treasury_spend_call =
+			RuntimeCall::Treasury(pezpallet_treasury::Call::<Runtime>::spend {
+				asset_kind: bx!(VersionedLocatableAsset::from((
+					asset_hub_location.clone(),
+					native_asset.into()
+				))),
+				amount: fellowship_treasury_balance,
+				beneficiary: bx!(VersionedLocation::from(fellowship_treasury_location)),
+				valid_from: None,
+			});
 
 		assert_ok!(treasury_spend_call.dispatch(treasury_origin));
 
@@ -187,8 +188,8 @@ fn fellowship_treasury_spend() {
 		}]
 		.into();
 
-		let fellowship_treasury_spend_call =
-			RuntimeCall::FellowshipTreasury(pezpallet_treasury::Call::<Runtime, Instance1>::spend {
+		let fellowship_treasury_spend_call = RuntimeCall::FellowshipTreasury(
+			pezpallet_treasury::Call::<Runtime, Instance1>::spend {
 				asset_kind: bx!(VersionedLocatableAsset::from((
 					asset_hub_location,
 					native_asset.into()
@@ -196,7 +197,8 @@ fn fellowship_treasury_spend() {
 				amount: fellowship_spend_balance,
 				beneficiary: bx!(VersionedLocation::from(alice_location)),
 				valid_from: None,
-			});
+			},
+		);
 
 		assert_ok!(fellowship_treasury_spend_call.dispatch(fellows_origin));
 

pezcumulus/teyrchains/integration-tests/emulated/tests/coretime/coretime-pezkuwichain/src/tests/coretime_interface.rs

@@ -15,9 +15,9 @@
 
 use crate::imports::*;
 use pezframe_support::traits::OnInitialize;
-use pezpallet_broker::{ConfigRecord, Configuration, CoreAssignment, CoreMask, ScheduleItem};
 use pezkuwichain_runtime_constants::system_teyrchain::coretime::TIMESLICE_PERIOD;
 use pezkuwichain_system_emulated_network::pezkuwichain_emulated_chain::pezkuwichain_runtime::Dmp;
+use pezpallet_broker::{ConfigRecord, Configuration, CoreAssignment, CoreMask, ScheduleItem};
 use pezsp_runtime::Perbill;
 
 #[test]

pezcumulus/teyrchains/integration-tests/emulated/tests/coretime/coretime-zagros/src/lib.rs

@@ -30,14 +30,14 @@ mod imports {
 		asset_hub_zagros_emulated_chain::{
 			genesis::ED as ASSET_HUB_ZAGROS_ED, AssetHubZagrosParaPallet as AssetHubZagrosPallet,
 		},
-		pezbridge_hub_zagros_emulated_chain::BridgeHubZagrosParaPallet as BridgeHubZagrosPallet,
 		collectives_zagros_emulated_chain::CollectivesZagrosParaPallet as CollectivesZagrosPallet,
 		coretime_zagros_emulated_chain::{
 			self, coretime_zagros_runtime::ExistentialDeposit as CoretimeZagrosExistentialDeposit,
 			genesis::ED as CORETIME_ZAGROS_ED, CoretimeZagrosParaPallet as CoretimeZagrosPallet,
 		},
-		pez_penpal_emulated_chain::{PenpalAssetOwner, PenpalBParaPallet as PenpalBPallet},
 		people_zagros_emulated_chain::PeopleZagrosParaPallet as PeopleZagrosPallet,
+		pez_penpal_emulated_chain::{PenpalAssetOwner, PenpalBParaPallet as PenpalBPallet},
+		pezbridge_hub_zagros_emulated_chain::BridgeHubZagrosParaPallet as BridgeHubZagrosPallet,
 		zagros_emulated_chain::{genesis::ED as ZAGROS_ED, ZagrosRelayPallet as ZagrosPallet},
 		AssetHubZagrosPara as AssetHubZagros, AssetHubZagrosParaReceiver as AssetHubZagrosReceiver,
 		AssetHubZagrosParaSender as AssetHubZagrosSender, BridgeHubZagrosPara as BridgeHubZagros,

pezcumulus/teyrchains/integration-tests/emulated/tests/governance/zagros/src/common.rs

@@ -16,8 +16,8 @@
 
 use crate::imports::*;
 
-/// CollectivesZagros dispatches `pezpallet_xcm::send` with `OriginKind:Xcm` to the dest with encoded
-/// whitelist call.
+/// CollectivesZagros dispatches `pezpallet_xcm::send` with `OriginKind:Xcm` to the dest with
+/// encoded whitelist call.
 #[cfg(test)]
 pub fn collectives_send_whitelist(
 	dest: Location,

pezcumulus/teyrchains/integration-tests/emulated/tests/governance/zagros/src/lib.rs

@@ -19,11 +19,11 @@ mod imports {
 	pub(crate) use codec::Encode;
 	pub(crate) use emulated_integration_tests_common::{
 		impls::{assert_expected_events, bx, TestExt},
-		xcm_pez_emulator::Chain,
 		xcm_helpers::{
 			build_xcm_send_authorize_upgrade_call, call_hash_of,
 			dispatch_whitelisted_call_with_preimage,
 		},
+		xcm_pez_emulator::Chain,
 	};
 	pub(crate) use pezframe_support::{assert_err, assert_ok};
 	pub(crate) use pezsp_runtime::{traits::Dispatchable, DispatchError};

pezcumulus/teyrchains/integration-tests/emulated/tests/people/people-zagros/src/lib.rs

@@ -28,10 +28,8 @@ mod imports {
 	pub(crate) use zagros_system_emulated_network::{
 		self,
 		asset_hub_zagros_emulated_chain::AssetHubZagrosParaPallet as AssetHubZagrosPallet,
-		pezbridge_hub_zagros_emulated_chain::BridgeHubZagrosParaPallet as BridgeHubZagrosPallet,
 		collectives_zagros_emulated_chain::CollectivesZagrosParaPallet as CollectivesZagrosPallet,
 		coretime_zagros_emulated_chain::CoretimeZagrosParaPallet as CoretimeZagrosPallet,
-		pez_penpal_emulated_chain::{PenpalAssetOwner, PenpalBParaPallet as PenpalBPallet},
 		people_zagros_emulated_chain::{
 			people_zagros_runtime::{
 				self, xcm_config::XcmConfig as PeopleZagrosXcmConfig,
@@ -39,6 +37,8 @@ mod imports {
 			},
 			PeopleZagrosParaPallet as PeopleZagrosPallet,
 		},
+		pez_penpal_emulated_chain::{PenpalAssetOwner, PenpalBParaPallet as PenpalBPallet},
+		pezbridge_hub_zagros_emulated_chain::BridgeHubZagrosParaPallet as BridgeHubZagrosPallet,
 		zagros_emulated_chain::{genesis::ED as ZAGROS_ED, ZagrosRelayPallet as ZagrosPallet},
 		AssetHubZagrosPara as AssetHubZagros, AssetHubZagrosParaReceiver as AssetHubZagrosReceiver,
 		BridgeHubZagrosPara as BridgeHubZagros, CollectivesZagrosPara as CollectivesZagros,

pezcumulus/teyrchains/integration-tests/emulated/tests/people/people-zagros/src/tests/governance.rs

@@ -16,8 +16,8 @@
 use crate::imports::*;
 
 use codec::Encode;
-use pezframe_support::pezsp_runtime::traits::Dispatchable;
 use people_zagros_runtime::people::IdentityInfo;
+use pezframe_support::pezsp_runtime::traits::Dispatchable;
 use teyrchains_common::AccountId;
 use zagros_runtime::{
 	governance::pezpallet_custom_origins::Origin::GeneralAdmin as GeneralAdminOrigin, Dmp,
@@ -260,12 +260,11 @@ fn relay_commands_kill_identity_wrong_origin() {
 
 			Dmp::make_teyrchain_reachable(1004);
 
-			let kill_identity_call =
-				PeopleCall::Identity(pezpallet_identity::Call::<PeopleRuntime>::kill_identity {
-					target: people_zagros_runtime::MultiAddress::Id(PeopleZagros::account_id_of(
-						ALICE,
-					)),
-				});
+			let kill_identity_call = PeopleCall::Identity(pezpallet_identity::Call::<
+				PeopleRuntime,
+			>::kill_identity {
+				target: people_zagros_runtime::MultiAddress::Id(PeopleZagros::account_id_of(ALICE)),
+			});
 
 			let xcm_message = RuntimeCall::XcmPallet(pezpallet_xcm::Call::<Runtime>::send {
 				dest: bx!(VersionedLocation::from(Location::new(0, [Teyrchain(1004)]))),
@@ -312,12 +311,13 @@ fn relay_commands_add_remove_username_authority() {
 
 		Dmp::make_teyrchain_reachable(1004);
 
-		let add_username_authority =
-			PeopleCall::Identity(pezpallet_identity::Call::<PeopleRuntime>::add_username_authority {
-				authority: people_zagros_runtime::MultiAddress::Id(people_zagros_alice.clone()),
-				suffix: b"suffix1".into(),
-				allocation: 10,
-			});
+		let add_username_authority = PeopleCall::Identity(pezpallet_identity::Call::<
+			PeopleRuntime,
+		>::add_username_authority {
+			authority: people_zagros_runtime::MultiAddress::Id(people_zagros_alice.clone()),
+			suffix: b"suffix1".into(),
+			allocation: 10,
+		});
 
 		let add_authority_xcm_msg = RuntimeCall::XcmPallet(pezpallet_xcm::Call::<Runtime>::send {
 			dest: bx!(VersionedLocation::from(Location::new(0, [Teyrchain(1004)]))),
@@ -410,17 +410,18 @@ fn relay_commands_add_remove_username_authority() {
 			suffix: b"suffix1".into(),
 		});
 
-		let remove_authority_xcm_msg = RuntimeCall::XcmPallet(pezpallet_xcm::Call::<Runtime>::send {
-			dest: bx!(VersionedLocation::from(Location::new(0, [Teyrchain(1004)]))),
-			message: bx!(VersionedXcm::from(Xcm(vec![
-				UnpaidExecution { weight_limit: Unlimited, check_origin: None },
-				Transact {
-					origin_kind,
-					call: remove_username_authority.encode().into(),
-					fallback_max_weight: None
-				}
-			]))),
-		});
+		let remove_authority_xcm_msg =
+			RuntimeCall::XcmPallet(pezpallet_xcm::Call::<Runtime>::send {
+				dest: bx!(VersionedLocation::from(Location::new(0, [Teyrchain(1004)]))),
+				message: bx!(VersionedXcm::from(Xcm(vec![
+					UnpaidExecution { weight_limit: Unlimited, check_origin: None },
+					Transact {
+						origin_kind,
+						call: remove_username_authority.encode().into(),
+						fallback_max_weight: None
+					}
+				]))),
+			});
 
 		assert_ok!(remove_authority_xcm_msg.dispatch(origin));
 
@@ -476,17 +477,18 @@ fn relay_commands_add_remove_username_authority_wrong_origin() {
 				allocation: 10,
 			});
 
-			let add_authority_xcm_msg = RuntimeCall::XcmPallet(pezpallet_xcm::Call::<Runtime>::send {
-				dest: bx!(VersionedLocation::from(Location::new(0, [Teyrchain(1004)]))),
-				message: bx!(VersionedXcm::from(Xcm(vec![
-					UnpaidExecution { weight_limit: Unlimited, check_origin: None },
-					Transact {
-						origin_kind,
-						call: add_username_authority.encode().into(),
-						fallback_max_weight: None
-					}
-				]))),
-			});
+			let add_authority_xcm_msg =
+				RuntimeCall::XcmPallet(pezpallet_xcm::Call::<Runtime>::send {
+					dest: bx!(VersionedLocation::from(Location::new(0, [Teyrchain(1004)]))),
+					message: bx!(VersionedXcm::from(Xcm(vec![
+						UnpaidExecution { weight_limit: Unlimited, check_origin: None },
+						Transact {
+							origin_kind,
+							call: add_username_authority.encode().into(),
+							fallback_max_weight: None
+						}
+					]))),
+				});
 
 			assert_ok!(add_authority_xcm_msg.dispatch(origin.clone()));
 			assert_expected_events!(

pezcumulus/teyrchains/integration-tests/emulated/tests/people/people-zagros/src/tests/identity.rs

@@ -18,9 +18,9 @@
 use crate::imports::*;
 use codec::Encode;
 use emulated_integration_tests_common::accounts::ALICE;
+use people_zagros_runtime::people::{IdentityField, IdentityInfo};
 use pezframe_support::BoundedVec;
 use pezpallet_identity::Data;
-use people_zagros_runtime::people::{IdentityField, IdentityInfo};
 use xcm::latest::AssetTransferFilter;
 
 #[test]

pezcumulus/teyrchains/integration-tests/emulated/tests/pezbridges/bridge-hub-pezkuwichain/src/lib.rs

@@ -34,10 +34,10 @@ mod imports {
 		impls::Inspect,
 		test_dry_run_transfer_across_pk_bridge, test_relay_is_trusted_teleporter,
 		test_teyrchain_is_trusted_teleporter, test_teyrchain_is_trusted_teleporter_for_relay,
+		xcm_helpers::xcm_transact_paid_execution,
 		xcm_pez_emulator::{
 			assert_expected_events, bx, Chain, RelayChain as Relay, TestExt, Teyrchain as Para,
 		},
-		xcm_helpers::xcm_transact_paid_execution,
 		ASSETS_PALLET_ID, USDT_ID,
 	};
 	pub(crate) use pezkuwichain_zagros_system_emulated_network::{
@@ -52,10 +52,6 @@ mod imports {
 			genesis::{AssetHubZagrosAssetOwner, ED as ASSET_HUB_ZAGROS_ED},
 			AssetHubZagrosParaPallet as AssetHubZagrosPallet,
 		},
-		pezbridge_hub_pezkuwichain_emulated_chain::{
-			genesis::ED as BRIDGE_HUB_PEZKUWICHAIN_ED, BridgeHubPezkuwichainExistentialDeposit,
-			BridgeHubPezkuwichainParaPallet as BridgeHubPezkuwichainPallet,
-		},
 		pez_penpal_emulated_chain::{
 			pez_penpal_runtime::xcm_config::{
 				CustomizableAssetFromSystemAssetHub as PenpalCustomizableAssetFromSystemAssetHub,
@@ -63,6 +59,10 @@ mod imports {
 			},
 			PenpalAParaPallet as PenpalAPallet, PenpalAssetOwner,
 		},
+		pezbridge_hub_pezkuwichain_emulated_chain::{
+			genesis::ED as BRIDGE_HUB_PEZKUWICHAIN_ED, BridgeHubPezkuwichainExistentialDeposit,
+			BridgeHubPezkuwichainParaPallet as BridgeHubPezkuwichainPallet,
+		},
 		pezkuwichain_emulated_chain::{
 			genesis::ED as PEZKUWICHAIN_ED, PezkuwichainRelayPallet as PezkuwichainPallet,
 		},

pezcumulus/teyrchains/integration-tests/emulated/tests/pezbridges/bridge-hub-zagros/src/lib.rs

@@ -37,10 +37,10 @@ mod imports {
 		impls::Inspect,
 		test_dry_run_transfer_across_pk_bridge, test_relay_is_trusted_teleporter,
 		test_teyrchain_is_trusted_teleporter, test_teyrchain_is_trusted_teleporter_for_relay,
+		xcm_helpers::xcm_transact_paid_execution,
 		xcm_pez_emulator::{
 			assert_expected_events, bx, Chain, RelayChain as Relay, TestExt, Teyrchain as Para,
 		},
-		xcm_helpers::xcm_transact_paid_execution,
 		ASSETS_PALLET_ID, USDT_ID,
 	};
 	pub(crate) use pezkuwichain_zagros_system_emulated_network::{
@@ -55,11 +55,6 @@ mod imports {
 			genesis::{AssetHubZagrosAssetOwner, ED as ASSET_HUB_ZAGROS_ED},
 			AssetHubZagrosParaPallet as AssetHubZagrosPallet,
 		},
-		pezbridge_hub_zagros_emulated_chain::{
-			pezbridge_hub_zagros_runtime, genesis::ED as BRIDGE_HUB_ZAGROS_ED,
-			BridgeHubZagrosExistentialDeposit, BridgeHubZagrosParaPallet as BridgeHubZagrosPallet,
-			BridgeHubZagrosRuntimeOrigin,
-		},
 		pez_penpal_emulated_chain::{
 			self,
 			pez_penpal_runtime::xcm_config::{
@@ -70,6 +65,11 @@ mod imports {
 			PenpalAParaPallet as PenpalAPallet, PenpalAssetOwner,
 			PenpalBParaPallet as PenpalBPallet,
 		},
+		pezbridge_hub_zagros_emulated_chain::{
+			genesis::ED as BRIDGE_HUB_ZAGROS_ED, pezbridge_hub_zagros_runtime,
+			BridgeHubZagrosExistentialDeposit, BridgeHubZagrosParaPallet as BridgeHubZagrosPallet,
+			BridgeHubZagrosRuntimeOrigin,
+		},
 		pezkuwichain_emulated_chain::PezkuwichainRelayPallet as PezkuwichainPallet,
 		zagros_emulated_chain::{genesis::ED as ZAGROS_ED, ZagrosRelayPallet as ZagrosPallet},
 		AssetHubPezkuwichainPara as AssetHubPezkuwichain,

pezcumulus/teyrchains/integration-tests/emulated/tests/pezbridges/bridge-hub-zagros/src/tests/aliases.rs

@@ -16,8 +16,8 @@
 //! Tests related to XCM aliasing.
 
 use crate::imports::*;
-use pezbridge_hub_zagros_runtime::xcm_config::XcmConfig;
 use emulated_integration_tests_common::{macros::AccountId, test_cross_chain_alias};
+use pezbridge_hub_zagros_runtime::xcm_config::XcmConfig;
 use pezframe_support::traits::ContainsPair;
 use xcm::latest::Junctions::*;
 

pezcumulus/teyrchains/integration-tests/emulated/tests/pezbridges/bridge-hub-zagros/src/tests/snowbridge.rs

@@ -32,16 +32,16 @@ use asset_hub_zagros_runtime::xcm_config::{
 	bridging::to_ethereum::DefaultBridgeHubEthereumBaseFee,
 	UniversalLocation as AssetHubZagrosUniversalLocation,
 };
-use pezbridge_hub_zagros_runtime::{
-	bridge_to_ethereum_config::EthereumGatewayAddress, EthereumBeaconClient, EthereumInboundQueue,
-};
 use codec::Encode;
 use emulated_integration_tests_common::{
 	snowbridge::{SEPOLIA_ID, WETH},
 	PENPAL_B_ID, RESERVABLE_ASSET_ID,
 };
-use pezframe_support::traits::fungibles::Mutate;
 use hex_literal::hex;
+use pezbridge_hub_zagros_runtime::{
+	bridge_to_ethereum_config::EthereumGatewayAddress, EthereumBeaconClient, EthereumInboundQueue,
+};
+use pezframe_support::traits::fungibles::Mutate;
 use pezkuwichain_zagros_system_emulated_network::{
 	asset_hub_zagros_emulated_chain::genesis::AssetHubZagrosAssetOwner,
 	pez_penpal_emulated_chain::PARA_ID_B, zagros_emulated_chain::zagros_runtime::Dmp,

pezcumulus/teyrchains/integration-tests/emulated/tests/pezbridges/bridge-hub-zagros/src/tests/snowbridge_common.rs

@@ -19,8 +19,8 @@ use emulated_integration_tests_common::{
 	snowbridge::{SEPOLIA_ID, WETH},
 	PenpalBTeleportableAssetLocation,
 };
-use pezframe_support::traits::fungibles::Mutate;
 use hex_literal::hex;
+use pezframe_support::traits::fungibles::Mutate;
 use pezkuwichain_zagros_system_emulated_network::pez_penpal_emulated_chain::{
 	pez_penpal_runtime::xcm_config::{CheckingAccount, TELEPORTABLE_ASSET_ID},
 	PenpalAssetOwner,

pezcumulus/teyrchains/integration-tests/emulated/tests/pezbridges/bridge-hub-zagros/src/tests/snowbridge_edge_case.rs

@@ -14,8 +14,8 @@
 // limitations under the License.
 
 use crate::{imports::*, tests::snowbridge_common::*};
-use pezbridge_hub_zagros_runtime::xcm_config::LocationToAccountId;
 use emulated_integration_tests_common::snowbridge::{SEPOLIA_ID, WETH};
+use pezbridge_hub_zagros_runtime::xcm_config::LocationToAccountId;
 use pezsnowbridge_core::AssetMetadata;
 use pezsnowbridge_pezpallet_system::Error;
 use testnet_teyrchains_constants::zagros::snowbridge::EthereumNetwork;

pezcumulus/teyrchains/integration-tests/emulated/tests/pezbridges/bridge-hub-zagros/src/tests/snowbridge_v2_inbound.rs

@@ -21,6 +21,12 @@ use crate::{
 	},
 };
 use asset_hub_zagros_runtime::ForeignAssets;
+use codec::Encode;
+use emulated_integration_tests_common::{
+	snowbridge::{SEPOLIA_ID, WETH},
+	RESERVABLE_ASSET_ID,
+};
+use hex_literal::hex;
 use pezbridge_hub_zagros_runtime::{
 	bridge_common_config::BridgeReward,
 	bridge_to_ethereum_config::{
@@ -28,12 +34,6 @@ use pezbridge_hub_zagros_runtime::{
 	},
 	EthereumInboundQueueV2,
 };
-use codec::Encode;
-use emulated_integration_tests_common::{
-	snowbridge::{SEPOLIA_ID, WETH},
-	RESERVABLE_ASSET_ID,
-};
-use hex_literal::hex;
 use pezkuwichain_zagros_system_emulated_network::pez_penpal_emulated_chain::PARA_ID_B;
 use pezsnowbridge_core::{reward::MessageId, AssetMetadata, TokenIdOf};
 use pezsnowbridge_inbound_queue_primitives::v2::{

pezcumulus/teyrchains/integration-tests/emulated/tests/pezbridges/bridge-hub-zagros/src/tests/snowbridge_v2_inbound_to_pezkuwichain.rs

@@ -26,12 +26,12 @@ use crate::{
 	},
 };
 use asset_hub_zagros_runtime::ForeignAssets;
+use codec::Encode;
+use hex_literal::hex;
 use pezbridge_hub_zagros_runtime::{
 	bridge_common_config::BridgeReward, bridge_to_ethereum_config::EthereumGatewayAddress,
 	EthereumInboundQueueV2,
 };
-use codec::Encode;
-use hex_literal::hex;
 use pezsnowbridge_core::TokenIdOf;
 use pezsnowbridge_inbound_queue_primitives::v2::{
 	EthereumAsset::{ForeignTokenERC20, NativeTokenERC20},

pezcumulus/teyrchains/integration-tests/emulated/tests/pezbridges/bridge-hub-zagros/src/tests/snowbridge_v2_rewards.rs

@@ -14,8 +14,8 @@
 // limitations under the License.
 
 use crate::tests::snowbridge_common::{eth_location, set_up_eth_and_hez_pool};
-use pezbridge_hub_zagros_runtime::bridge_common_config::{BridgeReward, BridgeRewardBeneficiaries};
 use emulated_integration_tests_common::snowbridge::ETHER_MIN_BALANCE;
+use pezbridge_hub_zagros_runtime::bridge_common_config::{BridgeReward, BridgeRewardBeneficiaries};
 use pezpallet_bridge_relayers::{Error::FailedToPayReward, RewardLedger};
 
 use crate::imports::*;