crypto: Refactor some test code

Author: jplatte

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

@@ -1677,9 +1677,9 @@ pub(crate) mod test {
 
         let mut bob_keys = BTreeMap::new();
 
-        let one_time_key = one_time_keys.iter().next().unwrap();
+        let (device_key_id, one_time_key) = one_time_keys.iter().next().unwrap();
         let mut keys = BTreeMap::new();
-        keys.insert(one_time_key.0.clone(), one_time_key.1.clone());
+        keys.insert(device_key_id.clone(), one_time_key.clone());
         bob_keys.insert(bob.device_id().into(), keys);
 
         let mut one_time_keys = BTreeMap::new();
@@ -1909,9 +1909,9 @@ pub(crate) mod test {
 
         let mut bob_keys = BTreeMap::new();
 
-        let one_time_key = one_time_keys.iter().next().unwrap();
+        let (device_key_id, one_time_key) = one_time_keys.iter().next().unwrap();
         let mut keys = BTreeMap::new();
-        keys.insert(one_time_key.0.clone(), one_time_key.1.clone());
+        keys.insert(device_key_id.clone(), one_time_key.clone());
         bob_keys.insert(bob_machine.device_id().into(), keys);
 
         let mut one_time_keys = BTreeMap::new();

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

@@ -103,7 +103,7 @@ pub(crate) mod test {
 
         bob.generate_one_time_keys_helper(1).await;
         let one_time_key =
-            bob.one_time_keys().await.curve25519().iter().next().unwrap().1.to_owned();
+            bob.one_time_keys().await.curve25519().values().next().unwrap().to_owned();
         let one_time_key = SignedKey::new(one_time_key, BTreeMap::new());
         let sender_key = bob.identity_keys().curve25519().to_owned();
         let session =
@@ -163,7 +163,7 @@ pub(crate) mod test {
         let one_time_keys = alice.one_time_keys().await;
         alice.mark_keys_as_published().await;
 
-        let one_time_key = one_time_keys.curve25519().iter().next().unwrap().1.to_owned();
+        let one_time_key = one_time_keys.curve25519().values().next().unwrap().to_owned();
 
         let one_time_key = SignedKey::new(one_time_key, BTreeMap::new());
 

crates/matrix-sdk-crypto/src/store/sled.rs

@@ -1084,7 +1084,7 @@ mod test {
 
         bob.generate_one_time_keys_helper(1).await;
         let one_time_key =
-            bob.one_time_keys().await.curve25519().iter().next().unwrap().1.to_owned();
+            bob.one_time_keys().await.curve25519().values().next().unwrap().to_owned();
         let one_time_key = SignedKey::new(one_time_key, BTreeMap::new());
         let sender_key = bob.identity_keys().curve25519().to_owned();
         let session =