linera-execution: remove unnecessary Arc

Author: Twey

Cargo.lock

@@ -71,6 +71,7 @@ custom_debug_derive = "0.6.1"
 dashmap = "5.5.3"
 derive_more = "1.0.0"
 dirs = "5.0.1"
+dyn-clone = "1.0.17"
 ed25519-dalek = { version = "2.1.1", features = ["batch", "serde"] }
 either = "1.10.0"
 ethers = { version = "2.0.14", features = ["solc"] }

Cargo.toml

@@ -3,7 +3,7 @@
 
 #![allow(clippy::large_futures)]
 
-use std::{collections::BTreeMap, iter, sync::Arc};
+use std::{collections::BTreeMap, iter};
 
 use assert_matches::assert_matches;
 use linera_base::{
@@ -184,11 +184,11 @@ async fn test_application_permissions() {
     // Create a mock application.
     let app_description = make_app_description();
     let application_id = ApplicationId::from(&app_description);
-    let application = Arc::new(MockApplication::default());
+    let application = MockApplication::default();
     let extra = &chain.context().extra();
     extra
         .user_contracts()
-        .insert(application_id, application.clone());
+        .insert(application_id, application.clone().into());
     let contract_blob = Blob::new_contract_bytecode(Bytecode::new(b"contract".into()).compress());
     extra.add_blob(contract_blob);
     let service_blob = Blob::new_service_bytecode(Bytecode::new(b"service".into()).compress());

examples/Cargo.lock

@@ -10,7 +10,7 @@
 #![allow(clippy::large_futures)]
 #![cfg(any(feature = "wasmer", feature = "wasmtime"))]
 
-use std::{borrow::Cow, sync::Arc};
+use std::borrow::Cow;
 
 use linera_base::{
     crypto::KeyPair,
@@ -125,7 +125,7 @@ where
     let service_blob_hash = service_blob_id.hash;
 
     let bytecode_id = BytecodeId::new(contract_blob_hash, service_blob_hash);
-    let contract = Arc::new(WasmContractModule::new(contract_bytecode, wasm_runtime).await?);
+    let contract = WasmContractModule::new(contract_bytecode, wasm_runtime).await?;
 
     // Publish some bytecode.
     let publish_operation = SystemOperation::PublishBytecode { bytecode_id };
@@ -211,7 +211,7 @@ where
     let mut creator_state = creator_system_state.into_view().await;
     creator_state
         .simulate_instantiation(
-            contract,
+            contract.into(),
             Timestamp::from(2),
             application_description,
             initial_value_bytes.clone(),

linera-chain/src/unit_tests/chain_tests.rs

@@ -43,6 +43,7 @@ clap.workspace = true
 custom_debug_derive.workspace = true
 dashmap.workspace = true
 derive_more = { workspace = true, features = ["display"] }
+dyn-clone.workspace = true
 futures.workspace = true
 linera-base.workspace = true
 linera-views.workspace = true

linera-core/src/unit_tests/wasm_worker_tests.rs

@@ -81,33 +81,49 @@ const MAX_EVENT_KEY_LEN: usize = 64;
 const MAX_STREAM_NAME_LEN: usize = 64;
 
 /// An implementation of [`UserContractModule`].
-pub type UserContractCode = Arc<dyn UserContractModule + Send + Sync + 'static>;
+pub type UserContractCode = Box<dyn UserContractModule + Send + Sync>;
 
 /// An implementation of [`UserServiceModule`].
-pub type UserServiceCode = Arc<dyn UserServiceModule + Send + Sync + 'static>;
+pub type UserServiceCode = Box<dyn UserServiceModule + Send + Sync>;
 
 /// An implementation of [`UserContract`].
-pub type UserContractInstance = Box<dyn UserContract + 'static>;
+pub type UserContractInstance = Box<dyn UserContract>;
 
 /// An implementation of [`UserService`].
-pub type UserServiceInstance = Box<dyn UserService + 'static>;
+pub type UserServiceInstance = Box<dyn UserService>;
 
 /// A factory trait to obtain a [`UserContract`] from a [`UserContractModule`]
-pub trait UserContractModule {
+pub trait UserContractModule: dyn_clone::DynClone {
     fn instantiate(
         &self,
         runtime: ContractSyncRuntimeHandle,
     ) -> Result<UserContractInstance, ExecutionError>;
 }
 
+impl<T: UserContractModule + Send + Sync + 'static> From<T> for UserContractCode {
+    fn from(module: T) -> Self {
+        Box::new(module)
+    }
+}
+
+dyn_clone::clone_trait_object!(UserContractModule);
+
 /// A factory trait to obtain a [`UserService`] from a [`UserServiceModule`]
-pub trait UserServiceModule {
+pub trait UserServiceModule: dyn_clone::DynClone {
     fn instantiate(
         &self,
         runtime: ServiceSyncRuntimeHandle,
     ) -> Result<UserServiceInstance, ExecutionError>;
 }
 
+impl<T: UserServiceModule + Send + Sync + 'static> From<T> for UserServiceCode {
+    fn from(module: T) -> Self {
+        Box::new(module)
+    }
+}
+
+dyn_clone::clone_trait_object!(UserServiceModule);
+
 /// A type for errors happening during execution.
 #[derive(Error, Debug)]
 pub enum ExecutionError {

linera-execution/Cargo.toml

@@ -75,10 +75,10 @@ where
     for (id, mock_application) in &mock_applications {
         extra
             .user_contracts()
-            .insert(*id, Arc::new(mock_application.clone()));
+            .insert(*id, mock_application.clone().into());
         extra
             .user_services()
-            .insert(*id, Arc::new(mock_application.clone()));
+            .insert(*id, mock_application.clone().into());
     }
 
     Ok(mock_applications.into_iter())

linera-execution/src/lib.rs

@@ -53,14 +53,14 @@ async fn test_fuel_for_counter_wasm_application(
     view.context()
         .extra()
         .user_contracts()
-        .insert(app_id, Arc::new(contract));
+        .insert(app_id, contract.into());
 
     let service =
         WasmServiceModule::from_file("tests/fixtures/counter_service.wasm", wasm_runtime).await?;
     view.context()
         .extra()
         .user_services()
-        .insert(app_id, Arc::new(service));
+        .insert(app_id, service.into());
 
     let app_id = app_id.with_abi::<CounterAbi>();
 

linera-execution/src/test_utils/mod.rs

@@ -301,9 +301,9 @@ pub trait Storage: Sized {
         let contract_bytecode =
             linera_base::task::spawn_blocking(move || compressed_contract_bytecode.decompress())
                 .await??;
-        Ok(Arc::new(
-            WasmContractModule::new(contract_bytecode, wasm_runtime).await?,
-        ))
+        Ok(WasmContractModule::new(contract_bytecode, wasm_runtime)
+            .await?
+            .into())
     }
 
     #[cfg(not(with_wasm_runtime))]
@@ -340,9 +340,9 @@ pub trait Storage: Sized {
         let service_bytecode =
             linera_base::task::spawn_blocking(move || compressed_service_bytecode.decompress())
                 .await??;
-        Ok(Arc::new(
-            WasmServiceModule::new(service_bytecode, wasm_runtime).await?,
-        ))
+        Ok(WasmServiceModule::new(service_bytecode, wasm_runtime)
+            .await?
+            .into())
     }
 
     #[cfg(not(with_wasm_runtime))]