save lock

pacu · Jul 14, 2022 · ce69377 · ce69377
1 parent 5618a2d
commit ce69377
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 18 deletions.
diff --git a/lib/src/commands.rs b/lib/src/commands.rs
@@ -869,7 +869,7 @@ impl Help for SaveCommand {
 impl<P: consensus::Parameters + Send + Sync + 'static> Command<P> for SaveCommand {
     fn exec(&self, _args: &[&str], lightclient: &LightClient<P>) -> String {
         RT.block_on(async move {
-            match lightclient.do_save().await {
+            match lightclient.do_save(true).await {
                 Ok(_) => {
                     let r = object! { "result" => "success" };
                     r.pretty(2)
@@ -1305,7 +1305,7 @@ impl Help for QuitCommand {
 impl<P: consensus::Parameters + Send + Sync + 'static> Command<P> for QuitCommand {
     fn exec(&self, _args: &[&str], lightclient: &LightClient<P>) -> String {
         RT.block_on(async move {
-            match lightclient.do_save().await {
+            match lightclient.do_save(true).await {
                 Ok(_) => "".to_string(),
                 Err(e) => e,
             }

diff --git a/lib/src/lightclient.rs b/lib/src/lightclient.rs
@@ -225,7 +225,7 @@ impl<P: consensus::Parameters + Send + Sync + 'static> LightClient<P> {
             info!("Created LightClient to {}", &config.server);
 
             // Save
-            l.do_save()
+            l.do_save(true)
                 .await
                 .map_err(|s| io::Error::new(ErrorKind::PermissionDenied, s))?;
 
@@ -289,7 +289,9 @@ impl<P: consensus::Parameters + Send + Sync + 'static> LightClient<P> {
                 };
 
                 l.set_wallet_initial_state(birthday).await;
-                l.do_save().await.map_err(|e| Error::new(ErrorKind::InvalidData, e))?;
+                l.do_save(true)
+                    .await
+                    .map_err(|e| Error::new(ErrorKind::InvalidData, e))?;
 
                 info!("Created new wallet!");
 
@@ -472,7 +474,7 @@ impl<P: consensus::Parameters + Send + Sync + 'static> LightClient<P> {
         }
     }
 
-    pub async fn do_save(&self) -> Result<(), String> {
+    pub async fn do_save(&self, grab_lock: bool) -> Result<(), String> {
         // On mobile platforms, disable the save, because the saves will be handled by the native layer, and not in rust
         if cfg!(all(not(target_os = "ios"), not(target_os = "android"))) {
             // If the wallet is encrypted but unlocked, lock it again.
@@ -491,7 +493,11 @@ impl<P: consensus::Parameters + Send + Sync + 'static> LightClient<P> {
 
             {
                 // Prevent any overlapping syncs during save, and don't save in the middle of a sync
-                let _lock = self.sync_lock.lock().await;
+                let _lock = if (grab_lock) {
+                    Some(self.sync_lock.lock().await)
+                } else {
+                    None
+                };
 
                 let mut wallet_bytes = vec![];
                 match self.wallet.write(&mut wallet_bytes).await {
@@ -929,7 +935,7 @@ impl<P: consensus::Parameters + Send + Sync + 'static> LightClient<P> {
             addr
         };
 
-        self.do_save().await?;
+        self.do_save(true).await?;
 
         Ok(array![new_address])
     }
@@ -964,7 +970,7 @@ impl<P: consensus::Parameters + Send + Sync + 'static> LightClient<P> {
             return Err(e);
         }
 
-        self.do_save().await?;
+        self.do_save(true).await?;
         Ok(array![address])
     }
 
@@ -986,7 +992,7 @@ impl<P: consensus::Parameters + Send + Sync + 'static> LightClient<P> {
             addr
         };
 
-        self.do_save().await?;
+        self.do_save(true).await?;
 
         Ok(array![new_address])
     }
@@ -1009,7 +1015,7 @@ impl<P: consensus::Parameters + Send + Sync + 'static> LightClient<P> {
             addr
         };
 
-        self.do_save().await?;
+        self.do_save(true).await?;
 
         Ok(array![new_address])
     }
@@ -1037,7 +1043,7 @@ impl<P: consensus::Parameters + Send + Sync + 'static> LightClient<P> {
         let response = self.do_sync(true).await;
 
         if response.is_ok() {
-            self.do_save().await?;
+            self.do_save(true).await?;
         }
 
         info!("Rescan finished");
@@ -1238,6 +1244,10 @@ impl<P: consensus::Parameters + Send + Sync + 'static> LightClient<P> {
     /// Start syncing in batches with the max size, so we don't consume memory more than
     // wha twe can handle.
     async fn start_sync(&self) -> Result<JsonValue, String> {
+        // We can only do one sync at a time because we sync blocks in serial order
+        // If we allow multiple syncs, they'll all get jumbled up.
+        let _lock = self.sync_lock.lock().await;
+
         // The top of the wallet
         let last_scanned_height = self.wallet.last_scanned_height().await;
 
@@ -1293,14 +1303,9 @@ impl<P: consensus::Parameters + Send + Sync + 'static> LightClient<P> {
 
         let mut res = Err("No batches were run!".to_string());
         for (batch_num, batch_latest_block) in latest_block_batches.into_iter().enumerate() {
-            {
-                // We can only do one sync at a time because we sync blocks in serial order
-                // If we allow multiple syncs, they'll all get jumbled up.
-                let _lock = self.sync_lock.lock().await;
-                res = self.start_sync_batch(batch_latest_block, batch_num).await;
-            }
+            res = self.start_sync_batch(batch_latest_block, batch_num).await;
 
-            self.do_save().await?;
+            self.do_save(false).await?;
             if res.is_err() {
                 return res;
             }