Companion for #7997 (#2345)

* Companion for #7997

https://github.com/paritytech/substrate/pull/7997

* rename slot_number to slot

* rename SlotNumber type in overseer docs

* "Update Substrate"

Co-authored-by: André Silva <andrerfosilva@gmail.com>
Co-authored-by: parity-processbot <>

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

@@ -39,7 +39,7 @@ use polkadot_primitives::v1::{
 	ValidatorIndex, GroupIndex, CandidateReceipt, SessionIndex, CoreIndex,
 	BlockNumber, Hash, CandidateHash,
 };
-use sp_consensus_slots::SlotNumber;
+use sp_consensus_slots::Slot;
 use parity_scale_codec::{Encode, Decode};
 
 use std::collections::{BTreeMap, HashMap};
@@ -94,7 +94,7 @@ pub(crate) struct CandidateEntry {
 pub(crate) struct BlockEntry {
 	block_hash: Hash,
 	session: SessionIndex,
-	slot: SlotNumber,
+	slot: Slot,
 	relay_vrf_story: RelayVRF,
 	// The candidates included as-of this block and the index of the core they are
 	// leaving. Sorted ascending by core index.

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

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