Some needed corrections.

Author: MathieuDutSik

linera-execution/src/lib.rs

@@ -735,8 +735,6 @@ pub trait BaseRuntime {
     /// Asserts the existence of a data blob with the given hash.
     fn assert_data_blob_exists(&mut self, hash: DataBlobHash) -> Result<(), ExecutionError>;
 
-    /// Returns true if the corresponding contract uses a zero amount of storage.
-    fn has_trivial_storage(&mut self, application: ApplicationId) -> Result<bool, ExecutionError>;
 }
 
 pub trait ServiceRuntime: BaseRuntime {
@@ -884,6 +882,9 @@ pub trait ContractRuntime: BaseRuntime {
 
     /// Writes a batch of changes.
     fn write_batch(&mut self, batch: Batch) -> Result<(), ExecutionError>;
+
+    /// Returns true if the corresponding contract uses a zero amount of storage.
+    fn has_trivial_storage(&mut self, application: ApplicationId) -> Result<bool, ExecutionError>;
 }
 
 /// An operation to be executed in a block.

linera-execution/src/runtime.rs

@@ -898,17 +898,6 @@ where
             .recv_response()
     }
 
-    fn has_trivial_storage(&mut self, application: ApplicationId) -> Result<bool, ExecutionError> {
-        let this = self.inner();
-        let (key_size, value_size) = this
-            .execution_state_sender
-            .send_request(move |callback| ExecutionRequest::TotalStorageSize {
-                application,
-                callback,
-            })?
-            .recv_response()?;
-        Ok(key_size + value_size == 0)
-    }
 }
 
 /// An extension trait to determine in compile time the different behaviors between contract and
@@ -1547,6 +1536,18 @@ impl ContractRuntime for ContractSyncRuntimeHandle {
             .recv_response()?;
         Ok(())
     }
+
+    fn has_trivial_storage(&mut self, application: ApplicationId) -> Result<bool, ExecutionError> {
+        let this = self.inner();
+        let (key_size, value_size) = this
+            .execution_state_sender
+            .send_request(move |callback| ExecutionRequest::TotalStorageSize {
+                application,
+                callback,
+            })?
+            .recv_response()?;
+        Ok(key_size + value_size == 0)
+    }
 }
 
 impl ServiceSyncRuntime {

linera-execution/src/wasm/runtime_api.rs

@@ -231,18 +231,6 @@ where
             .map_err(|error| RuntimeError::Custom(error.into()))
     }
 
-    /// Returns true if the corresponding contract uses a non-zero amount of storage.
-    fn has_trivial_storage(
-        caller: &mut Caller,
-        application: ApplicationId,
-    ) -> Result<bool, RuntimeError> {
-        caller
-            .user_data_mut()
-            .runtime
-            .has_trivial_storage(application)
-            .map_err(|error| RuntimeError::Custom(error.into()))
-    }
-
     /// Logs a `message` with the provided information `level`.
     fn log(_caller: &mut Caller, message: String, level: log::Level) {
         match level {
@@ -681,6 +669,18 @@ where
             .write_batch(Batch { operations })
             .map_err(|error| RuntimeError::Custom(error.into()))
     }
+
+    /// Returns true if the corresponding contract uses a zero amount of storage.
+    fn has_trivial_storage(
+        caller: &mut Caller,
+        application: ApplicationId,
+    ) -> Result<bool, RuntimeError> {
+        caller
+            .user_data_mut()
+            .runtime
+            .has_trivial_storage(application)
+            .map_err(|error| RuntimeError::Custom(error.into()))
+    }
 }
 
 /// An implementation of the system API made available to services.

linera-sdk/src/contract/runtime.rs

@@ -165,7 +165,7 @@ where
         base_wit::assert_data_blob_exists(hash.into())
     }
 
-    /// Returns true if the corresponding contract uses a non-zero amount of storage.
+    /// Returns true if the corresponding contract uses a zero amount of storage.
     pub fn has_trivial_storage(&mut self, application: ApplicationId) -> bool {
         base_wit::has_trivial_storage(application.into())
     }