From 4f2cd1c5ecbbdb667ca86bb3f2670e27addd0e75 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Wed, 10 Sep 2025 18:14:25 +0100
Subject: [PATCH] crypto(test): utility function for creating
 `VerificationMachine`s

---
 .../matrix-sdk-crypto/src/identities/user.rs  | 50 +++++++++----------
 .../src/verification/machine.rs               | 12 +++++
 2 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/crates/matrix-sdk-crypto/src/identities/user.rs b/crates/matrix-sdk-crypto/src/identities/user.rs
index a782ef320..033ed833c 100644
--- a/crates/matrix-sdk-crypto/src/identities/user.rs
+++ b/crates/matrix-sdk-crypto/src/identities/user.rs
@@ -1596,17 +1596,8 @@ pub(crate) mod tests {
         assert!(!identity.is_device_signed(&first));
         assert!(identity.is_device_signed(&second));
 
-        let private_identity =
-            Arc::new(Mutex::new(PrivateCrossSigningIdentity::empty(second.user_id())));
-        let verification_machine = VerificationMachine::new(
-            Account::with_device_id(second.user_id(), second.device_id()).static_data,
-            private_identity,
-            Arc::new(CryptoStoreWrapper::new(
-                second.user_id(),
-                second.device_id(),
-                MemoryStore::new(),
-            )),
-        );
+        let account = Account::with_device_id(second.user_id(), second.device_id());
+        let verification_machine = get_verification_machine(&account);
 
         let first = Device {
             inner: first,
@@ -1639,21 +1630,8 @@ pub(crate) mod tests {
         let (_, device) = device(&response);
 
         let account = Account::with_device_id(device.user_id(), device.device_id());
-        let identity = PrivateCrossSigningIdentity::for_account(&account);
-
-        let id = Arc::new(Mutex::new(identity.clone()));
-
-        let verification_machine = VerificationMachine::new(
-            Account::with_device_id(device.user_id(), device.device_id()).static_data,
-            id.clone(),
-            Arc::new(CryptoStoreWrapper::new(
-                device.user_id(),
-                device.device_id(),
-                MemoryStore::new(),
-            )),
-        );
-
-        let public_identity = identity.to_public_identity().await.unwrap();
+        let verification_machine = get_verification_machine(&account);
+        let public_identity = verification_machine.get_own_user_identity_data().await.unwrap();
 
         let mut device = Device {
             inner: device,
@@ -1666,6 +1644,7 @@ pub(crate) mod tests {
 
         let mut device_keys = device.as_device_keys().to_owned();
 
+        let identity = verification_machine.store.private_identity.lock().await;
         identity.sign_device_keys(&mut device_keys).await.unwrap();
         device.inner.update_device(&device_keys).expect("Couldn't update newly signed device keys");
         assert!(device.is_verified());
@@ -1984,4 +1963,23 @@ pub(crate) mod tests {
             "verified": false
         })
     }
+
+    /**
+     * Create a minimal [`VerificationMachine`] for the given account,
+     * backed by a [`MemoryStore`].
+     *
+     * Creates a new private user identity for the account.
+     */
+    fn get_verification_machine(account: &Account) -> VerificationMachine {
+        let private_identity = PrivateCrossSigningIdentity::for_account(account);
+        VerificationMachine::new(
+            account.static_data().clone(),
+            Arc::new(Mutex::new(private_identity)),
+            Arc::new(CryptoStoreWrapper::new(
+                account.user_id(),
+                account.device_id(),
+                MemoryStore::new(),
+            )),
+        )
+    }
 }
diff --git a/crates/matrix-sdk-crypto/src/verification/machine.rs b/crates/matrix-sdk-crypto/src/verification/machine.rs
index 7175946e2..1459143c6 100644
--- a/crates/matrix-sdk-crypto/src/verification/machine.rs
+++ b/crates/matrix-sdk-crypto/src/verification/machine.rs
@@ -530,6 +530,18 @@ impl VerificationMachine {
 
         Ok(())
     }
+
+    /**
+     * Utility function to build the public identity (i.e., an
+     * [`OwnUserIdentityData`]) corresponding to the private identity
+     * stored in the `VerificationStore`.
+     */
+    #[cfg(test)]
+    pub async fn get_own_user_identity_data(
+        &self,
+    ) -> Result<crate::OwnUserIdentityData, crate::SignatureError> {
+        self.store.private_identity.lock().await.to_public_identity().await
+    }
 }
 
 #[cfg(test)]