From 50d28aefbd14764330d9680d6a27eea92eea3133 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damir=20Jeli=C4=87?= Date: Tue, 26 Sep 2023 18:14:54 +0200 Subject: [PATCH] Rename the key field of the SecretStorageDefaultKeyEventContent to key_id This makes it clearer that the field does not contain a secret key of any sort. --- crates/ruma-events/CHANGELOG.md | 2 ++ crates/ruma-events/src/secret_storage/default_key.rs | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/crates/ruma-events/CHANGELOG.md b/crates/ruma-events/CHANGELOG.md index 8caaa949..c9af33c0 100644 --- a/crates/ruma-events/CHANGELOG.md +++ b/crates/ruma-events/CHANGELOG.md @@ -9,6 +9,8 @@ Bug fixes: Breaking changes: +- Rename the `key` field in the `SecretStorageDefaultKeyEventContent` to + `key_id`. - Make `in_reply_to` field of `Thread` optional - It was wrong to be mandatory, spec was unclear (clarified [here](https://github.com/matrix-org/matrix-spec/pull/1439)) - Remove `AnswerSessionDescription` and `OfferSessionDescription` types, use `SessionDescription` diff --git a/crates/ruma-events/src/secret_storage/default_key.rs b/crates/ruma-events/src/secret_storage/default_key.rs index d9096514..5d0c08e0 100644 --- a/crates/ruma-events/src/secret_storage/default_key.rs +++ b/crates/ruma-events/src/secret_storage/default_key.rs @@ -12,5 +12,6 @@ use crate::macros::EventContent; #[ruma_event(type = "m.secret_storage.default_key", kind = GlobalAccountData)] pub struct SecretStorageDefaultKeyEventContent { /// The ID of the default key. - pub key: String, + #[serde(rename = "key")] + pub key_id: String, }