[AHM] OpenGov for Polkadot AH tweaks

integration-tests/emulated/chains/parachains/assets/asset-hub-polkadot/src/lib.rs

@@ -49,6 +49,7 @@ decl_test_parachains! {
 			PoolAssets: asset_hub_polkadot_runtime::PoolAssets,
 			AssetConversion: asset_hub_polkadot_runtime::AssetConversion,
 			SnowbridgeSystemFrontend: asset_hub_polkadot_runtime::SnowbridgeSystemFrontend,
+			Preimage: asset_hub_polkadot_runtime::Preimage,
 		}
 	},
 }

integration-tests/emulated/chains/relays/polkadot/src/lib.rs

@@ -38,6 +38,7 @@ decl_test_relay_chains! {
 			Balances: polkadot_runtime::Balances,
 			Treasury: polkadot_runtime::Treasury,
 			AssetRate: polkadot_runtime::AssetRate,
+			Preimage: polkadot_runtime::Preimage,
 			Hrmp: polkadot_runtime::Hrmp,
 		}
 	},

integration-tests/emulated/helpers/Cargo.toml

@@ -22,7 +22,6 @@ pallet-xcm = { workspace = true, default-features = true }
 # Cumulus
 xcm-emulator = { workspace = true }
 cumulus-pallet-xcmp-queue = { workspace = true, default-features = true }
-asset-test-utils = { workspace = true }
 emulated-integration-tests-common = { workspace = true }
 
 [features]

integration-tests/emulated/helpers/src/lib.rs

@@ -24,7 +24,6 @@ pub use pallet_xcm;
 pub use xcm::prelude::{AccountId32, VersionedAssets, Weight, WeightLimit};
 
 // Cumulus
-pub use asset_test_utils;
 pub use cumulus_pallet_xcmp_queue;
 pub use emulated_integration_tests_common::{macros::Dmp, test_chain_can_claim_assets};
 pub use xcm_emulator::Chain;

integration-tests/emulated/tests/governance/kusama/Cargo.toml

@@ -26,17 +26,3 @@ integration-tests-helpers = { workspace = true }
 people-kusama-runtime = { workspace = true }
 kusama-runtime = { workspace = true }
 kusama-system-emulated-network = { workspace = true }
-
-[features]
-runtime-benchmarks = [
-	"asset-hub-kusama-runtime/runtime-benchmarks",
-	"frame-support/runtime-benchmarks",
-	"frame-system/runtime-benchmarks",
-	"integration-tests-helpers/runtime-benchmarks",
-	"kusama-runtime/runtime-benchmarks",
-	"kusama-system-emulated-network/runtime-benchmarks",
-	"pallet-utility/runtime-benchmarks",
-	"pallet-whitelist/runtime-benchmarks",
-	"people-kusama-runtime/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
-]

integration-tests/emulated/tests/governance/kusama/src/lib.rs

@@ -14,5 +14,27 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#[cfg(test)]
+mod imports {
+	pub(crate) use emulated_integration_tests_common::{
+		assert_whitelisted,
+		impls::{Parachain, RelayChain, TestExt},
+		xcm_emulator::Chain,
+		xcm_helpers::{
+			build_xcm_send_authorize_upgrade_call, call_hash_of,
+			dispatch_whitelisted_call_with_preimage,
+		},
+	};
+	pub(crate) use frame_support::{assert_err, assert_ok};
+	pub(crate) use kusama_runtime::{governance::pallet_custom_origins::Origin, Dmp};
+	pub(crate) use sp_runtime::{traits::Dispatchable, DispatchError};
+
+	pub(crate) use kusama_system_emulated_network::{
+		AssetHubKusamaPara as AssetHubKusama, BridgeHubKusamaPara as BridgeHubKusama,
+		CoretimeKusamaPara as CoretimeKusama, KusamaRelay as Kusama,
+		PeopleKusamaPara as PeopleKusama,
+	};
+}
+
 #[cfg(test)]
 mod open_gov_on_relay;

integration-tests/emulated/tests/governance/kusama/src/open_gov_on_relay.rs

@@ -13,22 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use emulated_integration_tests_common::{
-	assert_whitelisted,
-	impls::RelayChain,
-	xcm_emulator::{Chain, Parachain, TestExt},
-	xcm_helpers::{
-		build_xcm_send_authorize_upgrade_call, call_hash_of,
-		dispatch_whitelisted_call_with_preimage,
-	},
-};
-use frame_support::{assert_err, assert_ok};
-use kusama_runtime::{governance::pallet_custom_origins::Origin, Dmp};
-use kusama_system_emulated_network::{
-	AssetHubKusamaPara as AssetHubKusama, BridgeHubKusamaPara as BridgeHubKusama,
-	CoretimeKusamaPara as CoretimeKusama, KusamaRelay as Kusama, PeopleKusamaPara as PeopleKusama,
-};
-use sp_runtime::{traits::Dispatchable, DispatchError};
+use crate::imports::*;
 
 #[test]
 fn relaychain_can_authorize_upgrade_for_itself() {

integration-tests/emulated/tests/governance/polkadot/src/common.rs

@@ -0,0 +1,53 @@
+// Copyright (C) Parity Technologies and the various Polkadot contributors, see Contributions.md
+// for a list of specific contributors.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use crate::imports::*;
+
+/// CollectivesPolkadot dispatches `pallet_xcm::send` with `OriginKind:Xcm` to the dest with encoded
+/// whitelist call.
+pub fn collectives_send_whitelist(
+	dest: Location,
+	encoded_whitelist_call: impl FnOnce() -> Vec<u8>,
+) {
+	CollectivesPolkadot::execute_with(|| {
+		type RuntimeEvent = <CollectivesPolkadot as Chain>::RuntimeEvent;
+		type RuntimeCall = <CollectivesPolkadot as Chain>::RuntimeCall;
+		type RuntimeOrigin = <CollectivesPolkadot as Chain>::RuntimeOrigin;
+		type Runtime = <CollectivesPolkadot as Chain>::Runtime;
+
+		let whitelist_call = RuntimeCall::PolkadotXcm(pallet_xcm::Call::<Runtime>::send {
+			dest: bx!(VersionedLocation::from(dest)),
+			message: bx!(VersionedXcm::from(Xcm(vec![
+				UnpaidExecution { weight_limit: Unlimited, check_origin: None },
+				Transact {
+					origin_kind: OriginKind::Xcm,
+					fallback_max_weight: None,
+					call: encoded_whitelist_call().into(),
+				}
+			]))),
+		});
+
+		use collectives_polkadot_runtime::fellowship::pallet_fellowship_origins::Origin::Fellows as FellowsOrigin;
+		let fellows_origin: RuntimeOrigin = FellowsOrigin.into();
+		assert_ok!(whitelist_call.dispatch(fellows_origin));
+		assert_expected_events!(
+			CollectivesPolkadot,
+			vec![
+				RuntimeEvent::PolkadotXcm(pallet_xcm::Event::Sent { .. }) => {},
+			]
+		);
+	});
+}

integration-tests/emulated/tests/governance/polkadot/src/lib.rs

@@ -14,50 +14,35 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use emulated_integration_tests_common::{
-	impls::{assert_expected_events, bx, TestExt},
-	xcm_emulator::Chain,
-};
-use frame_support::assert_ok;
-use polkadot_system_emulated_network::CollectivesPolkadotPara as CollectivesPolkadot;
-use sp_runtime::traits::Dispatchable;
-use xcm::{latest::prelude::*, VersionedLocation, VersionedXcm};
-
 #[cfg(test)]
-mod open_gov_on_relay;
+mod imports {
+	pub(crate) use codec::Encode;
+	pub(crate) use emulated_integration_tests_common::{
+		assert_whitelisted,
+		impls::{assert_expected_events, bx, Parachain, RelayChain, TestExt},
+		xcm_emulator::Chain,
+		xcm_helpers::{
+			build_xcm_send_authorize_upgrade_call, call_hash_of,
+			dispatch_whitelisted_call_with_preimage,
+		},
+	};
+	pub(crate) use frame_support::{assert_err, assert_ok};
+	pub(crate) use polkadot_runtime::{governance::pallet_custom_origins::Origin, Dmp};
+	pub(crate) use sp_runtime::{traits::Dispatchable, DispatchError};
+	pub(crate) use xcm::{latest::prelude::*, VersionedLocation, VersionedXcm};
 
-/// CollectivesPolkadot dispatches `pallet_xcm::send` with `OriginKind:Xcm` to the dest with encoded
-/// whitelist call.
-pub fn collectives_send_whitelist(
-	dest: Location,
-	encoded_whitelist_call: impl FnOnce() -> Vec<u8>,
-) {
-	CollectivesPolkadot::execute_with(|| {
-		type RuntimeEvent = <CollectivesPolkadot as Chain>::RuntimeEvent;
-		type RuntimeCall = <CollectivesPolkadot as Chain>::RuntimeCall;
-		type RuntimeOrigin = <CollectivesPolkadot as Chain>::RuntimeOrigin;
-		type Runtime = <CollectivesPolkadot as Chain>::Runtime;
+	pub(crate) use polkadot_system_emulated_network::{
+		AssetHubPolkadotPara as AssetHubPolkadot, BridgeHubPolkadotPara as BridgeHubPolkadot,
+		CollectivesPolkadotPara as CollectivesPolkadot, CoretimePolkadotPara as CoretimePolkadot,
+		PeoplePolkadotPara as PeoplePolkadot, PolkadotRelay as Polkadot,
+	};
+}
 
-		let whitelist_call = RuntimeCall::PolkadotXcm(pallet_xcm::Call::<Runtime>::send {
-			dest: bx!(VersionedLocation::from(dest)),
-			message: bx!(VersionedXcm::from(Xcm(vec![
-				UnpaidExecution { weight_limit: Unlimited, check_origin: None },
-				Transact {
-					origin_kind: OriginKind::Xcm,
-					fallback_max_weight: None,
-					call: encoded_whitelist_call().into(),
-				}
-			]))),
-		});
+#[cfg(test)]
+mod common;
 
-		use collectives_polkadot_runtime::fellowship::pallet_fellowship_origins::Origin::Fellows as FellowsOrigin;
-		let fellows_origin: RuntimeOrigin = FellowsOrigin.into();
-		assert_ok!(whitelist_call.dispatch(fellows_origin));
-		assert_expected_events!(
-			CollectivesPolkadot,
-			vec![
-				RuntimeEvent::PolkadotXcm(pallet_xcm::Event::Sent { .. }) => {},
-			]
-		);
-	});
-}
+#[cfg(test)]
+mod open_gov_on_asset_hub;
+
+#[cfg(test)]
+mod open_gov_on_relay;