From 25ea5fdd73288af2d93d06d84dc1c28dd10528ce Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Wed, 8 Jan 2025 14:05:02 +0000
Subject: [PATCH] test: use builder for some more test data

---
 .../src/test_json/keys_query_sets.rs          | 58 +++----------------
 1 file changed, 7 insertions(+), 51 deletions(-)

diff --git a/testing/matrix-sdk-test/src/test_json/keys_query_sets.rs b/testing/matrix-sdk-test/src/test_json/keys_query_sets.rs
index 1080a1134..96b3cdb4e 100644
--- a/testing/matrix-sdk-test/src/test_json/keys_query_sets.rs
+++ b/testing/matrix-sdk-test/src/test_json/keys_query_sets.rs
@@ -768,58 +768,14 @@ impl VerificationViolationTestData {
     /// `/keys/query` response for Alice, containing the public cross-signing
     /// keys.
     pub fn own_keys_query_response_1() -> KeyQueryResponse {
-        let data = json!({
-            "master_keys": {
-                "@alice:localhost": {
-                    "keys": {
-                        "ed25519:EPVg/QLG9+FmNvKjNXfycZEpQLtfHDaTN+rENAURZSk": "EPVg/QLG9+FmNvKjNXfycZEpQLtfHDaTN+rENAURZSk"
-                    },
-                    "signatures": {
-                        "@alice:localhost": {
-                            "ed25519:EPVg/QLG9+FmNvKjNXfycZEpQLtfHDaTN+rENAURZSk": "FX+srrw9SRmi12fexYHH1jrlEIWgOfre1aPNzDZWcAlaP9WKRdhcQGh70/3F9hk/PGr51I+ux62YgU4xnRTqAA",
-                        }
-                    },
-                    "usage": [
-                        "master"
-                    ],
-                    "user_id": "@alice:localhost"
-                }
-            },
-            "self_signing_keys": {
-                "@alice:localhost": {
-                    "keys": {
-                        "ed25519:WXLer0esHUanp8DCeu2Be0xB5ms9aKFFBrCFl50COjw": "WXLer0esHUanp8DCeu2Be0xB5ms9aKFFBrCFl50COjw"
-                    },
-                    "signatures": {
-                        "@alice:localhost": {
-                            "ed25519:EPVg/QLG9+FmNvKjNXfycZEpQLtfHDaTN+rENAURZSk": "lCV9R1xjD34arzq/CAuej1XBv+Ip4dFfAGHfe7znbW7rnwKDaX5PaX3MHk+EIC7nXvUYEAn502WcUFme5c0cCQ"
-                        }
-                    },
-                    "usage": [
-                        "self_signing"
-                    ],
-                    "user_id": "@alice:localhost"
-                }
-            },
-            "user_signing_keys": {
-                "@alice:localhost": {
-                    "keys": {
-                        "ed25519:MXob/N/bYI7U2655O1/AI9NOX1245RnE03Nl4Hvf+u0": "MXob/N/bYI7U2655O1/AI9NOX1245RnE03Nl4Hvf+u0"
-                    },
-                    "signatures": {
-                        "@alice:localhost": {
-                            "ed25519:EPVg/QLG9+FmNvKjNXfycZEpQLtfHDaTN+rENAURZSk": "A73QfZ5Dzhh7abdal/sEaq1bfgxzPFU8Bvwa9Y5TIe/a5jTmLVubNmsMSsO5tOT+b6aVJg1G4FtId0Q/cb1aAA"
-                        }
-                    },
-                    "usage": [
-                        "user_signing"
-                    ],
-                    "user_id": "@alice:localhost"
-                }
-            }
-        });
+        let builder = KeyQueryResponseTemplate::new(Self::own_id().to_owned())
+            .with_cross_signing_keys(
+                Ed25519SecretKey::from_base64(Self::MASTER_KEY_PRIVATE_EXPORT).unwrap(),
+                Ed25519SecretKey::from_base64(Self::SELF_SIGNING_KEY_PRIVATE_EXPORT).unwrap(),
+                Ed25519SecretKey::from_base64(Self::USER_SIGNING_KEY_PRIVATE_EXPORT).unwrap(),
+            );
 
-        let response: KeyQueryResponse = ruma_response_from_json(&data);
+        let response = builder.build_response();
         with_settings!({sort_maps => true}, {
             assert_json_snapshot!(
                 "VerificationViolationTestData::own_keys_query_response_1",