Fix experimental aura config and comment tests (#3057)

ggwpez · web-flow · commit 811189174df7 · 2023-08-24T18:39:32.000Z
* Fix aura config

Signed-off-by: Oliver Tale-Yazdi &lt;oliver.tale-yazdi@parity.io&gt;

* Fix Cargo.toml files

Signed-off-by: Oliver Tale-Yazdi &lt;oliver.tale-yazdi@parity.io&gt;

* Ignore feature-dependant tests

Signed-off-by: Oliver Tale-Yazdi &lt;oliver.tale-yazdi@parity.io&gt;

* Allow dead code

Signed-off-by: Oliver Tale-Yazdi &lt;oliver.tale-yazdi@parity.io&gt;

---------

Signed-off-by: Oliver Tale-Yazdi &lt;oliver.tale-yazdi@parity.io&gt;
diff --git a/cumulus/pallets/collator-selection/Cargo.toml b/cumulus/pallets/collator-selection/Cargo.toml
@@ -61,3 +61,5 @@ std = [
 ]
 
 try-runtime = [ "frame-support/try-runtime" ]
+
+experimental = [ "pallet-aura/experimental" ]
diff --git a/cumulus/pallets/collator-selection/src/mock.rs b/cumulus/pallets/collator-selection/src/mock.rs
@@ -124,6 +124,8 @@ impl pallet_aura::Config for Test {
 	type MaxAuthorities = ConstU32<100_000>;
 	type DisabledValidators = ();
 	type AllowMultipleBlocksPerSlot = ConstBool<false>;
+	#[cfg(feature = "experimental")]
+	type SlotDuration = pallet_aura::MinimumPeriodTimesTwo<Self>;
 }
 
 sp_runtime::impl_opaque_keys! {
diff --git a/cumulus/parachain-template/runtime/Cargo.toml b/cumulus/parachain-template/runtime/Cargo.toml
@@ -162,3 +162,5 @@ try-runtime = [
 	"pallet-xcm/try-runtime",
 	"parachain-info/try-runtime",
 ]
+
+experimental = [ "pallet-aura/experimental" ]
diff --git a/cumulus/parachain-template/runtime/src/lib.rs b/cumulus/parachain-template/runtime/src/lib.rs
@@ -444,6 +444,8 @@ impl pallet_aura::Config for Runtime {
 	type DisabledValidators = ();
 	type MaxAuthorities = ConstU32<100_000>;
 	type AllowMultipleBlocksPerSlot = ConstBool<false>;
+	#[cfg(feature = "experimental")]
+	type SlotDuration = pallet_aura::MinimumPeriodTimesTwo<Self>;
 }
 
 parameter_types! {
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/hrmp_channels.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/hrmp_channels.rs
@@ -21,6 +21,7 @@ const MAX_MESSAGE_SIZE: u32 = 8192;
 
 /// Opening HRMP channels between Parachains should work
 #[test]
+#[cfg(feature = "FIXME-IGNORED")] // <https://github.com/paritytech/cumulus/issues/3027>
 fn open_hrmp_channel_between_paras_works() {
 	// Parchain A init values
 	let para_a_id = PenpalKusamaA::para_id();
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/teleport.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/teleport.rs
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 
+#![allow(dead_code)] // <https://github.com/paritytech/cumulus/issues/3027>
+
 use crate::*;
 
 fn relay_origin_assertions(t: RelayToSystemParaTest) {
@@ -185,6 +187,7 @@ fn limited_teleport_native_assets_from_relay_to_system_para_works() {
 /// Limited Teleport of native asset from System Parachain to Relay Chain
 /// should work when there is enough balance in Relay Chain's `CheckAccount`
 #[test]
+#[cfg(feature = "FIXME-IGNORED")] // <https://github.com/paritytech/cumulus/issues/3027>
 fn limited_teleport_native_assets_back_from_system_para_to_relay_works() {
 	// Dependency - Relay Chain's `CheckAccount` should have enough balance
 	limited_teleport_native_assets_from_relay_to_system_para_works();
@@ -223,6 +226,7 @@ fn limited_teleport_native_assets_back_from_system_para_to_relay_works() {
 /// Limited Teleport of native asset from System Parachain to Relay Chain
 /// should't work when there is not enough balance in Relay Chain's `CheckAccount`
 #[test]
+#[cfg(feature = "FIXME-IGNORED")] // <https://github.com/paritytech/cumulus/issues/3027>
 fn limited_teleport_native_assets_from_system_para_to_relay_fails() {
 	// Init values for Relay Chain
 	let amount_to_send: Balance = ASSET_HUB_KUSAMA_ED * 1000;
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/hrmp_channels.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/hrmp_channels.rs
@@ -21,6 +21,7 @@ const MAX_MESSAGE_SIZE: u32 = 8192;
 
 /// Opening HRMP channels between Parachains should work
 #[test]
+#[cfg(feature = "FIXME-IGNORED")] // <https://github.com/paritytech/cumulus/issues/3027>
 fn open_hrmp_channel_between_paras_works() {
 	// Parchain A init values
 	let para_a_id = PenpalPolkadotA::para_id();
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/teleport.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/teleport.rs
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 
+#![allow(dead_code)] // <https://github.com/paritytech/cumulus/issues/3027>
+
 use crate::*;
 
 fn relay_origin_assertions(t: RelayToSystemParaTest) {
@@ -185,6 +187,7 @@ fn limited_teleport_native_assets_from_relay_to_system_para_works() {
 /// Limited Teleport of native asset from System Parachain to Relay Chain
 /// should work when there is enough balance in Relay Chain's `CheckAccount`
 #[test]
+#[cfg(feature = "FIXME-IGNORED")] // <https://github.com/paritytech/cumulus/issues/3027>
 fn limited_teleport_native_assets_back_from_system_para_to_relay_works() {
 	// Dependency - Relay Chain's `CheckAccount` should have enough balance
 	limited_teleport_native_assets_from_relay_to_system_para_works();
@@ -223,6 +226,7 @@ fn limited_teleport_native_assets_back_from_system_para_to_relay_works() {
 /// Limited Teleport of native asset from System Parachain to Relay Chain
 /// should't work when there is not enough balance in Relay Chain's `CheckAccount`
 #[test]
+#[cfg(feature = "FIXME-IGNORED")] // <https://github.com/paritytech/cumulus/issues/3027>
 fn limited_teleport_native_assets_from_system_para_to_relay_fails() {
 	// Init values for Relay Chain
 	let amount_to_send: Balance = ASSET_HUB_POLKADOT_ED * 1000;
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/teleport.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/teleport.rs
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 
+#![allow(dead_code)] // <https://github.com/paritytech/cumulus/issues/3027>
+
 use crate::*;
 
 fn relay_origin_assertions(t: RelayToSystemParaTest) {
@@ -185,6 +187,7 @@ fn limited_teleport_native_assets_from_relay_to_system_para_works() {
 /// Limited Teleport of native asset from System Parachain to Relay Chain
 /// should work when there is enough balance in Relay Chain's `CheckAccount`
 #[test]
+#[cfg(feature = "FIXME-IGNORED")] // <https://github.com/paritytech/cumulus/issues/3027>
 fn limited_teleport_native_assets_back_from_system_para_to_relay_works() {
 	// Dependency - Relay Chain's `CheckAccount` should have enough balance
 	limited_teleport_native_assets_from_relay_to_system_para_works();
@@ -223,6 +226,7 @@ fn limited_teleport_native_assets_back_from_system_para_to_relay_works() {
 /// Limited Teleport of native asset from System Parachain to Relay Chain
 /// should't work when there is not enough balance in Relay Chain's `CheckAccount`
 #[test]
+#[cfg(feature = "FIXME-IGNORED")] // <https://github.com/paritytech/cumulus/issues/3027>
 fn limited_teleport_native_assets_from_system_para_to_relay_fails() {
 	// Init values for Relay Chain
 	let amount_to_send: Balance = ASSET_HUB_WESTEND_ED * 1000;
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/Cargo.toml b/cumulus/parachains/runtimes/assets/asset-hub-kusama/Cargo.toml
@@ -210,3 +210,5 @@ std = [
 	"assets-common/std",
 	"substrate-wasm-builder",
 ]
+
+experimental = [ "pallet-aura/experimental" ]
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/lib.rs
@@ -677,6 +677,8 @@ impl pallet_aura::Config for Runtime {
 	type DisabledValidators = ();
 	type MaxAuthorities = ConstU32<100_000>;
 	type AllowMultipleBlocksPerSlot = ConstBool<false>;
+	#[cfg(feature = "experimental")]
+	type SlotDuration = pallet_aura::MinimumPeriodTimesTwo<Self>;
 }
 
 parameter_types! {
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/Cargo.toml b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/Cargo.toml
@@ -190,3 +190,5 @@ std = [
 	"assets-common/std",
 	"substrate-wasm-builder",
 ]
+
+experimental = [ "pallet-aura/experimental" ]
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/lib.rs
@@ -614,6 +614,8 @@ impl pallet_aura::Config for Runtime {
 	type DisabledValidators = ();
 	type MaxAuthorities = ConstU32<100_000>;
 	type AllowMultipleBlocksPerSlot = ConstBool<false>;
+	#[cfg(feature = "experimental")]
+	type SlotDuration = pallet_aura::MinimumPeriodTimesTwo<Self>;
 }
 
 parameter_types! {
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/Cargo.toml b/cumulus/parachains/runtimes/assets/asset-hub-westend/Cargo.toml
@@ -200,3 +200,5 @@ std = [
 	"assets-common/std",
 	"substrate-wasm-builder",
 ]
+
+experimental = [ "pallet-aura/experimental" ]
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
@@ -645,6 +645,8 @@ impl pallet_aura::Config for Runtime {
 	type DisabledValidators = ();
 	type MaxAuthorities = ConstU32<100_000>;
 	type AllowMultipleBlocksPerSlot = ConstBool<false>;
+	#[cfg(feature = "experimental")]
+	type SlotDuration = pallet_aura::MinimumPeriodTimesTwo<Self>;
 }
 
 parameter_types! {
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/Cargo.toml b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/Cargo.toml
@@ -169,3 +169,5 @@ try-runtime = [
 	"pallet-xcm/try-runtime",
 	"parachain-info/try-runtime",
 ]
+
+experimental = [ "pallet-aura/experimental" ]
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/lib.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/lib.rs
@@ -344,6 +344,8 @@ impl pallet_aura::Config for Runtime {
 	type DisabledValidators = ();
 	type MaxAuthorities = ConstU32<100_000>;
 	type AllowMultipleBlocksPerSlot = ConstBool<false>;
+	#[cfg(feature = "experimental")]
+	type SlotDuration = pallet_aura::MinimumPeriodTimesTwo<Self>;
 }
 
 parameter_types! {
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/Cargo.toml b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/Cargo.toml
@@ -169,3 +169,5 @@ try-runtime = [
 	"pallet-xcm/try-runtime",
 	"parachain-info/try-runtime",
 ]
+
+experimental = [ "pallet-aura/experimental" ]
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/lib.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/lib.rs
@@ -344,6 +344,8 @@ impl pallet_aura::Config for Runtime {
 	type DisabledValidators = ();
 	type MaxAuthorities = ConstU32<100_000>;
 	type AllowMultipleBlocksPerSlot = ConstBool<false>;
+	#[cfg(feature = "experimental")]
+	type SlotDuration = pallet_aura::MinimumPeriodTimesTwo<Self>;
 }
 
 parameter_types! {
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml
@@ -214,3 +214,5 @@ try-runtime = [
 	"pallet-xcm/try-runtime",
 	"parachain-info/try-runtime",
 ]
+
+experimental = [ "pallet-aura/experimental" ]
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs
@@ -351,6 +351,8 @@ impl pallet_aura::Config for Runtime {
 	type DisabledValidators = ();
 	type MaxAuthorities = ConstU32<100_000>;
 	type AllowMultipleBlocksPerSlot = ConstBool<false>;
+	#[cfg(feature = "experimental")]
+	type SlotDuration = pallet_aura::MinimumPeriodTimesTwo<Self>;
 }
 
 parameter_types! {
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/Cargo.toml b/cumulus/parachains/runtimes/collectives/collectives-polkadot/Cargo.toml
@@ -198,3 +198,5 @@ std = [
 	"pallet-core-fellowship/std",
 	"pallet-salary/std",
 ]
+
+experimental = [ "pallet-aura/experimental" ]
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/lib.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/lib.rs
@@ -421,6 +421,8 @@ impl pallet_aura::Config for Runtime {
 	type DisabledValidators = ();
 	type MaxAuthorities = ConstU32<100_000>;
 	type AllowMultipleBlocksPerSlot = ConstBool<false>;
+	#[cfg(feature = "experimental")]
+	type SlotDuration = pallet_aura::MinimumPeriodTimesTwo<Self>;
 }
 
 parameter_types! {
diff --git a/cumulus/parachains/runtimes/contracts/contracts-rococo/Cargo.toml b/cumulus/parachains/runtimes/contracts/contracts-rococo/Cargo.toml
@@ -176,3 +176,5 @@ try-runtime = [
 	"pallet-xcm/try-runtime",
 	"parachain-info/try-runtime",
 ]
+
+experimental = [ "pallet-aura/experimental" ]
diff --git a/cumulus/parachains/runtimes/contracts/contracts-rococo/src/lib.rs b/cumulus/parachains/runtimes/contracts/contracts-rococo/src/lib.rs
@@ -312,6 +312,8 @@ impl pallet_aura::Config for Runtime {
 	type DisabledValidators = ();
 	type MaxAuthorities = ConstU32<100_000>;
 	type AllowMultipleBlocksPerSlot = ConstBool<false>;
+	#[cfg(feature = "experimental")]
+	type SlotDuration = pallet_aura::MinimumPeriodTimesTwo<Self>;
 }
 
 parameter_types! {
diff --git a/cumulus/parachains/runtimes/testing/penpal/Cargo.toml b/cumulus/parachains/runtimes/testing/penpal/Cargo.toml
@@ -167,3 +167,5 @@ try-runtime = [
 	"pallet-xcm/try-runtime",
 	"parachain-info/try-runtime",
 ]
+
+experimental = [ "pallet-aura/experimental" ]
diff --git a/cumulus/parachains/runtimes/testing/penpal/src/lib.rs b/cumulus/parachains/runtimes/testing/penpal/src/lib.rs
@@ -520,6 +520,8 @@ impl pallet_aura::Config for Runtime {
 	type DisabledValidators = ();
 	type MaxAuthorities = ConstU32<100_000>;
 	type AllowMultipleBlocksPerSlot = ConstBool<false>;
+	#[cfg(feature = "experimental")]
+	type SlotDuration = pallet_aura::MinimumPeriodTimesTwo<Self>;
 }
 
 parameter_types! {
diff --git a/cumulus/parachains/runtimes/testing/rococo-parachain/Cargo.toml b/cumulus/parachains/runtimes/testing/rococo-parachain/Cargo.toml
@@ -107,3 +107,5 @@ runtime-benchmarks = [
 	"pallet-xcm/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
 ]
+
+experimental = [ "pallet-aura/experimental" ]
diff --git a/cumulus/parachains/runtimes/testing/rococo-parachain/src/lib.rs b/cumulus/parachains/runtimes/testing/rococo-parachain/src/lib.rs
@@ -568,6 +568,8 @@ impl pallet_aura::Config for Runtime {
 	type DisabledValidators = ();
 	type MaxAuthorities = ConstU32<100_000>;
 	type AllowMultipleBlocksPerSlot = ConstBool<false>;
+	#[cfg(feature = "experimental")]
+	type SlotDuration = pallet_aura::MinimumPeriodTimesTwo<Self>;
 }
 
 construct_runtime! {

Original file line number	Diff line number	Diff line change
`@@ -61,3 +61,5 @@ std = [`
`61`	`61`	`]`
`62`	`62`
`63`	`63`	`try-runtime = [ "frame-support/try-runtime" ]`
	`64`	`+`
	`65`	`+experimental = [ "pallet-aura/experimental" ]`
Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,8 @@ impl pallet_aura::Config for Test {`
`124`	`124`	`type MaxAuthorities = ConstU32<100_000>;`
`125`	`125`	`type DisabledValidators = ();`
`126`	`126`	`type AllowMultipleBlocksPerSlot = ConstBool<false>;`
	`127`	`+ #[cfg(feature = "experimental")]`
	`128`	`+ type SlotDuration = pallet_aura::MinimumPeriodTimesTwo<Self>;`
`127`	`129`	`}`
`128`	`130`
`129`	`131`	`sp_runtime::impl_opaque_keys! {`
Original file line number	Diff line number	Diff line change
`@@ -162,3 +162,5 @@ try-runtime = [`
`162`	`162`	`"pallet-xcm/try-runtime",`
`163`	`163`	`"parachain-info/try-runtime",`
`164`	`164`	`]`
	`165`	`+`
	`166`	`+experimental = [ "pallet-aura/experimental" ]`
Original file line number	Diff line number	Diff line change
`@@ -444,6 +444,8 @@ impl pallet_aura::Config for Runtime {`
`444`	`444`	`type DisabledValidators = ();`
`445`	`445`	`type MaxAuthorities = ConstU32<100_000>;`
`446`	`446`	`type AllowMultipleBlocksPerSlot = ConstBool<false>;`
	`447`	`+ #[cfg(feature = "experimental")]`
	`448`	`+ type SlotDuration = pallet_aura::MinimumPeriodTimesTwo<Self>;`
`447`	`449`	`}`
`448`	`450`
`449`	`451`	`parameter_types! {`
Original file line number	Diff line number	Diff line change
`@@ -210,3 +210,5 @@ std = [`
`210`	`210`	`"assets-common/std",`
`211`	`211`	`"substrate-wasm-builder",`
`212`	`212`	`]`
	`213`	`+`
	`214`	`+experimental = [ "pallet-aura/experimental" ]`