improve RsaParseError

Author: diegomrsantos

anchor/common/ssv_types/src/util.rs

@@ -5,14 +5,23 @@ use thiserror::Error;
 /// Errors that can occur during RSA key parsing
 #[derive(Error, Debug, Clone)]
 pub enum RsaParseError {
-    #[error("Unable to decode base64 PEM data: {0}")]
-    Base64Decode(#[from] base64::DecodeError),
+    #[error("Unable to decode base64 PEM data: {source}")]
+    Base64Decode {
+        #[from]
+        #[source]
+        source: base64::DecodeError,
+    },
 
-    #[error("Unable to convert decoded PEM data into a string: {0}")]
-    Utf8Conversion(#[from] std::string::FromUtf8Error),
+    #[error("Unable to convert decoded PEM data into a string: {source}")]
+    Utf8Conversion {
+        #[from]
+        #[source]
+        source: std::string::FromUtf8Error,
+    },
 
     #[error("Failed to parse RSA public key: {source}")]
     RsaParsing {
+        #[from]
         #[source]
         source: openssl::error::ErrorStack,
     },
@@ -35,8 +44,7 @@ pub fn parse_rsa(pem_data: &str) -> Result<Rsa<Public>, RsaParseError> {
         .replace("-----END RSA PUBLIC KEY-----", "-----END PUBLIC KEY-----");
 
     // Parse the PEM string into an RSA public key using PKCS8 format
-    let rsa_pubkey = Rsa::public_key_from_pem(pem_string.as_bytes())
-        .map_err(|source| RsaParseError::RsaParsing { source })?;
+    let rsa_pubkey = Rsa::public_key_from_pem(pem_string.as_bytes())?;
 
     Ok(rsa_pubkey)
 }