From e5bd7602e44acb92d6299d7ea027b4a5fc9870a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damir=20Jeli=C4=87?= Date: Wed, 25 Sep 2024 15:54:32 +0200 Subject: [PATCH] refactor: Use a match arm when evaluating session comparison results --- crates/matrix-sdk-crypto/src/machine/mod.rs | 28 ++++++++++++--------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/crates/matrix-sdk-crypto/src/machine/mod.rs b/crates/matrix-sdk-crypto/src/machine/mod.rs index 81aadb2e5..f0b9c6c7c 100644 --- a/crates/matrix-sdk-crypto/src/machine/mod.rs +++ b/crates/matrix-sdk-crypto/src/machine/mod.rs @@ -857,9 +857,9 @@ impl OlmMachine { #[instrument( skip_all, - // This function is only ever called by add_room_key via - // handle_decrypted_to_device_event, so sender, sender_key, and algorithm are - // already recorded. + // This function is only ever called by add_room_key via + // handle_decrypted_to_device_event, so sender, sender_key, and algorithm are + // already recorded. fields(room_id = ? content.room_id, session_id) )] async fn handle_key( @@ -888,17 +888,21 @@ impl OlmMachine { session.sender_data = sender_data; - if self.store().compare_group_session(&session).await? == SessionOrdering::Better { - info!("Received a new megolm room key"); + match self.store().compare_group_session(&session).await? { + SessionOrdering::Better => { + info!("Received a new megolm room key"); - Ok(Some(session)) - } else { - warn!( - "Received a megolm room key that we already have a better version of, \ - discarding", - ); + Ok(Some(session)) + } + comparison_result => { + warn!( + ?comparison_result, + "Received a megolm room key that we already have a better version \ + of, discarding" + ); - Ok(None) + Ok(None) + } } } Err(e) => {