resolve slots renaming fallout

Author: Andronik Ordian

node/core/approval-voting/src/aux_schema/mod.rs

@@ -220,7 +220,7 @@ impl CandidateEntry {
 pub(crate) struct BlockEntry {
 	pub block_hash: Hash,
 	pub session: SessionIndex,
-	pub slot: SlotNumber,
+	pub slot: Slot,
 	pub relay_vrf_story: RelayVRFStory,
 	// The candidates included as-of this block and the index of the core they are
 	// leaving. Sorted ascending by core index.

node/core/approval-voting/src/aux_schema/tests.rs

@@ -61,7 +61,7 @@ fn make_block_entry(
 	BlockEntry {
 		block_hash,
 		session: 1,
-		slot: 1,
+		slot: Slot::from(1),
 		relay_vrf_story: RelayVRFStory([0u8; 32]),
 		approved_bitfield: make_bitvec(candidates.len()),
 		candidates,

node/core/approval-voting/src/lib.rs

@@ -44,7 +44,7 @@ use polkadot_node_primitives::approval::{
 };
 use parity_scale_codec::Encode;
 use sc_keystore::LocalKeystore;
-use sp_consensus_slots::SlotNumber;
+use sp_consensus_slots::Slot;
 use sc_client_api::backend::AuxStore;
 use sp_runtime::traits::AppVerify;
 use sp_application_crypto::Pair;
@@ -71,7 +71,7 @@ mod time;
 mod tests;
 
 const APPROVAL_SESSIONS: SessionIndex = 6;
-const LOG_TARGET: &str = "approval-voting";
+const LOG_TARGET: &str = "approval_voting";
 
 /// The approval voting subsystem.
 pub struct ApprovalVotingSubsystem<T> {
@@ -663,7 +663,7 @@ struct ImportedBlockInfo {
 	assignments: HashMap<CoreIndex, OurAssignment>,
 	n_validators: usize,
 	relay_vrf_story: RelayVRFStory,
-	slot: SlotNumber,
+	slot: Slot,
 }
 
 // Computes information about the imported block. Returns `None` if the info couldn't be extracted -
@@ -755,7 +755,7 @@ async fn imported_block_info(
 
 		match unsafe_vrf {
 			Some(unsafe_vrf) => {
-				let slot = unsafe_vrf.slot_number();
+				let slot = unsafe_vrf.slot();
 
 				match unsafe_vrf.compute_randomness(
 					&babe_epoch.authorities,
@@ -887,7 +887,7 @@ async fn handle_new_head(
 			number: block_header.number,
 			parent_hash: block_header.parent_hash,
 			candidates: included_candidates.iter().map(|(hash, _, _, _)| *hash).collect(),
-			slot_number: slot,
+			slot,
 		});
 
 		let (block_tick, no_show_duration) = {
@@ -897,7 +897,7 @@ async fn handle_new_head(
 			let block_tick = slot_number_to_tick(state.slot_duration_millis, slot);
 			let no_show_duration = slot_number_to_tick(
 				state.slot_duration_millis,
-				session_info.no_show_slots as _,
+				Slot::from(u64::from(session_info.no_show_slots)),
 			);
 
 			(block_tick, no_show_duration)
@@ -934,7 +934,7 @@ fn check_and_import_assignment(
 	assignment: IndirectAssignmentCert,
 	candidate_index: CandidateIndex,
 ) -> SubsystemResult<AssignmentCheckResult> {
-	const TOO_FAR_IN_FUTURE: SlotNumber = 5;
+	const SLOT_TOO_FAR_IN_FUTURE: u64 = 5;
 
 	let tick_now = state.clock.tick_now();
 
@@ -1004,7 +1004,7 @@ fn check_and_import_assignment(
 			Ok(tranche) => {
 				let tranche_now_of_prev_slot = state.clock.tranche_now(
 					state.slot_duration_millis,
-					block_entry.slot.saturating_sub(TOO_FAR_IN_FUTURE),
+					block_entry.slot.saturating_sub(SLOT_TOO_FAR_IN_FUTURE),
 				);
 
 				if tranche >= tranche_now_of_prev_slot {
@@ -1029,7 +1029,7 @@ fn check_and_import_assignment(
 		let block_tick = slot_number_to_tick(state.slot_duration_millis, block_entry.slot);
 		let no_show_duration = slot_number_to_tick(
 			state.slot_duration_millis,
-			session_info.no_show_slots as _,
+			Slot::from(u64::from(session_info.no_show_slots)),
 		);
 
 		(block_tick, no_show_duration)
@@ -1211,7 +1211,7 @@ fn check_full_approvals(
 			&candidate_entry.approvals,
 			tranche_now,
 			slot_number_to_tick(state.slot_duration_millis, block_entry.slot),
-			slot_number_to_tick(state.slot_duration_millis, session_info.no_show_slots as _),
+			slot_number_to_tick(state.slot_duration_millis, Slot::from(u64::from(session_info.no_show_slots))),
 			session_info.needed_approvals as _
 		);
 
@@ -1467,7 +1467,7 @@ async fn process_wakeup(
 	let block_tick = slot_number_to_tick(state.slot_duration_millis, block_entry.slot);
 	let no_show_duration = slot_number_to_tick(
 		state.slot_duration_millis,
-		session_info.no_show_slots as _,
+		Slot::from(u64::from(session_info.no_show_slots)),
 	);
 
 	let should_broadcast = {

node/core/approval-voting/src/tests.rs

@@ -130,17 +130,20 @@ impl AuxStore for TestStore {
 
 fn blank_state() -> (State<TestStore>, mpsc::Receiver<BackgroundRequest>) {
 	let (tx, rx) = mpsc::channel(1024);
-	State {
-		earliest_session: None,
-		session_info: Vec::new(),
-		keystore: LocalKeystore::in_memory(),
-		wakeups: Wakeups::default(),
-		slot_duration_millis: SLOT_DURATION_MILLIS,
-		db: Arc::new(TestStore::default()),
-		background_tx: tx,
-		clock: Box::new(MockClock::default()),
-		assignment_criteria: unimplemented!(),
-	}
+	(
+		State {
+			earliest_session: None,
+			session_info: Vec::new(),
+			keystore: LocalKeystore::in_memory(),
+			wakeups: Wakeups::default(),
+			slot_duration_millis: SLOT_DURATION_MILLIS,
+			db: Arc::new(TestStore::default()),
+			background_tx: tx,
+			clock: Box::new(MockClock::default()),
+			assignment_criteria: unimplemented!(),
+		},
+		rx,
+	)
 }
 
 fn single_session_state(index: SessionIndex, info: SessionInfo)
@@ -154,14 +157,14 @@ fn single_session_state(index: SessionIndex, info: SessionInfo)
 
 #[test]
 fn rejects_bad_assignment() {
-	let state = single_session_state(1, unimplemented!());
+	let (mut state, rx) = single_session_state(1, unimplemented!());
 	let assignment = unimplemented!();
 	let candidate_index = unimplemented!();
 
 	// TODO [now]: instantiate test store with block data.
 
 	check_and_import_assignment(
-		state,
+		&mut state,
 		assignment,
 		candidate_index,
 	).unwrap();

node/core/approval-voting/src/time.rs

@@ -17,7 +17,7 @@
 //! Time utilities for approval voting.
 
 use polkadot_node_primitives::approval::DelayTranche;
-use sp_consensus_slots::SlotNumber;
+use sp_consensus_slots::Slot;
 use futures::prelude::*;
 use std::time::{Duration, SystemTime};
 use std::pin::Pin;
@@ -39,11 +39,11 @@ pub(crate) trait Clock {
 
 /// Extension methods for clocks.
 pub(crate) trait ClockExt {
-	fn tranche_now(&self, slot_duration_millis: u64, base_slot: SlotNumber) -> DelayTranche;
+	fn tranche_now(&self, slot_duration_millis: u64, base_slot: Slot) -> DelayTranche;
 }
 
 impl<C: Clock + ?Sized> ClockExt for C {
-	fn tranche_now(&self, slot_duration_millis: u64, base_slot: SlotNumber) -> DelayTranche {
+	fn tranche_now(&self, slot_duration_millis: u64, base_slot: Slot) -> DelayTranche {
 		self.tick_now()
 			.saturating_sub(slot_number_to_tick(slot_duration_millis, base_slot)) as u32
 	}
@@ -82,7 +82,7 @@ fn tick_to_time(tick: Tick) -> SystemTime {
 }
 
 /// assumes `slot_duration_millis` evenly divided by tick duration.
-pub(crate) fn slot_number_to_tick(slot_duration_millis: u64, slot: SlotNumber) -> Tick {
+pub(crate) fn slot_number_to_tick(slot_duration_millis: u64, slot: Slot) -> Tick {
 	let ticks_per_slot = slot_duration_millis / TICK_DURATION_MILLIS;
-	slot * ticks_per_slot
+	u64::from(slot) * ticks_per_slot
 }

node/primitives/src/approval.rs

@@ -17,7 +17,7 @@
 //! Types relevant for approval.
 
 pub use sp_consensus_vrf::schnorrkel::{VRFOutput, VRFProof, Randomness};
-pub use sp_consensus_babe::SlotNumber;
+pub use sp_consensus_babe::Slot;
 
 use polkadot_primitives::v1::{
 	CandidateHash, Hash, ValidatorIndex, ValidatorSignature, CoreIndex,
@@ -147,13 +147,13 @@ pub enum ApprovalError {
 /// An unsafe VRF output. Provide BABE Epoch info to create a `RelayVRFStory`.
 pub struct UnsafeVRFOutput {
 	vrf_output: VRFOutput,
-	slot: SlotNumber,
+	slot: Slot,
 	authority_index: u32,
 }
 
 impl UnsafeVRFOutput {
-	/// Get the slot number.
-	pub fn slot_number(&self) -> SlotNumber {
+	/// Get the slot.
+	pub fn slot(&self) -> Slot {
 		self.slot
 	}
 
@@ -194,7 +194,7 @@ pub fn babe_unsafe_vrf_info(header: &Header) -> Option<UnsafeVRFOutput> {
 
 	for digest in &header.digest.logs {
 		if let Some(pre) = digest.as_babe_pre_digest() {
-			let slot = pre.slot_number();
+			let slot = pre.slot();
 			let authority_index = pre.authority_index();
 
 			// exhaustive match to defend against upstream variant changes.

node/subsystem/src/messages.rs

@@ -30,7 +30,6 @@ use polkadot_node_network_protocol::{
 use polkadot_node_primitives::{
 	CollationGenerationConfig, SignedFullStatement, ValidationResult,
 	approval::{BlockApprovalMeta, IndirectAssignmentCert, IndirectSignedApprovalVote},
-	CollationGenerationConfig, MisbehaviorReport, SignedFullStatement, ValidationResult,
 	BabeEpoch,
 };
 use polkadot_primitives::v1::{