Factor out common parts of MegolmDecryptionError construction

Author: richvdh

src/error.rs

@@ -1,7 +1,7 @@
 //! Errors related to room event decryption.
 
 use js_sys::JsString;
-use matrix_sdk_common::deserialized_responses::VerificationLevel;
+use matrix_sdk_common::deserialized_responses::{VerificationLevel, WithheldCode};
 use matrix_sdk_crypto::{vodozemac, MegolmError};
 use wasm_bindgen::prelude::wasm_bindgen;
 
@@ -55,52 +55,34 @@ impl MegolmDecryptionError {
 
 impl From<MegolmError> for MegolmDecryptionError {
     fn from(value: MegolmError) -> Self {
+        let decryption_error = |code: DecryptionErrorCode,
+                                maybe_withheld: Option<&WithheldCode>|
+         -> MegolmDecryptionError {
+            let description = value.to_string().into();
+            let maybe_withheld = maybe_withheld.map(|code| code.to_string().to_owned().into());
+            MegolmDecryptionError { code, description, maybe_withheld }
+        };
+
         match &value {
-            MegolmError::MissingRoomKey(withheld_code) => MegolmDecryptionError {
-                code: DecryptionErrorCode::MissingRoomKey,
-                description: value.to_string().into(),
-                maybe_withheld: withheld_code
-                    .as_ref()
-                    .map(|code| code.to_string().to_owned().into()),
-            },
+            MegolmError::MissingRoomKey(withheld_code) => {
+                decryption_error(DecryptionErrorCode::MissingRoomKey, withheld_code.as_ref())
+            }
             MegolmError::Decryption(vodozemac::megolm::DecryptionError::UnknownMessageIndex(
                 ..,
-            )) => MegolmDecryptionError {
-                code: DecryptionErrorCode::UnknownMessageIndex,
-                description: value.to_string().into(),
-                maybe_withheld: None,
-            },
-            MegolmError::MismatchedIdentityKeys { .. } => MegolmDecryptionError {
-                code: DecryptionErrorCode::UnknownMessageIndex,
-                description: value.to_string().into(),
-                maybe_withheld: None,
-            },
+            )) => decryption_error(DecryptionErrorCode::UnknownMessageIndex, None),
+            MegolmError::MismatchedIdentityKeys { .. } => {
+                decryption_error(DecryptionErrorCode::UnknownMessageIndex, None)
+            }
             MegolmError::SenderIdentityNotTrusted(VerificationLevel::VerificationViolation) => {
-                MegolmDecryptionError {
-                    code: DecryptionErrorCode::SenderIdentityVerificationViolation,
-                    description: value.to_string().into(),
-                    maybe_withheld: None,
-                }
+                decryption_error(DecryptionErrorCode::SenderIdentityVerificationViolation, None)
             }
             MegolmError::SenderIdentityNotTrusted(VerificationLevel::UnsignedDevice) => {
-                MegolmDecryptionError {
-                    code: DecryptionErrorCode::UnsignedSenderDevice,
-                    description: value.to_string().into(),
-                    maybe_withheld: None,
-                }
+                decryption_error(DecryptionErrorCode::UnsignedSenderDevice, None)
             }
             MegolmError::SenderIdentityNotTrusted(VerificationLevel::None(..)) => {
-                MegolmDecryptionError {
-                    code: DecryptionErrorCode::UnknownSenderDevice,
-                    description: value.to_string().into(),
-                    maybe_withheld: None,
-                }
+                decryption_error(DecryptionErrorCode::UnknownSenderDevice, None)
             }
-            _ => MegolmDecryptionError {
-                code: DecryptionErrorCode::UnableToDecrypt,
-                description: value.to_string().into(),
-                maybe_withheld: None,
-            },
+            _ => decryption_error(DecryptionErrorCode::UnableToDecrypt, None),
         }
     }
 }