refactor: RemoveIdentityError

src/dfx-core/src/error/identity/create_new_identity.rs

@@ -1,6 +1,7 @@
 use crate::error::fs::FsError;
 use crate::error::identity::convert_mnemonic_to_key::ConvertMnemonicToKeyError;
 use crate::error::identity::generate_key::GenerateKeyError;
+use crate::error::identity::remove_identity::RemoveIdentityError;
 use crate::error::identity::save_pem::SavePemError;
 use crate::error::identity::IdentityError;
 use thiserror::Error;
@@ -38,7 +39,7 @@ pub enum CreateNewIdentityError {
     LoadPemFromFileFailed(IdentityError),
 
     #[error("Failed to remove identity: {0}")]
-    RemoveIdentityFailed(IdentityError),
+    RemoveIdentityFailed(RemoveIdentityError),
 
     #[error("Failed to rename temporary directory to permanent identity directory: {0}")]
     RenameTemporaryIdentityDirectoryFailed(FsError),

src/dfx-core/src/error/identity/mod.rs

@@ -5,6 +5,7 @@ pub mod generate_key;
 pub mod get_legacy_credentials_pem_path;
 pub mod initialize_identity_manager;
 pub mod new_identity_manager;
+pub mod remove_identity;
 pub mod rename_identity;
 pub mod save_pem;
 pub mod write_pem_to_file;
@@ -23,21 +24,9 @@ use thiserror::Error;
 
 #[derive(Error, Debug)]
 pub enum IdentityError {
-    #[error("Cannot delete the default identity.")]
-    CannotDeleteDefaultIdentity(),
-
-    #[error("Cannot delete the anonymous identity.")]
-    CannotDeleteAnonymousIdentity(),
-
     #[error("Failed to decrypt PEM file: {0}")]
     DecryptPemFileFailed(PathBuf, EncryptionError),
 
-    #[error("Failed to display linked wallets: {0}")]
-    DisplayLinkedWalletsFailed(WalletConfigError),
-
-    #[error("If you want to remove an identity with configured wallets, please use the --drop-wallets flag.")]
-    DropWalletsFlagRequiredToRemoveIdentityWithWallets(),
-
     #[error("Failed to ensure identity configuration directory exists: {0}")]
     EnsureIdentityConfigurationDirExistsFailed(FsError),
 
@@ -74,15 +63,6 @@ pub enum IdentityError {
     #[error("Failed to read pem file: {0}")]
     ReadPemFileFailed(FsError),
 
-    #[error("Failed to remove identity directory: {0}")]
-    RemoveIdentityDirectoryFailed(FsError),
-
-    #[error("Failed to remove identity from keyring: {0}")]
-    RemoveIdentityFromKeyringFailed(KeyringError),
-
-    #[error("Failed to remove identity file: {0}")]
-    RemoveIdentityFileFailed(FsError),
-
     #[error("Failed to rename '{0}' to '{1}' in the global wallet config: {2}")]
     RenameWalletFailed(Box<String>, Box<String>, WalletConfigError),
 

src/dfx-core/src/error/identity/remove_identity.rs

@@ -0,0 +1,32 @@
+use crate::error::fs::FsError;
+use crate::error::identity::IdentityError;
+use crate::error::keyring::KeyringError;
+use crate::error::wallet_config::WalletConfigError;
+use thiserror::Error;
+
+#[derive(Error, Debug)]
+pub enum RemoveIdentityError {
+    #[error("Cannot delete the anonymous identity.")]
+    CannotDeleteAnonymousIdentity(),
+
+    #[error("Cannot delete the default identity.")]
+    CannotDeleteDefaultIdentity(),
+
+    #[error("Failed to display linked wallets: {0}")]
+    DisplayLinkedWalletsFailed(WalletConfigError),
+
+    #[error("If you want to remove an identity with configured wallets, please use the --drop-wallets flag.")]
+    DropWalletsFlagRequiredToRemoveIdentityWithWallets(),
+
+    #[error("Failed to remove identity directory: {0}")]
+    RemoveIdentityDirectoryFailed(FsError),
+
+    #[error("Failed to remove identity file: {0}")]
+    RemoveIdentityFileFailed(FsError),
+
+    #[error("Failed to remove identity from keyring: {0}")]
+    RemoveIdentityFromKeyringFailed(KeyringError),
+
+    #[error("Identity must exist: {0}")]
+    RequireIdentityExistsFailed(IdentityError),
+}

src/dfx-core/src/identity/identity_manager.rs

@@ -26,17 +26,20 @@ use crate::error::identity::initialize_identity_manager::InitializeIdentityManag
 };
 use crate::error::identity::new_identity_manager::NewIdentityManagerError;
 use crate::error::identity::new_identity_manager::NewIdentityManagerError::LoadIdentityManagerConfigurationFailed;
+use crate::error::identity::remove_identity::RemoveIdentityError;
+use crate::error::identity::remove_identity::RemoveIdentityError::{
+    DisplayLinkedWalletsFailed, DropWalletsFlagRequiredToRemoveIdentityWithWallets,
+    RemoveIdentityDirectoryFailed, RemoveIdentityFileFailed,
+};
 use crate::error::identity::rename_identity::RenameIdentityError;
 use crate::error::identity::rename_identity::RenameIdentityError::{
     GetIdentityConfigFailed, LoadPemFailed, MapWalletsToRenamedIdentityFailed,
     RenameIdentityDirectoryFailed, SavePemFailed, SwitchDefaultIdentitySettingsFailed,
 };
 use crate::error::identity::IdentityError;
 use crate::error::identity::IdentityError::{
-    DisplayLinkedWalletsFailed, DropWalletsFlagRequiredToRemoveIdentityWithWallets,
     EnsureIdentityConfigurationDirExistsFailed, GenerateFreshEncryptionConfigurationFailed,
-    GetIdentityPrincipalFailed, LoadIdentityConfigurationFailed, RemoveIdentityDirectoryFailed,
-    RemoveIdentityFileFailed, RemoveIdentityFromKeyringFailed, SaveIdentityConfigurationFailed,
+    GetIdentityPrincipalFailed, LoadIdentityConfigurationFailed, SaveIdentityConfigurationFailed,
 };
 use crate::error::structured_file::StructuredFileError;
 use crate::foundation::get_user_home;
@@ -478,15 +481,16 @@ impl IdentityManager {
         name: &str,
         drop_wallets: bool,
         display_linked_wallets_to: Option<&Logger>,
-    ) -> Result<(), IdentityError> {
-        self.require_identity_exists(log, name)?;
+    ) -> Result<(), RemoveIdentityError> {
+        self.require_identity_exists(log, name)
+            .map_err(RemoveIdentityError::RequireIdentityExistsFailed)?;
 
         if name == ANONYMOUS_IDENTITY_NAME {
-            return Err(IdentityError::CannotDeleteAnonymousIdentity());
+            return Err(RemoveIdentityError::CannotDeleteAnonymousIdentity());
         }
 
         if self.configuration.default == name {
-            return Err(IdentityError::CannotDeleteDefaultIdentity());
+            return Err(RemoveIdentityError::CannotDeleteDefaultIdentity());
         }
 
         let wallet_config_file = self.get_persistent_wallet_config_file(name);
@@ -505,7 +509,7 @@ impl IdentityManager {
         if let Ok(config) = self.get_identity_config_or_default(name) {
             if let Some(suffix) = config.keyring_identity_suffix {
                 keyring_mock::delete_pem_from_keyring(&suffix)
-                    .map_err(RemoveIdentityFromKeyringFailed)?;
+                    .map_err(RemoveIdentityError::RemoveIdentityFromKeyringFailed)?;
             }
         }
         remove_identity_file(&self.get_identity_json_path(name))?;
@@ -758,7 +762,7 @@ pub(super) fn save_identity_configuration(
 }
 
 /// Removes the file if it exists.
-fn remove_identity_file(file: &Path) -> Result<(), IdentityError> {
+fn remove_identity_file(file: &Path) -> Result<(), RemoveIdentityError> {
     if file.exists() {
         crate::fs::remove_file(file).map_err(RemoveIdentityFileFailed)?;
     }