Bump lru from 0.7.8 to 0.8.0

node/core/approval-voting/Cargo.toml

@@ -10,7 +10,7 @@ futures-timer = "3.0.2"
 parity-scale-codec = { version = "3.1.5", default-features = false, features = ["bit-vec", "derive"] }
 gum = { package = "tracing-gum", path = "../../gum" }
 bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] }
-lru = "0.7"
+lru = "0.8"
 merlin = "2.0"
 schnorrkel = "0.9.1"
 kvdb = "0.11.0"

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

@@ -70,6 +70,7 @@ use std::{
 	collections::{
 		btree_map::Entry as BTMEntry, hash_map::Entry as HMEntry, BTreeMap, HashMap, HashSet,
 	},
+	num::NonZeroUsize,
 	sync::Arc,
 	time::Duration,
 };
@@ -104,7 +105,7 @@ const APPROVAL_CHECKING_TIMEOUT: Duration = Duration::from_secs(120);
 /// Value rather arbitrarily: Should not be hit in practice, it exists to more easily diagnose dead
 /// lock issues for example.
 const WAIT_FOR_SIGS_TIMEOUT: Duration = Duration::from_millis(500);
-const APPROVAL_CACHE_SIZE: usize = 1024;
+const APPROVAL_CACHE_SIZE: Option<NonZeroUsize> = NonZeroUsize::new(1024);
 const TICK_TOO_FAR_IN_FUTURE: Tick = 20; // 10 seconds.
 const APPROVAL_DELAY: Tick = 2;
 const LOG_TARGET: &str = "parachain::approval-voting";
@@ -737,7 +738,8 @@ where
 
 	let mut wakeups = Wakeups::default();
 	let mut currently_checking_set = CurrentlyCheckingSet::default();
-	let mut approvals_cache = lru::LruCache::new(APPROVAL_CACHE_SIZE);
+	let mut approvals_cache =
+		lru::LruCache::new(APPROVAL_CACHE_SIZE.expect("Approval cache size should not be 0."));
 
 	let mut last_finalized_height: Option<BlockNumber> = {
 		let (tx, rx) = oneshot::channel();

node/core/dispute-coordinator/Cargo.toml

@@ -10,7 +10,7 @@ gum = { package = "tracing-gum", path = "../../gum" }
 parity-scale-codec = "3.1.5"
 kvdb = "0.11.0"
 thiserror = "1.0.31"
-lru = "0.7.7"
+lru = "0.8.0"
 fatality = "0.0.6"
 
 polkadot-primitives = { path = "../../../primitives" }

node/core/dispute-coordinator/src/scraping/mod.rs

@@ -14,7 +14,10 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
-use std::collections::{BTreeMap, HashSet};
+use std::{
+	collections::{BTreeMap, HashSet},
+	num::NonZeroUsize,
+};
 
 use futures::channel::oneshot;
 use lru::LruCache;
@@ -44,7 +47,7 @@ mod tests;
 /// `last_observed_blocks` LRU. This means, this value should the very least be as large as the
 /// number of expected forks for keeping chain scraping efficient. Making the LRU much larger than
 /// that has very limited use.
-const LRU_OBSERVED_BLOCKS_CAPACITY: usize = 20;
+const LRU_OBSERVED_BLOCKS_CAPACITY: Option<NonZeroUsize> = NonZeroUsize::new(20);
 
 /// Chain scraper
 ///
@@ -92,7 +95,9 @@ impl ChainScraper {
 		let mut s = Self {
 			included_candidates: HashSet::new(),
 			candidates_by_block_number: BTreeMap::new(),
-			last_observed_blocks: LruCache::new(LRU_OBSERVED_BLOCKS_CAPACITY),
+			last_observed_blocks: LruCache::new(
+				LRU_OBSERVED_BLOCKS_CAPACITY.expect("Observed blocks cache size should not be 0."),
+			),
 		};
 		let update =
 			ActiveLeavesUpdate { activated: Some(initial_head), deactivated: Default::default() };

node/network/availability-distribution/Cargo.toml

@@ -19,7 +19,7 @@ sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "maste
 thiserror = "1.0.31"
 rand = "0.8.5"
 derive_more = "0.99.17"
-lru = "0.7.7"
+lru = "0.8.0"
 fatality = "0.0.6"
 
 [dev-dependencies]

node/network/availability-distribution/src/requester/session_cache.rs

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
-use std::collections::HashSet;
+use std::{collections::HashSet, num::NonZeroUsize};
 
 use lru::LruCache;
 use rand::{seq::SliceRandom, thread_rng};
@@ -85,7 +85,7 @@ impl SessionCache {
 	pub fn new() -> Self {
 		SessionCache {
 			// We need to cache the current and the last session the most:
-			session_info_cache: LruCache::new(2),
+			session_info_cache: LruCache::new(NonZeroUsize::new(2).unwrap()),
 		}
 	}
 

node/network/availability-recovery/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 
 [dependencies]
 futures = "0.3.21"
-lru = "0.7.7"
+lru = "0.8.0"
 rand = "0.8.5"
 fatality = "0.0.6"
 thiserror = "1.0.31"

node/network/availability-recovery/src/lib.rs

@@ -20,6 +20,7 @@
 
 use std::{
 	collections::{HashMap, VecDeque},
+	num::NonZeroUsize,
 	pin::Pin,
 	time::Duration,
 };
@@ -77,7 +78,7 @@ const LOG_TARGET: &str = "parachain::availability-recovery";
 const N_PARALLEL: usize = 50;
 
 // Size of the LRU cache where we keep recovered data.
-const LRU_SIZE: usize = 16;
+const LRU_SIZE: Option<NonZeroUsize> = NonZeroUsize::new(16);
 
 const COST_INVALID_REQUEST: Rep = Rep::CostMajor("Peer sent unparsable request");
 
@@ -797,7 +798,9 @@ impl Default for State {
 		Self {
 			ongoing_recoveries: FuturesUnordered::new(),
 			live_block: (0, Hash::default()),
-			availability_lru: LruCache::new(LRU_SIZE),
+			availability_lru: LruCache::new(
+				LRU_SIZE.expect("Availability Recovery cache size should not be 0."),
+			),
 		}
 	}
 }

node/network/dispute-distribution/Cargo.toml

@@ -20,7 +20,7 @@ sp-application-crypto = { git = "https://github.com/paritytech/substrate", branc
 sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
 thiserror = "1.0.31"
 fatality = "0.0.6"
-lru = "0.7.7"
+lru = "0.8.0"
 
 [dev-dependencies]
 async-trait = "0.1.57"

node/network/dispute-distribution/src/receiver/mod.rs

@@ -16,6 +16,7 @@
 
 use std::{
 	collections::HashSet,
+	num::NonZeroUsize,
 	pin::Pin,
 	task::{Context, Poll},
 };
@@ -156,7 +157,10 @@ where
 			pending_imports: PendingImports::new(),
 			// Size of MAX_PARALLEL_IMPORTS ensures we are going to immediately get rid of any
 			// malicious requests still pending in the incoming queue.
-			banned_peers: LruCache::new(MAX_PARALLEL_IMPORTS),
+			banned_peers: LruCache::new(
+				NonZeroUsize::new(MAX_PARALLEL_IMPORTS)
+					.expect("Banned peer cache size should not be 0."),
+			),
 			metrics,
 		}
 	}
@@ -222,7 +226,7 @@ where
 		}
 
 		// Wait for a free slot:
-		if self.pending_imports.len() >= MAX_PARALLEL_IMPORTS as usize {
+		if self.pending_imports.len() >= MAX_PARALLEL_IMPORTS {
 			// Wait for one to finish:
 			let r = self.pending_imports.next().await;
 			self.ban_bad_peer(r.expect("pending_imports.len() is greater 0. qed."))?;

node/overseer/Cargo.toml

@@ -17,7 +17,7 @@ polkadot-node-metrics = { path = "../metrics" }
 polkadot-primitives = { path = "../../primitives" }
 orchestra = { path = "../orchestra" }
 gum = { package = "tracing-gum", path = "../gum" }
-lru = "0.7"
+lru = "0.8"
 parity-util-mem = { version = "0.11.0", default-features = false }
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
 async-trait = "0.1.57"

node/overseer/src/dummy.rs

@@ -186,7 +186,9 @@ where
 		.activation_external_listeners(Default::default())
 		.span_per_active_leaf(Default::default())
 		.active_leaves(Default::default())
-		.known_leaves(LruCache::new(KNOWN_LEAVES_CACHE_SIZE))
+		.known_leaves(LruCache::new(
+			KNOWN_LEAVES_CACHE_SIZE.expect("Known leaves cache size should not be 0."),
+		))
 		.leaves(Default::default())
 		.spawner(SpawnGlue(spawner))
 		.metrics(metrics)

node/overseer/src/lib.rs

@@ -62,6 +62,7 @@
 use std::{
 	collections::{hash_map, HashMap},
 	fmt::{self, Debug},
+	num::NonZeroUsize,
 	pin::Pin,
 	sync::Arc,
 	time::Duration,
@@ -112,7 +113,7 @@ pub use orchestra::{
 
 /// Store 2 days worth of blocks, not accounting for forks,
 /// in the LRU cache. Assumes a 6-second block time.
-pub const KNOWN_LEAVES_CACHE_SIZE: usize = 2 * 24 * 3600 / 6;
+pub const KNOWN_LEAVES_CACHE_SIZE: Option<NonZeroUsize> = NonZeroUsize::new(2 * 24 * 3600 / 6);
 
 #[cfg(test)]
 mod tests;

node/service/Cargo.toml

@@ -73,7 +73,7 @@ kvdb = "0.11.0"
 kvdb-rocksdb = { version = "0.15.2", optional = true }
 parity-db = { version = "0.3.16", optional = true }
 async-trait = "0.1.57"
-lru = "0.7"
+lru = "0.8"
 
 # Polkadot
 polkadot-node-core-parachains-inherent = { path = "../core/parachains-inherent" }

node/service/src/overseer.rs

@@ -317,7 +317,9 @@ where
 		.span_per_active_leaf(Default::default())
 		.active_leaves(Default::default())
 		.supports_parachains(runtime_client)
-		.known_leaves(LruCache::new(KNOWN_LEAVES_CACHE_SIZE))
+		.known_leaves(LruCache::new(
+			KNOWN_LEAVES_CACHE_SIZE.expect("Known leaves cache size should not be 0."),
+		))
 		.metrics(metrics)
 		.spawner(spawner);
 

node/subsystem-util/Cargo.toml

@@ -17,7 +17,7 @@ thiserror = "1.0.31"
 fatality = "0.0.6"
 gum = { package = "tracing-gum", path = "../gum" }
 derive_more = "0.99.17"
-lru = "0.7.7"
+lru = "0.8.0"
 
 polkadot-node-subsystem = {path = "../subsystem" }
 polkadot-node-jaeger = { path = "../jaeger" }

node/subsystem-util/src/runtime/mod.rs

@@ -16,7 +16,7 @@
 
 //! Convenient interface to runtime information.
 
-use std::cmp::max;
+use std::{cmp::max, num::NonZeroUsize};
 
 use lru::LruCache;
 
@@ -109,8 +109,14 @@ impl RuntimeInfo {
 	/// Create with more elaborate configuration options.
 	pub fn new_with_config(cfg: Config) -> Self {
 		Self {
-			session_index_cache: LruCache::new(max(10, cfg.session_cache_lru_size)),
-			session_info_cache: LruCache::new(cfg.session_cache_lru_size),
+			session_index_cache: LruCache::new(
+				NonZeroUsize::new(max(10, cfg.session_cache_lru_size))
+					.expect("Session index cache size should not be 0."),
+			),
+			session_info_cache: LruCache::new(
+				NonZeroUsize::new(cfg.session_cache_lru_size)
+					.expect("Session info cache size should not be 0."),
+			),
 			keystore: cfg.keystore,
 		}
 	}