starknet_patricia_storage: change cache size to u64

Author: nimrod-starkware

crates/apollo_committer_config/src/config.rs

@@ -11,7 +11,7 @@ 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>;
 

crates/starknet_committer_cli/src/args.rs

@@ -1,5 +1,4 @@
 use std::fs;
-use std::num::NonZeroUsize;
 use std::path::Path;
 use std::sync::LazyLock;
 
@@ -219,7 +218,7 @@ pub struct CachedStorageArgs<InnerStorageArgs: StorageFromArgs> {
 
     /// The size of the cache.
     #[clap(long, default_value = "1000000")]
-    pub cache_size: usize,
+    pub cache_size: u64,
 }
 
 #[async_trait]

crates/starknet_patricia_storage/src/map_storage.rs

@@ -1,6 +1,5 @@
 use std::collections::BTreeMap;
 use std::fmt::Display;
-use std::num::NonZeroUsize;
 
 use apollo_config::dumping::{prepend_sub_config_name, ser_param, SerializeConfig};
 use apollo_config::{ParamPath, ParamPrivacyInput, SerializedParam};
@@ -23,7 +22,7 @@ use crate::storage_trait::{
 };
 
 // 1M entries.
-const DEFAULT_CACHE_SIZE: usize = 1000000;
+const DEFAULT_CACHE_SIZE: u64 = 1000000;
 
 #[derive(Debug, Default, PartialEq, Serialize)]
 pub struct MapStorage(pub DbHashMap);
@@ -85,7 +84,7 @@ pub struct CachedStorage<S: Storage> {
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
 pub struct CachedStorageConfig<InnerStorageConfig: StorageConfigTrait> {
     // 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,
@@ -100,7 +99,7 @@ pub struct CachedStorageConfig<InnerStorageConfig: StorageConfigTrait> {
 impl<InnerStorageConfig: StorageConfigTrait> Default for CachedStorageConfig<InnerStorageConfig> {
     fn default() -> Self {
         Self {
-            cache_size: NonZeroUsize::new(DEFAULT_CACHE_SIZE).unwrap(),
+            cache_size: DEFAULT_CACHE_SIZE,
             cache_on_write: true,
             include_inner_stats: true,
             inner_storage_config: InnerStorageConfig::default(),
@@ -203,9 +202,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, EmptyStorageConfig, 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,
         inner_storage_config: EmptyStorageConfig::default(),