Update dependencies ahead of next release (#8015)

Updates dependencies:
parity-db 0.2.2
paste
prometheus 0.11
cfg-if 1.0
strum 0.20
env_logger 0.8
pin-project
prost
nix
platforms
quickcheck 1.0

substrate/bin/node/bench/Cargo.toml

@@ -38,6 +38,6 @@ hex = "0.4.0"
 rand = { version = "0.7.2", features = ["small_rng"] }
 lazy_static = "1.4.0"
 parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
-parity-db = { version = "0.1.2" }
+parity-db = { version = "0.2.2" }
 sc-transaction-pool = { version = "2.0.0", path = "../../../client/transaction-pool" }
 futures = { version = "0.3.4", features = ["thread-pool"] }

substrate/bin/node/cli/Cargo.toml

@@ -120,10 +120,10 @@ sc-service-test = { version = "2.0.0", path = "../../../client/service/test" }
 futures = "0.3.9"
 tempfile = "3.1.0"
 assert_cmd = "1.0"
-nix = "0.17"
+nix = "0.19"
 serde_json = "1.0"
 regex = "1"
-platforms = "0.2.1"
+platforms = "1.1"
 
 [build-dependencies]
 structopt = { version = "0.3.8", optional = true }

substrate/client/authority-discovery/Cargo.toml

@@ -39,7 +39,7 @@ sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
 sp-api = { version = "2.0.0", path = "../../primitives/api" }
 
 [dev-dependencies]
-quickcheck = "0.9.0"
+quickcheck = "1.0.3"
 sp-tracing = { version = "2.0.0", path = "../../primitives/tracing" }
 sc-peerset = { version = "2.0.0", path = "../peerset" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client"}

substrate/client/authority-discovery/src/worker/addr_cache.rs

@@ -113,7 +113,6 @@ mod tests {
 
 	use libp2p::multihash::{self, Multihash};
 	use quickcheck::{Arbitrary, Gen, QuickCheck, TestResult};
-	use rand::Rng;
 
 	use sp_authority_discovery::{AuthorityId, AuthorityPair};
 	use sp_core::crypto::Pair;
@@ -122,8 +121,8 @@ mod tests {
 	struct TestAuthorityId(AuthorityId);
 
 	impl Arbitrary for TestAuthorityId {
-		fn arbitrary<G: Gen>(g: &mut G) -> Self {
+		fn arbitrary(g: &mut Gen) -> Self {
-			let seed: [u8; 32] = g.gen();
+			let seed = (0..32).map(|_| u8::arbitrary(g)).collect::<Vec<_>>();
 			TestAuthorityId(AuthorityPair::from_seed_slice(&seed).unwrap().public())
 		}
 	}
@@ -132,8 +131,8 @@ mod tests {
 	struct TestMultiaddr(Multiaddr);
 
 	impl Arbitrary for TestMultiaddr {
-		fn arbitrary<G: Gen>(g: &mut G) -> Self {
+		fn arbitrary(g: &mut Gen) -> Self {
-			let seed: [u8; 32] = g.gen();
+			let seed = (0..32).map(|_| u8::arbitrary(g)).collect::<Vec<_>>();
 			let peer_id = PeerId::from_multihash(
 				Multihash::wrap(multihash::Code::Sha2_256.into(), &seed).unwrap()
 			).unwrap();

substrate/client/db/Cargo.toml

@@ -35,14 +35,14 @@ sp-trie = { version = "2.0.0", path = "../../primitives/trie" }
 sp-consensus = { version = "0.8.0", path = "../../primitives/consensus/common" }
 sp-blockchain = { version = "2.0.0", path = "../../primitives/blockchain" }
 sp-database = { version = "2.0.0", path = "../../primitives/database" }
-parity-db = { version = "0.1.2", optional = true }
+parity-db = { version = "0.2.2", optional = true }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.8.0", path = "../../utils/prometheus" }
 
 [dev-dependencies]
 sp-keyring = { version = "2.0.0", path = "../../primitives/keyring" }
 sp-tracing = { version = "2.0.0", path = "../../primitives/tracing" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
-quickcheck = "0.9"
+quickcheck = "1.0.3"
 kvdb-rocksdb = "0.11.0"
 tempfile = "3"
 

substrate/client/db/src/storage_cache.rs

@@ -1471,50 +1471,46 @@ mod qc {
 	}
 
 	impl Arbitrary for Action {
-		fn arbitrary<G: quickcheck::Gen>(gen: &mut G) -> Self {
+		fn arbitrary(gen: &mut quickcheck::Gen) -> Self {
-			let path = gen.next_u32() as u8;
+			let path = u8::arbitrary(gen);
-			let mut buf = [0u8; 32];
+			let buf = (0..32).map(|_| u8::arbitrary(gen)).collect::<Vec<_>>();
 
 			match path {
 				0..=175 => {
-					gen.fill_bytes(&mut buf[..]);
 					Action::Next {
-						hash: H256::from(&buf),
+						hash: H256::from_slice(&buf[..]),
 						changes: {
 							let mut set = Vec::new();
-							for _ in 0..gen.next_u32()/(64*256*256*256) {
+							for _ in 0..<u32>::arbitrary(gen)/(64*256*256*256) {
-								set.push((vec![gen.next_u32() as u8], Some(vec![gen.next_u32() as u8])));
+								set.push((vec![u8::arbitrary(gen)], Some(vec![u8::arbitrary(gen)])));
 							}
 							set
 						}
 					}
 				},
 				176..=220 => {
-					gen.fill_bytes(&mut buf[..]);
 					Action::Fork {
-						hash: H256::from(&buf),
+						hash: H256::from_slice(&buf[..]),
-						depth: ((gen.next_u32() as u8) / 32) as usize,
+						depth: ((u8::arbitrary(gen)) / 32) as usize,
 						changes: {
 							let mut set = Vec::new();
-							for _ in 0..gen.next_u32()/(64*256*256*256) {
+							for _ in 0..<u32>::arbitrary(gen)/(64*256*256*256) {
-								set.push((vec![gen.next_u32() as u8], Some(vec![gen.next_u32() as u8])));
+								set.push((vec![u8::arbitrary(gen)], Some(vec![u8::arbitrary(gen)])));
 							}
 							set
 						}
 					}
 				},
 				221..=240 => {
-					gen.fill_bytes(&mut buf[..]);
 					Action::ReorgWithImport {
-						hash: H256::from(&buf),
+						hash: H256::from_slice(&buf[..]),
-						depth: ((gen.next_u32() as u8) / 32) as usize, // 0-7
+						depth: ((u8::arbitrary(gen)) / 32) as usize, // 0-7
 					}
 				},
 				_ => {
-					gen.fill_bytes(&mut buf[..]);
 					Action::FinalizationReorg {
-						fork_depth: ((gen.next_u32() as u8) / 32) as usize, // 0-7
+						fork_depth: ((u8::arbitrary(gen)) / 32) as usize, // 0-7
-						depth: ((gen.next_u32() as u8) / 64) as usize, // 0-3
+						depth: ((u8::arbitrary(gen)) / 64) as usize, // 0-3
 					}
 				},
 			}

substrate/client/executor/Cargo.toml

@@ -49,7 +49,7 @@ sp-tracing = { version = "2.0.0", path = "../../primitives/tracing" }
 sc-tracing = { version = "2.0.0", path = "../tracing" }
 tracing = "0.1.22"
 tracing-subscriber = "0.2.15"
-paste = "0.1.6"
+paste = "1.0"
 
 [features]
 default = [ "std" ]

substrate/client/finality-grandpa-warp-sync/Cargo.toml

@@ -23,6 +23,6 @@ futures = "0.3.8"
 log = "0.4.11"
 derive_more = "0.99.11"
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-prost = "0.6.1"
+prost = "0.7"
 num-traits = "0.2.14"
 parking_lot = "0.11.1"

substrate/client/finality-grandpa/Cargo.toml

@@ -44,7 +44,7 @@ sp-finality-grandpa = { version = "2.0.0", path = "../../primitives/finality-gra
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.8.0"}
 sc-block-builder = { version = "0.8.0", path = "../block-builder" }
 finality-grandpa = { version = "0.13.0", features = ["derive-codec"] }
-pin-project = "0.4.6"
+pin-project = "1.0.4"
 linked-hash-map = "0.5.2"
 
 [dev-dependencies]

substrate/client/network-gossip/Cargo.toml

@@ -27,6 +27,6 @@ wasm-timer = "0.2"
 
 [dev-dependencies]
 async-std = "1.6.5"
-quickcheck = "0.9.0"
+quickcheck = "1.0.3"
 rand = "0.7.2"
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }

substrate/client/network-gossip/src/bridge.rs

@@ -303,7 +303,6 @@ mod tests {
 	use crate::{ValidationResult, ValidatorContext};
 	use futures::{channel::mpsc::{unbounded, UnboundedSender}, executor::{block_on, block_on_stream}, future::poll_fn};
 	use quickcheck::{Arbitrary, Gen, QuickCheck};
-	use rand::Rng;
 	use sc_network::ObservedRole;
 	use sp_runtime::{testing::H256, traits::{Block as BlockT}};
 	use std::borrow::Cow;
@@ -469,12 +468,14 @@ mod tests {
 		}
 
 		impl Arbitrary for ChannelLengthAndTopic {
-			fn arbitrary<G: Gen>(g: &mut G) -> Self {
+			fn arbitrary(g: &mut Gen) -> Self {
+				let possible_length = (0..100).collect::<Vec<usize>>();
+				let possible_topics = (0..10).collect::<Vec<u64>>();
 				Self {
-					length: g.gen_range(0, 100),
+					length: *g.choose(&possible_length).unwrap(),
 					// Make sure channel topics and message topics overlap by choosing a small
 					// range.
-					topic: H256::from_low_u64_ne(g.gen_range(0, 10)),
+					topic: H256::from_low_u64_ne(*g.choose(&possible_topics).unwrap()),
 				}
 			}
 		}
@@ -485,11 +486,12 @@ mod tests {
 		}
 
 		impl Arbitrary for Message{
-			fn arbitrary<G: Gen>(g: &mut G) -> Self {
+			fn arbitrary(g: &mut Gen) -> Self {
+				let possible_topics = (0..10).collect::<Vec<u64>>();
 				Self {
 					// Make sure channel topics and message topics overlap by choosing a small
 					// range.
-					topic: H256::from_low_u64_ne(g.gen_range(0, 10)),
+					topic: H256::from_low_u64_ne(*g.choose(&possible_topics).unwrap()),
 				}
 			}
 		}

substrate/client/network/Cargo.toml

@@ -40,7 +40,7 @@ lru = "0.6.3"
 log = "0.4.8"
 nohash-hasher = "0.2.0"
 parking_lot = "0.11.1"
-pin-project = "0.4.6"
+pin-project = "1.0.4"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.8.0", path = "../../utils/prometheus" }
 prost = "0.7"
 rand = "0.7.2"
@@ -70,7 +70,7 @@ features = ["identify", "kad", "mdns", "mplex", "noise", "ping", "request-respon
 [dev-dependencies]
 assert_matches = "1.3"
 libp2p = { version = "0.34.0", default-features = false }
-quickcheck = "0.9.0"
+quickcheck = "1.0.3"
 rand = "0.7.2"
 sp-keyring = { version = "2.0.0", path = "../../primitives/keyring" }
 sp-test-primitives = { version = "2.0.0", path = "../../primitives/test-primitives" }

substrate/client/network/src/protocol/sync/extra_requests.rs

@@ -345,8 +345,7 @@ impl<'a, B: BlockT> Matcher<'a, B> {
 mod tests {
 	use crate::protocol::sync::PeerSync;
 	use sp_blockchain::Error as ClientError;
-	use quickcheck::{Arbitrary, Gen, QuickCheck, StdThreadGen};
+	use quickcheck::{Arbitrary, Gen, QuickCheck};
-	use rand::Rng;
 	use std::collections::{HashMap, HashSet};
 	use super::*;
 	use sp_test_primitives::{Block, BlockNumber, Hash};
@@ -373,7 +372,7 @@ mod tests {
 			}
 		}
 
-		QuickCheck::with_gen(StdThreadGen::new(19))
+		QuickCheck::new()
 			.quickcheck(property as fn(ArbitraryPeers))
 	}
 
@@ -425,7 +424,7 @@ mod tests {
 			previously_active == requests.pending_requests.iter().cloned().collect::<HashSet<_>>()
 		}
 
-		QuickCheck::with_gen(StdThreadGen::new(19))
+		QuickCheck::new()
 			.quickcheck(property as fn(ArbitraryPeers) -> bool)
 	}
 
@@ -457,7 +456,7 @@ mod tests {
 			}
 		}
 
-		QuickCheck::with_gen(StdThreadGen::new(19))
+		QuickCheck::new()
 			.quickcheck(property as fn(ArbitraryPeers))
 	}
 
@@ -527,11 +526,11 @@ mod tests {
 	struct ArbitraryPeerSyncState(PeerSyncState<Block>);
 
 	impl Arbitrary for ArbitraryPeerSyncState {
-		fn arbitrary<G: Gen>(g: &mut G) -> Self {
+		fn arbitrary(g: &mut Gen) -> Self {
-			let s = match g.gen::<u8>() % 4 {
+			let s = match u8::arbitrary(g) % 4 {
 				0 => PeerSyncState::Available,
 				// TODO: 1 => PeerSyncState::AncestorSearch(g.gen(), AncestorSearchState<B>),
-				1 => PeerSyncState::DownloadingNew(g.gen::<BlockNumber>()),
+				1 => PeerSyncState::DownloadingNew(BlockNumber::arbitrary(g)),
 				2 => PeerSyncState::DownloadingStale(Hash::random()),
 				_ => PeerSyncState::DownloadingJustification(Hash::random()),
 			};
@@ -543,12 +542,12 @@ mod tests {
 	struct ArbitraryPeerSync(PeerSync<Block>);
 
 	impl Arbitrary for ArbitraryPeerSync {
-		fn arbitrary<G: Gen>(g: &mut G) -> Self {
+		fn arbitrary(g: &mut Gen) -> Self {
 			let ps = PeerSync {
 				peer_id: PeerId::random(),
-				common_number: g.gen(),
+				common_number: u64::arbitrary(g),
 				best_hash: Hash::random(),
-				best_number: g.gen(),
+				best_number: u64::arbitrary(g),
 				state: ArbitraryPeerSyncState::arbitrary(g).0,
 			};
 			ArbitraryPeerSync(ps)
@@ -559,7 +558,7 @@ mod tests {
 	struct ArbitraryPeers(HashMap<PeerId, PeerSync<Block>>);
 
 	impl Arbitrary for ArbitraryPeers {
-		fn arbitrary<G: Gen>(g: &mut G) -> Self {
+		fn arbitrary(g: &mut Gen) -> Self {
 			let mut peers = HashMap::with_capacity(g.size());
 			for _ in 0 .. g.size() {
 				let ps = ArbitraryPeerSync::arbitrary(g).0;

substrate/client/service/Cargo.toml

@@ -36,7 +36,7 @@ log = "0.4.11"
 futures-timer = "3.0.1"
 wasm-timer = "0.2"
 exit-future = "0.2.0"
-pin-project = "0.4.8"
+pin-project = "1.0.4"
 hash-db = "0.15.2"
 serde = "1.0.101"
 serde_json = "1.0.41"

substrate/client/telemetry/Cargo.toml

@@ -20,7 +20,7 @@ futures = "0.3.9"
 wasm-timer = "0.2.5"
 libp2p = { version = "0.34.0", default-features = false, features = ["dns", "tcp-async-io", "wasm-ext", "websocket"] }
 log = "0.4.8"
-pin-project = "0.4.6"
+pin-project = "1.0.4"
 rand = "0.7.2"
 serde = { version = "1.0.101", features = ["derive"] }
 take_mut = "0.2.2"

substrate/frame/benchmarking/Cargo.toml

@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 linregress = { version = "0.4.0", optional = true }
-paste = "0.1"
+paste = "1.0"
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 sp-api = { version = "2.0.0", path = "../../primitives/api", default-features = false }
 sp-runtime-interface = { version = "2.0.0", path = "../../primitives/runtime-interface", default-features = false }

substrate/frame/merkle-mountain-range/Cargo.toml

@@ -25,7 +25,7 @@ sp-runtime = { version = "2.0.0", default-features = false, path = "../../primit
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 
 [dev-dependencies]
-env_logger = "0.5"
+env_logger = "0.8"
 hex-literal = "0.3"
 
 [features]

substrate/frame/support/Cargo.toml

@@ -26,7 +26,7 @@ sp-arithmetic = { version = "2.0.0", default-features = false, path = "../../pri
 sp-inherents = { version = "2.0.0", default-features = false, path = "../../primitives/inherents" }
 sp-staking = { version = "2.0.0", default-features = false, path = "../../primitives/staking" }
 frame-support-procedural = { version = "2.0.1", default-features = false, path = "./procedural" }
-paste = "0.1.6"
+paste = "1.0"
 once_cell = { version = "1", default-features = false, optional = true }
 sp-state-machine = { version = "0.8.0", optional = true, path = "../../primitives/state-machine" }
 bitflags = "1.2"

substrate/primitives/keyring/Cargo.toml

@@ -18,4 +18,4 @@ targets = ["x86_64-unknown-linux-gnu"]
 sp-core = { version = "2.0.0", path = "../core" }
 sp-runtime = { version = "2.0.0", path = "../runtime" }
 lazy_static = "1.4.0"
-strum = { version = "0.16.0", features = ["derive"] }
+strum = { version = "0.20.0", features = ["derive"] }

substrate/primitives/runtime/Cargo.toml

@@ -23,7 +23,7 @@ sp-arithmetic = { version = "2.0.0", default-features = false, path = "../arithm
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
 sp-io = { version = "2.0.0", default-features = false, path = "../io" }
 log = { version = "0.4.8", optional = true }
-paste = "0.1.6"
+paste = "1.0"
 rand = { version = "0.7.2", optional = true }
 impl-trait-for-tuples = "0.2.0"
 parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }

substrate/primitives/utils/Cargo.toml

@@ -13,7 +13,7 @@ readme = "README.md"
 futures = "0.3.9"
 futures-core = "0.3.4"
 lazy_static = "1.4.0"
-prometheus = { version = "0.10.0", default-features = false }
+prometheus = { version = "0.11.0", default-features = false }
 futures-timer = "3.0.2"
 
 [features]

substrate/test-utils/runtime/Cargo.toml

@@ -46,7 +46,7 @@ sp-state-machine = { version = "0.8.0", default-features = false, path = "../../
 sp-externalities = { version = "0.8.0", default-features = false, path = "../../primitives/externalities" }
 
 # 3rd party
-cfg-if = "0.1.10"
+cfg-if = "1.0"
 log = { version = "0.4.8", optional = true }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 

substrate/utils/build-script-utils/Cargo.toml

@@ -13,4 +13,4 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-platforms = "0.2.1"
+platforms = "1.1"

substrate/utils/prometheus/Cargo.toml

@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 log = "0.4.8"
-prometheus = { version = "0.10.0", default-features = false }
+prometheus = { version = "0.11.0", default-features = false }
 futures-util = { version = "0.3.1", default-features = false, features = ["io"] }
 derive_more = "0.99"