crypto: Test device_keys can be deserialized from a to-device message

Author: andybalaam

crates/matrix-sdk-crypto/src/olm/session.rs

@@ -289,12 +289,16 @@ mod tests {
     use assert_matches2::assert_let;
     use matrix_sdk_test::async_test;
     use ruma::{device_id, user_id};
-    use serde_json::{self, Value};
+    use serde_json;
     use vodozemac::olm::{OlmMessage, SessionConfig};
 
     use crate::{
-        identities::ReadOnlyDevice, olm::Account,
-        types::events::room::encrypted::ToDeviceEncryptedEventContent,
+        identities::ReadOnlyDevice,
+        olm::Account,
+        types::events::{
+            dummy::DummyEventContent, olm_v1::DecryptedOlmV1Event,
+            room::encrypted::ToDeviceEncryptedEventContent,
+        },
     };
 
     #[async_test]
@@ -349,10 +353,8 @@ mod tests {
             .unwrap();
 
         // Also ensure that the encrypted payload has the device keys.
-        let plaintext: Value = serde_json::from_str(&bob_session_result.plaintext).unwrap();
-        assert_eq!(
-            plaintext["org.matrix.msc4147.device_keys"]["user_id"].as_str(),
-            Some("@alice:localhost")
-        );
+        let plaintext: DecryptedOlmV1Event<DummyEventContent> =
+            serde_json::from_str(&bob_session_result.plaintext).unwrap();
+        assert_eq!(plaintext.device_keys.unwrap(), alice.device_keys());
     }
 }