slots: use the correct types for parameters

bin/node/cli/src/service.rs

@@ -238,7 +238,6 @@ pub fn new_full_base(
 		let can_author_with =
 			sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone());
 
-		// WIP: move these hardcoded parameters
 		let backoff_authoring_blocks = Some(sc_consensus_slots::SimpleBackoffAuthoringBlocksStrategy {
 			max_interval: 100,
 			unfinalized_slack: 5,

client/consensus/aura/src/lib.rs

@@ -219,7 +219,7 @@ impl<B, C, E, I, P, Error, SO> sc_consensus_slots::SimpleSlotWorker<B> for AuraW
 	type Proposer = E::Proposer;
 	type Claim = P::Public;
 	type EpochData = Vec<AuthorityId<P>>;
-	type BackoffAuthoringBlocksStrategy = sc_consensus_slots::SimpleBackoffAuthoringBlocksStrategy;
+	type BackoffAuthoringBlocksStrategy = sc_consensus_slots::SimpleBackoffAuthoringBlocksStrategy<B>;
 
 	fn logging_target(&self) -> &'static str {
 		"aura"

client/consensus/babe/src/lib.rs

@@ -355,7 +355,7 @@ pub struct BabeParams<B: BlockT, C, E, I, SO, SC, CAW> {
 	pub force_authoring: bool,
 
 	/// Strategy and parameters for backing off block production if finality starts to lag behind.
-	pub backoff_authoring_blocks: Option<SimpleBackoffAuthoringBlocksStrategy>,
+	pub backoff_authoring_blocks: Option<SimpleBackoffAuthoringBlocksStrategy<B>>,
 
 	/// The source of timestamps for relative slots
 	pub babe_link: BabeLink<B>,
@@ -474,7 +474,7 @@ struct BabeSlotWorker<B: BlockT, C, E, I, SO> {
 	env: E,
 	sync_oracle: SO,
 	force_authoring: bool,
-	backoff_authoring_blocks: Option<SimpleBackoffAuthoringBlocksStrategy>,
+	backoff_authoring_blocks: Option<SimpleBackoffAuthoringBlocksStrategy<B>>,
 	keystore: KeyStorePtr,
 	epoch_changes: SharedEpochChanges<B, Epoch>,
 	slot_notification_sinks: SlotNotificationSinks<B>,
@@ -502,7 +502,7 @@ impl<B, C, E, I, Error, SO> sc_consensus_slots::SimpleSlotWorker<B> for BabeSlot
 	>>;
 	type Proposer = E::Proposer;
 	type BlockImport = I;
-	type BackoffAuthoringBlocksStrategy = sc_consensus_slots::SimpleBackoffAuthoringBlocksStrategy;
+	type BackoffAuthoringBlocksStrategy = sc_consensus_slots::SimpleBackoffAuthoringBlocksStrategy<B>;
 
 	fn logging_target(&self) -> &'static str {
 		"babe"

client/consensus/slots/src/lib.rs

@@ -601,20 +601,20 @@ where
 /// A simple default strategy for how to decide backing off authoring blocks if the number of
 /// unfinalized blocks grows too large.
 #[derive(Clone)]
-pub struct SimpleBackoffAuthoringBlocksStrategy {
+pub struct SimpleBackoffAuthoringBlocksStrategy<B: BlockT> {
 	/// The max interval to backoff when authoring blocks, regardless of delay in finality.
-	pub max_interval: u32,
+	pub max_interval: NumberFor<B>,
 	/// The number of unfinalized blocks allowed before starting to consider to backoff authoring
 	/// blocks. Note that depending on the value for `authoring_bias`, there might still be an
 	/// additional wait until block authorships starts getting declined.
-	pub unfinalized_slack: u32,
+	pub unfinalized_slack: NumberFor<B>,
 	/// How persistant block authorship is in the face of a growing unfinalized chain of blocks. A
 	/// small value for `authoring_bias` means to quickly start backing off block authorship as the
 	/// length of the unfinalized blocks grows.
-	pub authoring_bias: u32,
+	pub authoring_bias: NumberFor<B>,
 }
 
-impl<B> BackoffAuthoringBlocksStrategy<B> for SimpleBackoffAuthoringBlocksStrategy
+impl<B> BackoffAuthoringBlocksStrategy<B> for SimpleBackoffAuthoringBlocksStrategy<B>
 where
 	B: BlockT
 {
@@ -626,14 +626,15 @@ where
 		slot_now: u64,
 	) -> bool {
 		let unfinalized_block_length = chain_head_number - finalized_number;
-		let interval = unfinalized_block_length.saturating_sub(self.unfinalized_slack.into())
-			/ self.authoring_bias.into();
-		let interval = interval.min(self.max_interval.into());
+		let interval = unfinalized_block_length.saturating_sub(self.unfinalized_slack)
+			/ self.authoring_bias;
+		let interval = interval.min(self.max_interval);
 
 		// We're doing arithmetic between block and slot numbers.
 		let interval = interval.unique_saturated_into();
 
-		// Backoff is the current slot isn't far enough ahead of the chain head.
+		// If interval is nonzero we backoff if the current slot isn't far enough ahead of the chain
+		// head.
 		u128::from(slot_now) <= u128::from(chain_head_slot) + interval
 	}
 }