use the experimental feature flag instead

paritytech · Aug 4, 2023 · aeef644 · aeef644
1 parent 2bf4d45
commit aeef644
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/bin/node-template/runtime/Cargo.toml b/bin/node-template/runtime/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
 
-pallet-aura = { version = "4.0.0-dev", default-features = false, features = ["explicit-slot-duration"], path = "../../../frame/aura" }
+pallet-aura = { version = "4.0.0-dev", default-features = false, path = "../../../frame/aura" }
 pallet-balances = { version = "4.0.0-dev", default-features = false, path = "../../../frame/balances" }
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../../../frame/support" }
 pallet-grandpa = { version = "4.0.0-dev", default-features = false, path = "../../../frame/grandpa" }
@@ -114,3 +114,4 @@ try-runtime = [
 	"pallet-transaction-payment/try-runtime",
 	"sp-runtime/try-runtime"
 ]
+experimental = ["pallet-aura/experimental"]
diff --git a/bin/node-template/runtime/src/lib.rs b/bin/node-template/runtime/src/lib.rs
@@ -207,6 +207,8 @@ impl pallet_aura::Config for Runtime {
 	type DisabledValidators = ();
 	type MaxAuthorities = ConstU32<32>;
 	type AllowMultipleBlocksPerSlot = ConstBool<false>;
+
+	#[cfg(feature = "experimental")]
 	type SlotDuration = pallet_aura::MinimumPeriodTimesTwo<Runtime>;
 }
 

diff --git a/frame/aura/Cargo.toml b/frame/aura/Cargo.toml
@@ -48,4 +48,4 @@ try-runtime = [
 	"pallet-timestamp/try-runtime",
 	"sp-runtime/try-runtime"
 ]
-explicit-slot-duration = []
+experimental = []
diff --git a/frame/aura/src/lib.rs b/frame/aura/src/lib.rs
@@ -67,7 +67,7 @@ const LOG_TARGET: &str = "runtime::aura";
 /// This was the default behavior of the Aura pallet and may be used for
 /// backwards compatibility.
 ///
-/// Note that this type is likely not useful without the `explicit-slot-duration`
+/// Note that this type is likely not useful without the `experimental`
 /// feature.
 pub struct MinimumPeriodTimesTwo<T>(sp_std::marker::PhantomData<T>);
 
@@ -118,9 +118,9 @@ pub mod pallet {
 		///
 		/// For backwards compatibility either use [`MinimumPeriodTimesTwo`] or a const.
 		///
-		/// This associated type is only present when compiled with the `explicit-slot-duration`
+		/// This associated type is only present when compiled with the `experimental`
 		/// feature.
-		#[cfg(feature = "explicit-slot-duration")]
+		#[cfg(feature = "experimental")]
 		type SlotDuration: Get<<Self as pallet_timestamp::Config>::Moment>;
 	}
 
@@ -245,12 +245,12 @@ impl<T: Config> Pallet<T> {
 
 	/// Determine the Aura slot-duration based on the Timestamp module configuration.
 	pub fn slot_duration() -> T::Moment {
-		#[cfg(feature = "explicit-slot-duration")]
+		#[cfg(feature = "experimental")]
 		{
 			T::SlotDuration::get()
 		}
 
-		#[cfg(not(feature = "explicit-slot-duration"))]
+		#[cfg(not(feature = "experimental"))]
 		{
 			// we double the minimum block-period so each author can always propose within
 			// the majority of its slot.

diff --git a/frame/aura/src/mock.rs b/frame/aura/src/mock.rs
@@ -103,7 +103,7 @@ impl pallet_aura::Config for Test {
 	type MaxAuthorities = ConstU32<10>;
 	type AllowMultipleBlocksPerSlot = AllowMultipleBlocksPerSlot;
 
-	#[cfg(feature = "explicit-slot-duration")]
+	#[cfg(feature = "experimental")]
 	type SlotDuration = ConstU64<SLOT_DURATION>;
 }