From b27770801c32bee4e0779bd9e0905a28672a04fb Mon Sep 17 00:00:00 2001 From: Valere Date: Fri, 18 Apr 2025 14:33:43 +0200 Subject: [PATCH] review: refactor, rename NotProcessed variant to Invalid --- crates/matrix-sdk-crypto/src/machine/mod.rs | 2 +- .../src/machine/tests/send_encrypted_to_device.rs | 2 +- crates/matrix-sdk-crypto/src/types/mod.rs | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/crates/matrix-sdk-crypto/src/machine/mod.rs b/crates/matrix-sdk-crypto/src/machine/mod.rs index 71fa3901d..6e786a5ba 100644 --- a/crates/matrix-sdk-crypto/src/machine/mod.rs +++ b/crates/matrix-sdk-crypto/src/machine/mod.rs @@ -1294,7 +1294,7 @@ impl OlmMachine { Err(e) => { // Skip invalid events. warn!("Received an invalid to-device event: {e}"); - return Some(ProcessedToDeviceEvent::NotProcessed(raw_event)); + return Some(ProcessedToDeviceEvent::Invalid(raw_event)); } }; diff --git a/crates/matrix-sdk-crypto/src/machine/tests/send_encrypted_to_device.rs b/crates/matrix-sdk-crypto/src/machine/tests/send_encrypted_to_device.rs index 28d63477e..86cae1edb 100644 --- a/crates/matrix-sdk-crypto/src/machine/tests/send_encrypted_to_device.rs +++ b/crates/matrix-sdk-crypto/src/machine/tests/send_encrypted_to_device.rs @@ -214,7 +214,7 @@ async fn test_processed_to_device_variants() { assert_matches!(processed_event, ProcessedToDeviceEvent::PlainText(_)); let processed_event = &processed[2]; - assert_matches!(processed_event, ProcessedToDeviceEvent::NotProcessed(_)); + assert_matches!(processed_event, ProcessedToDeviceEvent::Invalid(_)); let processed_event = &processed[3]; assert_matches!(processed_event, ProcessedToDeviceEvent::UnableToDecrypt { .. }); diff --git a/crates/matrix-sdk-crypto/src/types/mod.rs b/crates/matrix-sdk-crypto/src/types/mod.rs index da00d8fe9..79d153115 100644 --- a/crates/matrix-sdk-crypto/src/types/mod.rs +++ b/crates/matrix-sdk-crypto/src/types/mod.rs @@ -642,8 +642,10 @@ pub enum ProcessedToDeviceEvent { /// An unencrypted event. PlainText(Raw), - /// An invalid to device event that was ignored - NotProcessed(Raw), + /// An invalid to device event that was ignored because it is missing some + /// required information to be processed (like no event `type` for + /// example) + Invalid(Raw), } impl ProcessedToDeviceEvent { @@ -654,7 +656,7 @@ impl ProcessedToDeviceEvent { ProcessedToDeviceEvent::Decrypted(decrypted_event) => decrypted_event.clone(), ProcessedToDeviceEvent::UnableToDecrypt(event) => event.clone(), ProcessedToDeviceEvent::PlainText(event) => event.clone(), - ProcessedToDeviceEvent::NotProcessed(event) => event.clone(), + ProcessedToDeviceEvent::Invalid(event) => event.clone(), } } }