refactor: ensure experimental feature

Simplifies definition of experimental feature, ensuring that it is enabled and defined in a single place. This feature is removed from pallet_aura in https://github.com/paritytech/polkadot-sdk/blob/master/prdoc/1.10.0/pr_3654.prdoc
r0gue-io · Aug 11, 2024 · 61f4c94 · 61f4c94
1 parent fa2e578
commit 61f4c94
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 17 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -50,8 +50,8 @@ substrate-wasm-builder = "18.0.1"
 substrate-build-script-utils = "11.0.0"
 
 # Local
-pop-runtime-devnet = { path = "runtime/devnet", default-features = true, features = ["experimental"] } # default-features=true required for `-p pop-node` builds
-pop-runtime-testnet = { path = "runtime/testnet", default-features = true, features = ["experimental"] } # default-features=true required for `-p pop-node` builds
+pop-runtime-devnet = { path = "runtime/devnet", default-features = true } # default-features=true required for `-p pop-node` builds
+pop-runtime-testnet = { path = "runtime/testnet", default-features = true } # default-features=true required for `-p pop-node` builds
 pop-runtime-common = { path = "runtime/common", default-features = false }
 pop-primitives = { path = "./primitives", default-features = false }
 
@@ -80,7 +80,7 @@ frame-system = { version = "29.0.0", default-features = false }
 frame-system-benchmarking = { version = "29.0.0", default-features = false }
 frame-system-rpc-runtime-api = { version = "27.0.0", default-features = false }
 frame-try-runtime = { version = "0.35.0", default-features = false }
-pallet-aura = { version = "28.0.0", default-features = false }
+pallet-aura = { version = "28.0.0", default-features = false, features = ["experimental"] }
 pallet-authorship = { version = "29.0.0", default-features = false }
 pallet-assets = { version = "30.0.0", default-features = false }
 pallet-balances = { version = "29.0.2", default-features = false }

diff --git a/runtime/devnet/Cargo.toml b/runtime/devnet/Cargo.toml
@@ -221,6 +221,4 @@ try-runtime = [
     "parachain-info/try-runtime",
     "polkadot-runtime-common/try-runtime",
     "sp-runtime/try-runtime",
-]
-
-experimental = ["pallet-aura/experimental"]
+]
diff --git a/runtime/devnet/src/lib.rs b/runtime/devnet/src/lib.rs
@@ -296,10 +296,7 @@ impl pallet_timestamp::Config for Runtime {
 	/// A timestamp: milliseconds since the unix epoch.
 	type Moment = u64;
 	type OnTimestampSet = Aura;
-	#[cfg(feature = "experimental")]
 	type MinimumPeriod = ConstU64<0>;
-	#[cfg(not(feature = "experimental"))]
-	type MinimumPeriod = ConstU64<{ SLOT_DURATION / 2 }>;
 	type WeightInfo = ();
 }
 
@@ -444,7 +441,6 @@ impl pallet_aura::Config for Runtime {
 	type DisabledValidators = ();
 	type MaxAuthorities = ConstU32<100_000>;
 	type AllowMultipleBlocksPerSlot = ConstBool<true>;
-	#[cfg(feature = "experimental")]
 	type SlotDuration = ConstU64<SLOT_DURATION>;
 }
 

diff --git a/runtime/testnet/Cargo.toml b/runtime/testnet/Cargo.toml
@@ -221,6 +221,4 @@ try-runtime = [
     "parachain-info/try-runtime",
     "polkadot-runtime-common/try-runtime",
     "sp-runtime/try-runtime",
-]
-
-experimental = ["pallet-aura/experimental"]
+]
diff --git a/runtime/testnet/src/lib.rs b/runtime/testnet/src/lib.rs
@@ -299,10 +299,7 @@ impl pallet_timestamp::Config for Runtime {
 	/// A timestamp: milliseconds since the unix epoch.
 	type Moment = u64;
 	type OnTimestampSet = Aura;
-	#[cfg(feature = "experimental")]
 	type MinimumPeriod = ConstU64<0>;
-	#[cfg(not(feature = "experimental"))]
-	type MinimumPeriod = ConstU64<{ SLOT_DURATION / 2 }>;
 	type WeightInfo = ();
 }
 
@@ -447,7 +444,6 @@ impl pallet_aura::Config for Runtime {
 	type DisabledValidators = ();
 	type MaxAuthorities = ConstU32<100_000>;
 	type AllowMultipleBlocksPerSlot = ConstBool<true>;
-	#[cfg(feature = "experimental")]
 	type SlotDuration = ConstU64<SLOT_DURATION>;
 }