Aura and Slots refactoring (#8386)

* Make slot duration being exposed as `Duration` to the outside

* Some slot info love

* Add `build_aura_worker` utility function

* Copy copy copy

substrate/primitives/consensus/aura/src/inherents.rs

@@ -51,12 +51,12 @@ impl AuraInherentData for InherentData {
 // TODO: Remove in the future. https://github.com/paritytech/substrate/issues/8029
 #[cfg(feature = "std")]
 pub struct InherentDataProvider {
-	slot_duration: u64,
+	slot_duration: std::time::Duration,
 }
 
 #[cfg(feature = "std")]
 impl InherentDataProvider {
-	pub fn new(slot_duration: u64) -> Self {
+	pub fn new(slot_duration: std::time::Duration) -> Self {
 		Self {
 			slot_duration
 		}
@@ -88,7 +88,7 @@ impl ProvideInherentData for InherentDataProvider {
 		use sp_timestamp::TimestampInherentData;
 
 		let timestamp = inherent_data.timestamp_inherent_data()?;
-		let slot = *timestamp / self.slot_duration;
+		let slot = *timestamp / self.slot_duration.as_millis() as u64;
 		inherent_data.put_data(INHERENT_IDENTIFIER, &slot)
 	}
 

substrate/primitives/consensus/aura/src/lib.rs

@@ -84,14 +84,39 @@ pub enum ConsensusLog<AuthorityId: Codec> {
 sp_api::decl_runtime_apis! {
 	/// API necessary for block authorship with aura.
 	pub trait AuraApi<AuthorityId: Codec> {
-		/// Return the slot duration in seconds for Aura.
-		/// Currently, only the value provided by this type at genesis
-		/// will be used.
+		/// Returns the slot duration for Aura.
 		///
-		/// Dynamic slot duration may be supported in the future.
-		fn slot_duration() -> u64;
+		/// Currently, only the value provided by this type at genesis will be used.
+		fn slot_duration() -> SlotDuration;
 
 		// Return the current set of authorities.
 		fn authorities() -> Vec<AuthorityId>;
 	}
 }
+
+/// Aura slot duration.
+///
+/// Internally stored as milliseconds.
+#[derive(sp_runtime::RuntimeDebug, Encode, Decode, PartialEq, Clone, Copy)]
+pub struct SlotDuration(u64);
+
+impl SlotDuration {
+	/// Initialize from the given milliseconds.
+	pub fn from_millis(val: u64) -> Self {
+		Self(val)
+	}
+
+	/// Returns the slot duration in milli seconds.
+	pub fn get(&self) -> u64 {
+		self.0
+	}
+}
+
+#[cfg(feature = "std")]
+impl sp_consensus::SlotData for SlotDuration {
+	fn slot_duration(&self) -> std::time::Duration {
+		std::time::Duration::from_millis(self.0)
+	}
+
+	const SLOT_KEY: &'static [u8] = b"aura_slot_duration";
+}