Rename GrpcClientError

8 files changed, 18 insertions, 18 deletions

diff --git a/mullvad-cli/src/cmds/account.rs b/mullvad-cli/src/cmds/account.rs
index 2a26132db1..0dba7600ce 100644
--- a/mullvad-cli/src/cmds/account.rs
+++ b/mullvad-cli/src/cmds/account.rs
@@ -92,7 +92,7 @@ impl Account {
             let expiry = rpc
                 .get_account_data(settings.account_token)
                 .await
-                .map_err(|error| Error::RpcFailed("Failed to fetch account data", error))?
+                .map_err(|error| Error::RpcFailedExt("Failed to fetch account data", error))?
                 .into_inner();
             println!(
                 "Expires at     : {}",
@@ -133,7 +133,7 @@ impl Account {
                     Code::NotFound | Code::ResourceExhausted => {
                         eprintln!("Failed to submit voucher: {}", err.message());
                     }
-                    _ => return Err(Error::GrpcClientError(err)),
+                    _ => return Err(Error::RpcFailed(err)),
                 }
                 std::process::exit(1);
             }
diff --git a/mullvad-cli/src/cmds/bridge.rs b/mullvad-cli/src/cmds/bridge.rs
index eea3216584..9a674069a8 100644
--- a/mullvad-cli/src/cmds/bridge.rs
+++ b/mullvad-cli/src/cmds/bridge.rs
@@ -407,7 +407,7 @@ impl Bridge {
         let mut locations = rpc
             .get_relay_locations(())
             .await
-            .map_err(|error| Error::RpcFailed("Failed to obtain relay locations", error))?
+            .map_err(|error| Error::RpcFailedExt("Failed to obtain relay locations", error))?
             .into_inner();
 
         let mut countries = Vec::new();
diff --git a/mullvad-cli/src/cmds/relay.rs b/mullvad-cli/src/cmds/relay.rs
index 1a1e12b58a..e8783e04f3 100644
--- a/mullvad-cli/src/cmds/relay.rs
+++ b/mullvad-cli/src/cmds/relay.rs
@@ -195,7 +195,7 @@ impl Relay {
         let mut rpc = new_rpc_client().await?;
         rpc.update_relay_settings(update)
             .await
-            .map_err(|error| Error::RpcFailed("Failed to update relay settings", error))?;
+            .map_err(|error| Error::RpcFailedExt("Failed to update relay settings", error))?;
         println!("Relay constraints updated");
         Ok(())
     }
@@ -685,7 +685,7 @@ impl Relay {
         let mut locations = rpc
             .get_relay_locations(())
             .await
-            .map_err(|error| Error::RpcFailed("Failed to obtain relay locations", error))?
+            .map_err(|error| Error::RpcFailedExt("Failed to obtain relay locations", error))?
             .into_inner();
 
         let mut countries = Vec::new();
diff --git a/mullvad-cli/src/cmds/status.rs b/mullvad-cli/src/cmds/status.rs
index 76a4ed2e67..f4e943cb3c 100644
--- a/mullvad-cli/src/cmds/status.rs
+++ b/mullvad-cli/src/cmds/status.rs
@@ -97,7 +97,7 @@ async fn print_location(rpc: &mut ManagementServiceClient) -> Result<()> {
                 println!("Location data unavailable");
                 return Ok(());
             } else {
-                return Err(Error::GrpcClientError(status));
+                return Err(Error::RpcFailed(status));
             }
         }
     };
diff --git a/mullvad-cli/src/cmds/tunnel.rs b/mullvad-cli/src/cmds/tunnel.rs
index 744ca13088..4af0864ddf 100644
--- a/mullvad-cli/src/cmds/tunnel.rs
+++ b/mullvad-cli/src/cmds/tunnel.rs
@@ -187,7 +187,7 @@ impl Tunnel {
                 if status.code() == mullvad_management_interface::Code::NotFound {
                     None
                 } else {
-                    return Err(Error::RpcFailed("Failed to obtain key", status));
+                    return Err(Error::RpcFailedExt("Failed to obtain key", status));
                 }
             }
         };
@@ -205,7 +205,7 @@ impl Tunnel {
         let is_valid = rpc
             .verify_wireguard_key(())
             .await
-            .map_err(|error| Error::RpcFailed("Failed to verify key", error))?
+            .map_err(|error| Error::RpcFailedExt("Failed to verify key", error))?
             .into_inner();
         println!("Key is valid for use with current account: {}", is_valid);
         Ok(())
diff --git a/mullvad-cli/src/cmds/version.rs b/mullvad-cli/src/cmds/version.rs
index cd69ee4bad..08944f921b 100644
--- a/mullvad-cli/src/cmds/version.rs
+++ b/mullvad-cli/src/cmds/version.rs
@@ -18,13 +18,13 @@ impl Command for Version {
         let current_version = rpc
             .get_current_version(())
             .await
-            .map_err(|error| Error::RpcFailed("Failed to obtain current version", error))?
+            .map_err(|error| Error::RpcFailedExt("Failed to obtain current version", error))?
             .into_inner();
         println!("Current version: {}", current_version);
         let version_info = rpc
             .get_version_info(())
             .await
-            .map_err(|error| Error::RpcFailed("Failed to obtain version info", error))?
+            .map_err(|error| Error::RpcFailedExt("Failed to obtain version info", error))?
             .into_inner();
         println!("\tIs supported: {}", version_info.supported);
 
diff --git a/mullvad-cli/src/main.rs b/mullvad-cli/src/main.rs
index ad4a255fcc..20dfae5fc9 100644
--- a/mullvad-cli/src/main.rs
+++ b/mullvad-cli/src/main.rs
@@ -25,11 +25,11 @@ pub enum Error {
     #[error(display = "Management interface error")]
     ManagementInterfaceError(#[error(source)] mullvad_management_interface::Error),
 
-    #[error(display = "The daemon returned an error")]
-    GrpcClientError(#[error(source)] mullvad_management_interface::Status),
+    #[error(display = "RPC failed")]
+    RpcFailed(#[error(source)] mullvad_management_interface::Status),
 
     #[error(display = "RPC failed: {}", _0)]
-    RpcFailed(
+    RpcFailedExt(
         &'static str,
         #[error(source)] mullvad_management_interface::Status,
     ),
@@ -51,10 +51,10 @@ async fn main() {
         Ok(_) => 0,
         Err(error) => {
             match &error {
-                Error::GrpcClientError(status) => {
-                    eprintln!("{:?}: {}", status.code(), status.message())
+                Error::RpcFailed(status) => {
+                    eprintln!("{}: {:?}: {}", error, status.code(), status.message())
                 }
-                Error::RpcFailed(_message, status) => {
+                Error::RpcFailedExt(_message, status) => {
                     eprintln!(
                         "{}\nCaused by: {:?}: {}",
                         error,
diff --git a/mullvad-cli/src/state.rs b/mullvad-cli/src/state.rs
index 9890218545..4cf826214f 100644
--- a/mullvad-cli/src/state.rs
+++ b/mullvad-cli/src/state.rs
@@ -23,7 +23,7 @@ pub fn state_listen(mut rpc: ManagementServiceClient) -> Receiver<Result<TunnelS
                             _ => continue,
                         },
                         Ok(None) => break,
-                        Err(status) => Err(Error::GrpcClientError(status)),
+                        Err(status) => Err(Error::RpcFailed(status)),
                     };
 
                     if let Err(_) = sender.send(forward).await {
@@ -32,7 +32,7 @@ pub fn state_listen(mut rpc: ManagementServiceClient) -> Receiver<Result<TunnelS
                 }
             }
             Err(status) => {
-                let _ = sender.send(Err(Error::GrpcClientError(status))).await;
+                let _ = sender.send(Err(Error::RpcFailed(status))).await;
             }
         }
     });