Backport paritytech#7381

client/cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sc-cli"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Parity Technologies <[email protected]>"]
 description = "Substrate CLI interface."
 edition = "2018"

client/cli/src/commands/export_blocks_cmd.rs

@@ -85,7 +85,7 @@ impl ExportBlocksCmd {
 			info!("DB path: {}", path.display());
 		}
 
-		let from = self.from.as_ref().and_then(|f| f.parse().ok()).unwrap_or(1);
+		let from = self.from.as_ref().and_then(|f| f.parse().ok()).unwrap_or(1u32);
 		let to = self.to.as_ref().and_then(|t| t.parse().ok());
 
 		let binary = self.binary;

client/finality-grandpa/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sc-finality-grandpa"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"

client/finality-grandpa/src/voting_rule.rs

@@ -241,7 +241,7 @@ impl<Block, B> Default for VotingRulesBuilder<Block, B> where
 {
 	fn default() -> Self {
 		VotingRulesBuilder::new()
-			.add(BeforeBestBlockBy(2.into()))
+			.add(BeforeBestBlockBy(2u32.into()))
 			.add(ThreeQuartersOfTheUnfinalizedChain)
 	}
 }

client/informant/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sc-informant"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Parity Technologies <[email protected]>"]
 description = "Substrate informant."
 edition = "2018"

client/informant/src/display.rs

@@ -168,7 +168,7 @@ fn speed<B: BlockT>(
 	} else {
 		// If the number of blocks can't be converted to a regular integer, then we need a more
 		// algebraic approach and we stay within the realm of integers.
-		let one_thousand = NumberFor::<B>::from(1_000);
+		let one_thousand = NumberFor::<B>::from(1_000u32);
 		let elapsed = NumberFor::<B>::from(
 			<u32 as TryFrom<_>>::try_from(elapsed_ms).unwrap_or(u32::max_value())
 		);

client/network/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 description = "Substrate network protocol"
 name = "sc-network"
-version = "0.8.0"
+version = "0.8.1"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"

client/network/src/light_client_handler.rs

@@ -1429,7 +1429,7 @@ mod tests {
 			_: ChangesProof<B::Header>
 		) -> Result<Vec<(NumberFor<B>, u32)>, ClientError> {
 			match self.ok {
-				true => Ok(vec![(100.into(), 2)]),
+				true => Ok(vec![(100u32.into(), 2)]),
 				false => Err(ClientError::Backend("Test error".into())),
 			}
 		}

client/service/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sc-service"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"

client/service/src/chain_ops/export_blocks.rs

@@ -87,7 +87,7 @@ where
 			// Reached end of the chain.
 			None => return Poll::Ready(Ok(())),
 		}
-		if (block % 10000.into()).is_zero() {
+		if (block % 10000u32.into()).is_zero() {
 			info!("#{}", block);
 		}
 		if block == last {

client/service/src/chain_ops/import_blocks.rs

@@ -200,7 +200,7 @@ impl<B: BlockT> Speedometer<B> {
 	/// Creates a fresh Speedometer.
 	fn new() -> Self {
 		Self {
-			best_number: NumberFor::<B>::from(0),
+			best_number: NumberFor::<B>::from(0u32),
 			last_number: None,
 			last_update: Instant::now(),
 		}
@@ -232,7 +232,7 @@ impl<B: BlockT> Speedometer<B> {
 		} else {
 			// If the number of blocks can't be converted to a regular integer, then we need a more
 			// algebraic approach and we stay within the realm of integers.
-			let one_thousand = NumberFor::<B>::from(1_000);
+			let one_thousand = NumberFor::<B>::from(1_000u32);
 			let elapsed = NumberFor::<B>::from(
 				<u32 as TryFrom<_>>::try_from(elapsed_ms).unwrap_or(u32::max_value())
 			);

client/service/src/client/client.rs

@@ -38,7 +38,7 @@ use sp_runtime::{
 	generic::{BlockId, SignedBlock, DigestItem},
 	traits::{
 		Block as BlockT, Header as HeaderT, Zero, NumberFor,
-		HashFor, SaturatedConversion, One, DigestFor,
+		HashFor, SaturatedConversion, One, DigestFor, UniqueSaturatedInto,
 	},
 };
 use sp_state_machine::{
@@ -1139,7 +1139,7 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 		let mut ancestor = load_header(ancestor_hash)?;
 		let mut uncles = Vec::new();
 
-		for _generation in 0..max_generation.saturated_into() {
+		for _generation in 0u32..UniqueSaturatedInto::<u32>::unique_saturated_into(max_generation) {
 			let children = self.backend.blockchain().children(ancestor_hash)?;
 			uncles.extend(children.into_iter().filter(|h| h != &current_hash));
 			current_hash = ancestor_hash;

client/service/src/metrics.rs

@@ -316,9 +316,9 @@ impl MetricsService {
 			);
 
 			if let Some(metrics) = self.metrics.as_ref() {
-				let best_seen_block = net_status
+				let best_seen_block: Option<u64> = net_status
 					.best_seen_block
-					.map(|num: NumberFor<T>| num.unique_saturated_into() as u64);
+					.map(|num: NumberFor<T>| UniqueSaturatedInto::<u64>::unique_saturated_into(num));
 
 				if let Some(best_seen_block) = best_seen_block {
 					metrics.block_height.with_label_values(&["sync_target"]).set(best_seen_block);

client/transaction-pool/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sc-transaction-pool"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"

client/transaction-pool/src/lib.rs

@@ -569,7 +569,7 @@ impl<PoolApi, Block> MaintainedTransactionPool for BasicPool<PoolApi, Block>
 				let next_action = self.revalidation_strategy.lock().next(
 					block_number,
 					Some(std::time::Duration::from_secs(60)),
-					Some(20.into()),
+					Some(20u32.into()),
 				);
 				let revalidation_strategy = self.revalidation_strategy.clone();
 				let revalidation_queue = self.revalidation_queue.clone();

frame/aura/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pallet-aura"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 license = "Apache-2.0"

frame/aura/src/lib.rs

@@ -74,7 +74,7 @@ pub trait Trait: pallet_timestamp::Trait {
 decl_storage! {
 	trait Store for Module<T: Trait> as Aura {
 		/// The last timestamp.
-		LastTimestamp get(fn last) build(|_| 0.into()): T::Moment;
+		LastTimestamp get(fn last): T::Moment;
 
 		/// The current authorities
 		pub Authorities get(fn authorities): Vec<T::AuthorityId>;
@@ -196,7 +196,7 @@ impl<T: Trait> Module<T> {
 	pub fn slot_duration() -> T::Moment {
 		// we double the minimum block-period so each author can always propose within
 		// the majority of its slot.
-		<T as pallet_timestamp::Trait>::MinimumPeriod::get().saturating_mul(2.into())
+		<T as pallet_timestamp::Trait>::MinimumPeriod::get().saturating_mul(2u32.into())
 	}
 
 	fn on_timestamp_set(now: T::Moment, slot_duration: T::Moment) {