fix: wallet seed_words command is broken (see issue #4363)

applications/tari_console_wallet/src/grpc/wallet_grpc_server.rs

@@ -23,6 +23,7 @@
 use std::{
     convert::{TryFrom, TryInto},
     fs,
+    path::PathBuf,
 };
 
 use clap::Parser;
@@ -1240,47 +1241,38 @@ impl wallet_server::Wallet for WalletGrpcServer {
         }
     }
 
+    /// Returns the contents of a seed words file, provided via CLI
     async fn seed_words(&self, _: Request<tari_rpc::Empty>) -> Result<Response<SeedWordsResponse>, Status> {
         let cli = Cli::parse();
-        let file_path = cli.seed_words_file_name.unwrap();
 
-        if !file_path.is_file() {
-            return Err(Status::not_found("file not found"));
-        }
-
-        let file_name = file_path.clone().into_os_string().into_string().unwrap();
-
-        if file_name.is_empty() {
-            return Err(Status::not_found("seed_words_file_name is empty"));
-        }
+        let filepath: PathBuf = match cli.seed_words_file_name {
+            Some(filepath) => filepath,
+            None => return Err(Status::not_found("file path is empty")),
+        };
 
-        let contents = fs::read_to_string(file_path)?;
-        let words = contents
+        let words = fs::read_to_string(filepath)?
             .split(' ')
             .collect::<Vec<&str>>()
             .iter()
             .map(|&x| x.into())
             .collect::<Vec<String>>();
+
         Ok(Response::new(SeedWordsResponse { words }))
     }
 
+    /// Deletes the seed words file, provided via CLI
     async fn delete_seed_words_file(
         &self,
         _: Request<tari_rpc::Empty>,
     ) -> Result<Response<FileDeletedResponse>, Status> {
         let cli = Cli::parse();
-        let file_path = cli.seed_words_file_name.unwrap();
-
-        if !file_path.is_file() {
-            return Err(Status::not_found("file not found"));
-        }
 
-        let file_name = file_path.clone().into_os_string().into_string().unwrap();
+        // WARNING: the filepath used is supplied as an argument
+        fs::remove_file(match cli.seed_words_file_name {
+            Some(filepath) => filepath,
+            None => return Err(Status::not_found("file path is empty")),
+        })?;
 
-        if file_name.is_empty() {
-            return Err(Status::not_found("seed_words_file_name is empty"));
-        }
-        fs::remove_file(file_path)?;
         Ok(Response::new(FileDeletedResponse {}))
     }
 }

base_layer/wallet/src/wallet.rs

@@ -697,10 +697,10 @@ where
     /// Remove encryption from all the Wallet db backends. If any backends do not have encryption applied then this will
     /// fail
     pub async fn remove_encryption(&mut self) -> Result<(), WalletError> {
-        self.db.remove_encryption().await?;
         self.output_manager_service.remove_encryption().await?;
         self.transaction_service.remove_encryption().await?;
         self.key_manager_service.remove_encryption().await?;
+        self.db.remove_encryption().await?;
         Ok(())
     }