Fix Trezor device selection in wallet-cli

Author: ImplOfAnImpl

wallet/wallet-cli-commands/src/lib.rs

@@ -1046,7 +1046,7 @@ impl CreateWalletDeviceSelectMenu {
 
 impl ChoiceMenu for CreateWalletDeviceSelectMenu {
     fn header(&self) -> &str {
-        "Please chose one of the available Trezor devices:"
+        "Please choose one of the available Trezor devices:"
     }
 
     fn choice_list(&self) -> Vec<String> {
@@ -1103,7 +1103,7 @@ impl OpenWalletDeviceSelectMenu {
 
 impl ChoiceMenu for OpenWalletDeviceSelectMenu {
     fn header(&self) -> &str {
-        "Please chose one of the available Trezor devices:"
+        "Please choose one of the available Trezor devices:"
     }
 
     fn choice_list(&self) -> Vec<String> {

wallet/wallet-controller/src/lib.rs

@@ -317,10 +317,7 @@ where
             .map(|w| w.map_wallet(RuntimeWallet::Trezor)),
         };
 
-        if res.is_err() {
-            let _ = fs::remove_file(file_path);
-        }
-
+        Self::delete_wallet_file_on_wallet_creation_failure(&res, file_path);
         res
     }
 
@@ -338,10 +335,10 @@ where
             )
         );
 
-        let db = wallet::wallet::open_or_create_wallet_file(file_path)
+        let db = wallet::wallet::open_or_create_wallet_file(file_path.as_ref())
             .map_err(ControllerError::WalletError)?;
 
-        match args {
+        let res = match args {
             WalletTypeArgsComputed::Software {
                 mnemonic,
                 passphrase,
@@ -382,6 +379,31 @@ where
                 .map_err(ControllerError::WalletError)?;
                 Ok(wallet.map_wallet(RuntimeWallet::Trezor))
             }
+        };
+
+        Self::delete_wallet_file_on_wallet_creation_failure(&res, file_path);
+        res
+    }
+
+    /// If wallet creation/recovery didn't succeed (e.g. due to a hard error, or because
+    /// user intervention is required), we must delete the wallet file.
+    fn delete_wallet_file_on_wallet_creation_failure(
+        result: &Result<WalletCreation<RuntimeWallet<DefaultBackend>>, ControllerError<N>>,
+        file_path: impl AsRef<Path>,
+    ) {
+        let must_remove_wallet_file = match result {
+            Err(_) => true,
+            Ok(wallet_creation) => match wallet_creation {
+                // Wallet was created successfully.
+                WalletCreation::Wallet(_) => false,
+                // Wallet was not created successfully. The caller will need to handle this result
+                // and either fail or try again.
+                WalletCreation::MultipleAvailableTrezorDevices(_) => true,
+            },
+        };
+
+        if must_remove_wallet_file {
+            let _ = fs::remove_file(file_path);
         }
     }