linera-client: apply suggestions from code review

linera-client/src/client_context.rs

@@ -402,9 +402,9 @@ where
         service: PathBuf,
     ) -> Result<BytecodeId, Error> {
         info!("Loading bytecode files");
-        let contract_bytecode: Bytecode = Bytecode::load_from_file(&contract).await.context(
-            format!("failed to load contract bytecode from {:?}", &contract),
-        )?;
+        let contract_bytecode: Bytecode = Bytecode::load_from_file(&contract)
+            .await
+            .with_context(|| format!("failed to load contract bytecode from {:?}", &contract))?;
         let service_bytecode = Bytecode::load_from_file(&service).await.context(format!(
             "failed to load service bytecode from {:?}",
             &service

linera-client/src/persistent/indexed_db.rs

@@ -1,28 +1,22 @@
 // Copyright (c) Zefchain Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-use std::ops::Deref;
-
 use indexed_db_futures::prelude::*;
 use wasm_bindgen::JsValue;
 use wasm_bindgen_futures::wasm_bindgen;
 use web_sys::DomException;
 
 use super::LocalPersist;
 
+/// An implementation of [`Persist`] based on an IndexedDB record with a given key.
+#[derive(derive_more::Deref)]
 pub struct IndexedDb<T> {
     key: String,
+    #[deref]
     value: T,
     database: IdbDatabase,
 }
 
-impl<T> Deref for IndexedDb<T> {
-    type Target = T;
-    fn deref(&self) -> &T {
-        &self.value
-    }
-}
-
 const DATABASE_NAME: &str = "linera-client";
 const STORE_NAME: &str = "linera-wallet";
 

linera-client/src/persistent/memory.rs

@@ -14,20 +14,11 @@ pub struct Memory<T> {
     dirty: Dirty,
 }
 
-impl<T> std::ops::DerefMut for Memory<T> {
-    fn deref_mut(&mut self) -> &mut T {
-        // We set `dirty` to aid debugging, though it does nothing for this
-        // implementation.
-        *self.dirty = true;
-        &mut self.value
-    }
-}
-
 impl<T> Memory<T> {
     pub fn new(value: T) -> Self {
         Self {
             value,
-            dirty: Dirty::new(false),
+            dirty: Dirty::new(true),
         }
     }
 }
@@ -36,6 +27,7 @@ impl<T: Send> Persist for Memory<T> {
     type Error = Error;
 
     fn as_mut(&mut self) -> &mut T {
+        *self.dirty = true;
         &mut self.value
     }
 

linera-client/src/persistent/mod.rs

@@ -34,7 +34,7 @@ pub trait LocalPersist: Deref {
     type Error: std::error::Error + Send + Sync + 'static;
 
     /// Gets a mutable reference to the value. This is not expressed as a
-    /// [`DerefMut`](std::ops::DerefMut) bound because it is discouraged to consume this
+    /// [`DerefMut`](std::ops::DerefMut) bound because it is discouraged to use this
     /// function! Instead, use `mutate`.
     fn as_mut(&mut self) -> &mut Self::Target;