runtime_cache_size must always be at least 1

Signed-off-by: koushiro <[email protected]>

client/cli/src/commands/run_cmd.rs

@@ -250,7 +250,7 @@ pub struct RunCmd {
 	pub max_runtime_instances: Option<usize>,
 
 	/// Maximum number of different runtimes that can be cached.
-	#[arg(long, default_value_t = 2)]
+	#[arg(long, default_value_t = 2, value_parser = clap::value_parser!(u8).range(1..))]
 	pub runtime_cache_size: u8,
 
 	/// Run a temporary node.

client/executor/src/wasm_runtime.rs

@@ -180,7 +180,7 @@ impl RuntimeCache {
 	/// for caching.
 	///
 	/// `runtime_cache_size` specifies the number of different runtimes versions preserved in an
-	/// in-memory cache.
+	/// in-memory cache, must always be at least 1.
 	pub fn new(
 		max_runtime_instances: usize,
 		cache_path: Option<PathBuf>,

client/network/src/protocol.rs

@@ -31,6 +31,7 @@ use libp2p::{
 	Multiaddr, PeerId,
 };
 use log::{debug, error, info, log, trace, warn, Level};
+use lru::LruCache;
 use message::{generic::Message as GenericMessage, Message};
 use notifications::{Notifications, NotificationsOut};
 use prometheus_endpoint::{register, Gauge, GaugeVec, Opts, PrometheusError, Registry, U64};
@@ -200,7 +201,7 @@ pub struct Protocol<B: BlockT, Client> {
 	/// The `PeerId`'s of all boot nodes.
 	boot_node_ids: HashSet<PeerId>,
 	/// A cache for the data that was associated to a block announcement.
-	block_announce_data_cache: lru::LruCache<B::Hash, Vec<u8>>,
+	block_announce_data_cache: LruCache<B::Hash, Vec<u8>>,
 }
 
 #[derive(Debug)]
@@ -361,7 +362,7 @@ where
 				network_config.default_peers_set.out_peers as usize,
 		)
 		.expect("cache capacity is not zero");
-		let block_announce_data_cache = lru::LruCache::new(cache_capacity);
+		let block_announce_data_cache = LruCache::new(cache_capacity);
 
 		let protocol = Self {
 			tick_timeout: Box::pin(interval(TICK_TIMEOUT)),

primitives/blockchain/src/header_metadata.rs

@@ -240,9 +240,8 @@ pub struct HeaderMetadataCache<Block: BlockT> {
 
 impl<Block: BlockT> HeaderMetadataCache<Block> {
 	/// Creates a new LRU header metadata cache with `capacity`.
-	pub fn new(capacity: usize) -> Self {
-		let non_zero_cap = NonZeroUsize::new(capacity).expect("capacity is not zero");
-		HeaderMetadataCache { cache: RwLock::new(LruCache::new(non_zero_cap)) }
+	pub fn new(capacity: NonZeroUsize) -> Self {
+		HeaderMetadataCache { cache: RwLock::new(LruCache::new(capacity)) }
 	}
 }