Implement BLOCK_CACHE_SIZE / EXECUTION_STATE_CACHE_SIZE as input parameters (#4621)

## Motivation

Those two variables are constants in the program while varying values
could help.

## Proposal

Add it as parameter inputs.
A creation function has been introduced, which leads to a simplification
of the code.

## Test Plan

The CI.

## Release Plan

The goal is to backport it to testnet conway. But let's first merge in
in the main.

## Links

None.

Author: MathieuDutSik

CLI.md

@@ -186,6 +186,12 @@ Client implementation and command-line tool for the Linera blockchain
 * `--wasm-runtime <WASM_RUNTIME>` — The WebAssembly runtime to use
 * `--tokio-threads <TOKIO_THREADS>` — The number of Tokio worker threads to use
 * `--tokio-blocking-threads <TOKIO_BLOCKING_THREADS>` — The number of Tokio blocking threads to use
+* `--block-cache-size <BLOCK_CACHE_SIZE>` — Size of the block cache (default: 5000)
+
+  Default value: `5000`
+* `--execution-state-cache-size <EXECUTION_STATE_CACHE_SIZE>` — Size of the execution state cache (default: 10000)
+
+  Default value: `10000`
 
 
 

linera-client/src/client_context.rs

@@ -124,7 +124,14 @@ where
     Si: linera_core::environment::Signer,
     W: Persist<Target = Wallet>,
 {
-    pub fn new(storage: S, options: ClientContextOptions, wallet: W, signer: Si) -> Self {
+    pub fn new(
+        storage: S,
+        options: ClientContextOptions,
+        wallet: W,
+        signer: Si,
+        block_cache_size: usize,
+        execution_state_cache_size: usize,
+    ) -> Self {
         #[cfg(not(web))]
         let timing_config = options.to_timing_config();
         let node_provider = NodeProvider::new(NodeOptions {
@@ -151,6 +158,8 @@ where
             name,
             options.chain_worker_ttl,
             options.to_chain_client_options(),
+            block_cache_size,
+            execution_state_cache_size,
         );
 
         #[cfg(not(web))]
@@ -174,7 +183,13 @@ where
     }
 
     #[cfg(with_testing)]
-    pub fn new_test_client_context(storage: S, wallet: W, signer: Si) -> Self {
+    pub fn new_test_client_context(
+        storage: S,
+        wallet: W,
+        signer: Si,
+        block_cache_size: usize,
+        execution_state_cache_size: usize,
+    ) -> Self {
         use linera_core::{client::ChainClientOptions, node::CrossChainMessageDelivery};
 
         let send_recv_timeout = Duration::from_millis(4000);
@@ -208,6 +223,8 @@ where
                 cross_chain_message_delivery: CrossChainMessageDelivery::Blocking,
                 ..ChainClientOptions::test_default()
             },
+            block_cache_size,
+            execution_state_cache_size,
         );
 
         ClientContext {

linera-client/src/unit_tests/chain_listener.rs

@@ -122,6 +122,8 @@ async fn test_chain_listener() -> anyhow::Result<()> {
             format!("Client node for {:.8}", chain_id0),
             Duration::from_secs(30),
             ChainClientOptions::test_default(),
+            5_000,
+            10_000,
         )),
     };
     context
@@ -207,6 +209,8 @@ async fn test_chain_listener_admin_chain() -> anyhow::Result<()> {
             "Client node with no chains".to_string(),
             Duration::from_secs(30),
             ChainClientOptions::test_default(),
+            5_000,
+            10_000,
         )),
     };
     let context = Arc::new(Mutex::new(context));

linera-client/src/unit_tests/wallet.rs

@@ -65,7 +65,8 @@ async fn test_save_wallet_with_pending_blobs() -> anyhow::Result<()> {
         },
         blobs: vec![Blob::new_data(b"blob".to_vec())],
     });
-    let mut context = ClientContext::new_test_client_context(storage, wallet, signer);
+    let mut context =
+        ClientContext::new_test_client_context(storage, wallet, signer, 5_000, 10_000);
     context.save_wallet().await?;
     Ok(())
 }

linera-core/src/client/mod.rs

@@ -211,6 +211,7 @@ pub struct Client<Env: Environment> {
 impl<Env: Environment> Client<Env> {
     /// Creates a new `Client` with a new cache and notifiers.
     #[instrument(level = "trace", skip_all)]
+    #[allow(clippy::too_many_arguments)]
     pub fn new(
         environment: Env,
         admin_id: ChainId,
@@ -219,12 +220,16 @@ impl<Env: Environment> Client<Env> {
         name: impl Into<String>,
         chain_worker_ttl: Duration,
         options: ChainClientOptions,
+        block_cache_size: usize,
+        execution_state_cache_size: usize,
     ) -> Self {
         let tracked_chains = Arc::new(RwLock::new(tracked_chains.into_iter().collect()));
         let state = WorkerState::new_for_client(
             name.into(),
             environment.storage().clone(),
             tracked_chains.clone(),
+            block_cache_size,
+            execution_state_cache_size,
         )
         .with_long_lived_services(long_lived_services)
         .with_allow_inactive_chains(true)

linera-core/src/unit_tests/test_utils.rs

@@ -861,6 +861,8 @@ where
                 format!("Node {}", i),
                 Some(validator_keypair.secret_key),
                 storage.clone(),
+                5_000,
+                10_000,
             )
             .with_allow_inactive_chains(false)
             .with_allow_messages_from_deprecated_epochs(false);
@@ -1047,6 +1049,8 @@ where
             format!("Client node for {:.8}", chain_id),
             Duration::from_secs(30),
             ChainClientOptions::test_default(),
+            5_000,
+            10_000,
         ));
         Ok(client.create_chain_client(
             chain_id,

linera-core/src/unit_tests/worker_tests.rs

@@ -149,6 +149,8 @@ where
             "Single validator node".to_string(),
             Some(validator_keypair.secret_key),
             storage,
+            5_000,
+            10_000,
         )
         .with_allow_inactive_chains(is_client)
         .with_allow_messages_from_deprecated_epochs(is_client)

linera-core/src/worker.rs

@@ -43,9 +43,6 @@ use crate::{
     value_cache::ValueCache,
 };
 
-const BLOCK_CACHE_SIZE: usize = 5_000;
-const EXECUTION_STATE_CACHE_SIZE: usize = 10_000;
-
 #[cfg(test)]
 #[path = "unit_tests/worker_tests.rs"]
 mod worker_tests;
@@ -343,13 +340,15 @@ where
         nickname: String,
         key_pair: Option<ValidatorSecretKey>,
         storage: StorageClient,
+        block_cache_size: usize,
+        execution_state_cache_size: usize,
     ) -> Self {
         WorkerState {
             nickname,
             storage,
             chain_worker_config: ChainWorkerConfig::default().with_key_pair(key_pair),
-            block_cache: Arc::new(ValueCache::new(BLOCK_CACHE_SIZE)),
-            execution_state_cache: Arc::new(ValueCache::new(EXECUTION_STATE_CACHE_SIZE)),
+            block_cache: Arc::new(ValueCache::new(block_cache_size)),
+            execution_state_cache: Arc::new(ValueCache::new(execution_state_cache_size)),
             tracked_chains: None,
             delivery_notifiers: Arc::default(),
             chain_worker_tasks: Arc::default(),
@@ -362,13 +361,15 @@ where
         nickname: String,
         storage: StorageClient,
         tracked_chains: Arc<RwLock<HashSet<ChainId>>>,
+        block_cache_size: usize,
+        execution_state_cache_size: usize,
     ) -> Self {
         WorkerState {
             nickname,
             storage,
             chain_worker_config: ChainWorkerConfig::default(),
-            block_cache: Arc::new(ValueCache::new(BLOCK_CACHE_SIZE)),
-            execution_state_cache: Arc::new(ValueCache::new(EXECUTION_STATE_CACHE_SIZE)),
+            block_cache: Arc::new(ValueCache::new(block_cache_size)),
+            execution_state_cache: Arc::new(ValueCache::new(execution_state_cache_size)),
             tracked_chains: Some(tracked_chains),
             delivery_notifiers: Arc::default(),
             chain_worker_tasks: Arc::default(),

linera-sdk/src/test/validator.rs

@@ -92,6 +92,8 @@ impl TestValidator {
             "Single validator node".to_string(),
             Some(validator_keypair.secret_key.copy()),
             storage.clone(),
+            5_000,
+            10_000,
         );
 
         // Create an admin chain.