Skip to content

Commit b277708

Browse files
BillCarsonFrpoljar
authored andcommitted
review: refactor, rename NotProcessed variant to Invalid
1 parent a49bffa commit b277708

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

crates/matrix-sdk-crypto/src/machine/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1294,7 +1294,7 @@ impl OlmMachine {
12941294
Err(e) => {
12951295
// Skip invalid events.
12961296
warn!("Received an invalid to-device event: {e}");
1297-
return Some(ProcessedToDeviceEvent::NotProcessed(raw_event));
1297+
return Some(ProcessedToDeviceEvent::Invalid(raw_event));
12981298
}
12991299
};
13001300

crates/matrix-sdk-crypto/src/machine/tests/send_encrypted_to_device.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ async fn test_processed_to_device_variants() {
214214
assert_matches!(processed_event, ProcessedToDeviceEvent::PlainText(_));
215215

216216
let processed_event = &processed[2];
217-
assert_matches!(processed_event, ProcessedToDeviceEvent::NotProcessed(_));
217+
assert_matches!(processed_event, ProcessedToDeviceEvent::Invalid(_));
218218

219219
let processed_event = &processed[3];
220220
assert_matches!(processed_event, ProcessedToDeviceEvent::UnableToDecrypt { .. });

crates/matrix-sdk-crypto/src/types/mod.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -642,8 +642,10 @@ pub enum ProcessedToDeviceEvent {
642642
/// An unencrypted event.
643643
PlainText(Raw<AnyToDeviceEvent>),
644644

645-
/// An invalid to device event that was ignored
646-
NotProcessed(Raw<AnyToDeviceEvent>),
645+
/// An invalid to device event that was ignored because it is missing some
646+
/// required information to be processed (like no event `type` for
647+
/// example)
648+
Invalid(Raw<AnyToDeviceEvent>),
647649
}
648650

649651
impl ProcessedToDeviceEvent {
@@ -654,7 +656,7 @@ impl ProcessedToDeviceEvent {
654656
ProcessedToDeviceEvent::Decrypted(decrypted_event) => decrypted_event.clone(),
655657
ProcessedToDeviceEvent::UnableToDecrypt(event) => event.clone(),
656658
ProcessedToDeviceEvent::PlainText(event) => event.clone(),
657-
ProcessedToDeviceEvent::NotProcessed(event) => event.clone(),
659+
ProcessedToDeviceEvent::Invalid(event) => event.clone(),
658660
}
659661
}
660662
}

0 commit comments

Comments
 (0)