fixup! crypto: add types to support decryption of RoomKeyHistoryBundle to-device events

Author: richvdh

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

@@ -79,7 +79,10 @@ use crate::{
     },
     types::{
         events::{
-            olm_v1::{AnyDecryptedOlmEvent, DecryptedOlmV1Event, DecryptedRoomKeyEvent},
+            olm_v1::{
+                AnyDecryptedOlmEvent, DecryptedOlmV1Event, DecryptedRoomKeyBundleEvent,
+                DecryptedRoomKeyEvent,
+            },
             room::encrypted::{
                 EncryptedEvent, EncryptedToDeviceEvent, RoomEncryptedEventContent,
                 RoomEventEncryptionScheme, SupportedEventEncryptionSchemes,
@@ -943,7 +946,7 @@ impl OlmMachine {
     async fn receive_room_key_bundle(
         &self,
         sender_key: Curve25519PublicKey,
-        event: &DecryptedOlmV1Event<RoomKeyBundleContent>,
+        event: &DecryptedRoomKeyBundleEvent,
         changes: &mut Changes,
     ) -> OlmResult<()> {
         let Some(sender_device_keys) = &event.sender_device_keys else {

crates/matrix-sdk-crypto/src/types/events/olm_v1.rs

@@ -81,6 +81,10 @@ impl DecryptedForwardedRoomKeyEvent {
 /// `m.olm.v1.curve25519-aes-sha2` algorithm
 pub type DecryptedSecretSendEvent = DecryptedOlmV1Event<SecretSendContent>;
 
+/// An `io.element.msc4268.room_key_bundle` to-device event which has
+/// been decrypted using using the `m.olm.v1.curve25519-aes-sha2` algorithm
+pub type DecryptedRoomKeyBundleEvent = DecryptedOlmV1Event<RoomKeyBundleContent>;
+
 /// An enum over the various events that were decrypted using the
 /// `m.olm.v1.curve25519-aes-sha2` algorithm.
 #[derive(Debug)]
@@ -94,7 +98,7 @@ pub enum AnyDecryptedOlmEvent {
     /// The `m.dummy` decrypted to-device event.
     Dummy(DecryptedDummyEvent),
     /// The `io.element.msc4268.room_key_bundle` decrypted to-device event.
-    RoomKeyBundle(DecryptedOlmV1Event<RoomKeyBundleContent>),
+    RoomKeyBundle(DecryptedRoomKeyBundleEvent),
     /// A decrypted to-device event of an unknown or custom type.
     Custom(Box<ToDeviceCustomEvent>),
 }