authority-client: properly convert tonic::Status to SuiError

ngerald51 · May 3, 2022 · 9c689eb · 9c689eb
1 parent cdddf1f
commit 9c689eb
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 42 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/sui_core/src/authority_client.rs b/sui_core/src/authority_client.rs
@@ -113,12 +113,7 @@ impl AuthorityAPI for NetworkAuthorityClient {
         transaction: Transaction,
     ) -> Result<TransactionInfoResponse, SuiError> {
         let request = BincodeEncodedPayload::try_from(&transaction).unwrap();
-        let response = self
-            .client()
-            .transaction(request)
-            .await
-            .map_err(|_| SuiError::UnexpectedMessage)?
-            .into_inner();
+        let response = self.client().transaction(request).await?.into_inner();
 
         response
             .deserialize()
@@ -134,8 +129,7 @@ impl AuthorityAPI for NetworkAuthorityClient {
         let response = self
             .client()
             .confirmation_transaction(request)
-            .await
-            .map_err(|_| SuiError::UnexpectedMessage)?
+            .await?
             .into_inner();
 
         response
@@ -151,10 +145,7 @@ impl AuthorityAPI for NetworkAuthorityClient {
         let response = self
             .client()
             .consensus_transaction(request)
-            .await
-            .map_err(|e| SuiError::GenericAuthorityError {
-                error: e.to_string(),
-            })?
+            .await?
             .into_inner();
 
         response
@@ -169,12 +160,7 @@ impl AuthorityAPI for NetworkAuthorityClient {
         request: AccountInfoRequest,
     ) -> Result<AccountInfoResponse, SuiError> {
         let request = BincodeEncodedPayload::try_from(&request).unwrap();
-        let response = self
-            .client()
-            .account_info(request)
-            .await
-            .map_err(|_| SuiError::UnexpectedMessage)?
-            .into_inner();
+        let response = self.client().account_info(request).await?.into_inner();
 
         response
             .deserialize()
@@ -186,12 +172,7 @@ impl AuthorityAPI for NetworkAuthorityClient {
         request: ObjectInfoRequest,
     ) -> Result<ObjectInfoResponse, SuiError> {
         let request = BincodeEncodedPayload::try_from(&request).unwrap();
-        let response = self
-            .client()
-            .object_info(request)
-            .await
-            .map_err(|_| SuiError::UnexpectedMessage)?
-            .into_inner();
+        let response = self.client().object_info(request).await?.into_inner();
 
         response
             .deserialize()
@@ -204,12 +185,7 @@ impl AuthorityAPI for NetworkAuthorityClient {
         request: TransactionInfoRequest,
     ) -> Result<TransactionInfoResponse, SuiError> {
         let request = BincodeEncodedPayload::try_from(&request).unwrap();
-        let response = self
-            .client()
-            .transaction_info(request)
-            .await
-            .map_err(|_| SuiError::UnexpectedMessage)?
-            .into_inner();
+        let response = self.client().transaction_info(request).await?.into_inner();
 
         response
             .deserialize()
@@ -222,14 +198,7 @@ impl AuthorityAPI for NetworkAuthorityClient {
         request: BatchInfoRequest,
     ) -> Result<BatchInfoResponseItemStream, SuiError> {
         let request = BincodeEncodedPayload::try_from(&request).unwrap();
-        let response_stream = self
-            .client()
-            .batch_info(request)
-            .await
-            .map_err(|e| SuiError::GenericAuthorityError {
-                error: format!("Batch error: {}", e),
-            })?
-            .into_inner();
+        let response_stream = self.client().batch_info(request).await?.into_inner();
 
         let stream = response_stream
             .map_err(|_| SuiError::UnexpectedMessage)

diff --git a/sui_core/tests/staged/sui.yaml b/sui_core/tests/staged/sui.yaml
@@ -740,6 +740,9 @@ SuiError:
     101:
       SignatureKeyGenError:
         NEWTYPE: STR
+    102:
+      RpcError:
+        NEWTYPE: STR
 TransactionData:
   STRUCT:
     - kind:

diff --git a/sui_types/Cargo.toml b/sui_types/Cargo.toml
@@ -32,6 +32,7 @@ zeroize = "1.5.4"
 hkdf = "0.12.3"
 digest = "0.10.3"
 schemars ="0.8.8"
+tonic = "0.7"
 
 name_variant = { git = "https://github.com/MystenLabs/mysten-infra", rev = "97a056f85555fa2afe497d6abb7cf6bf8faa63cf" }
 typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "d2976a45420147ad821baae96e6fe4b12215f743" }

diff --git a/sui_types/src/error.rs b/sui_types/src/error.rs
@@ -2,11 +2,9 @@
 // Copyright (c) 2022, Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::base_types::*;
-use crate::committee::EpochId;
+use crate::{base_types::*, committee::EpochId};
 use move_binary_format::errors::{PartialVMError, VMError};
-use narwhal_executor::ExecutionStateError;
-use narwhal_executor::SubscriberError;
+use narwhal_executor::{ExecutionStateError, SubscriberError};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use std::fmt::Debug;
@@ -316,6 +314,11 @@ pub enum SuiError {
     HkdfError(String),
     #[error("Signature key generation error: {0}")]
     SignatureKeyGenError(String),
+
+    // These are errors that occur when an RPC fails and is simply the utf8 message sent in a
+    // Tonic::Status
+    #[error("{0}")]
+    RpcError(String),
 }
 
 pub type SuiResult<T = ()> = Result<T, SuiError>;
@@ -343,6 +346,12 @@ impl std::convert::From<SubscriberError> for SuiError {
     }
 }
 
+impl From<tonic::Status> for SuiError {
+    fn from(status: tonic::Status) -> Self {
+        Self::RpcError(status.message().to_owned())
+    }
+}
+
 impl ExecutionStateError for SuiError {
     fn node_error(&self) -> bool {
         matches!(