starknet_patricia_storage: change cache size to u64

Author: nimrod-starkware

crates/apollo_committer_config/src/config.rs

@@ -1,5 +1,4 @@
 use std::collections::BTreeMap;
-use std::num::NonZeroUsize;
 use std::path::PathBuf;
 
 use apollo_config::dumping::{prepend_sub_config_name, ser_param, SerializeConfig};
@@ -12,14 +11,14 @@ use starknet_patricia_storage::storage_trait::{Storage, StorageConfigTrait};
 use validator::Validate;
 
 // 1M size cache.
-pub const DEFAULT_CACHE_MAX_ENTRIES: usize = 1000000;
+pub const DEFAULT_CACHE_MAX_ENTRIES: u64 = 1000000;
 
 pub type ApolloStorage = CachedStorage<RocksDbStorage>;
 
 pub type ApolloCommitterConfig = CommitterConfig<<ApolloStorage as Storage>::Config>;
 
 pub const APOLLO_CACHE_STORAGE_CONFIG: CachedStorageConfig = CachedStorageConfig {
-    cache_size: NonZeroUsize::new(DEFAULT_CACHE_MAX_ENTRIES).unwrap(),
+    cache_size: DEFAULT_CACHE_MAX_ENTRIES,
     cache_on_write: true,
     include_inner_stats: true,
 };

crates/starknet_committer_cli/src/args.rs

@@ -1,6 +1,5 @@
 use std::fs;
 use std::future::Future;
-use std::num::NonZeroUsize;
 use std::path::Path;
 use std::sync::LazyLock;
 
@@ -212,7 +211,7 @@ pub struct CachedStorageArgs<A: StorageFromArgs> {
 
     /// The size of the cache.
     #[clap(long, default_value = "1000000")]
-    pub cache_size: usize,
+    pub cache_size: u64,
 }
 
 impl<A: StorageFromArgs + Sync> StorageFromArgs for CachedStorageArgs<A> {
@@ -222,8 +221,8 @@ impl<A: StorageFromArgs + Sync> StorageFromArgs for CachedStorageArgs<A> {
 }
 
 impl<A: StorageFromArgs> CachedStorageArgs<A> {
-    pub fn cache_size(&self) -> NonZeroUsize {
-        NonZeroUsize::new(self.cache_size).unwrap()
+    pub fn cache_size(&self) -> u64 {
+        self.cache_size
     }
 
     pub fn cached_storage_config(&self) -> CachedStorageConfig {

crates/starknet_patricia_storage/src/map_storage.rs

@@ -1,5 +1,4 @@
 use std::fmt::Display;
-use std::num::NonZeroUsize;
 
 use moka::sync::Cache;
 use serde::Serialize;
@@ -76,7 +75,7 @@ pub struct CachedStorage<S: Storage> {
 
 pub struct CachedStorageConfig {
     // Max number of entries in the cache.
-    pub cache_size: NonZeroUsize, // TODO(Nimrod): Change type to `u64`.
+    pub cache_size: u64,
 
     // If true, the cache is updated on write operations even if the value is not in the cache.
     pub cache_on_write: bool,
@@ -135,9 +134,7 @@ impl<S: Storage> CachedStorage<S> {
         // TODO(Nimrod): Consider defining custom eviction policies.
         Self {
             storage,
-            cache: Cache::builder()
-                .max_capacity(config.cache_size.get().try_into().unwrap())
-                .build(),
+            cache: Cache::builder().max_capacity(config.cache_size).build(),
             cache_on_write: config.cache_on_write,
             reads: 0,
             cached_reads: 0,

crates/starknet_patricia_storage/src/map_storage_test.rs

@@ -1,5 +1,4 @@
 use std::collections::HashMap;
-use std::num::NonZeroUsize;
 
 use rstest::rstest;
 
@@ -10,7 +9,7 @@ use crate::storage_trait::{DbKey, DbValue, Storage};
 #[case::map_storage(MapStorage::default())]
 #[case::cached_storage(
     CachedStorage::new(MapStorage::default(), CachedStorageConfig {
-        cache_size: NonZeroUsize::new(2).unwrap(),
+        cache_size: 2,
         cache_on_write: true,
         include_inner_stats: false,
     })