From c57d2c68a11a47d90f3ce9bcbd7f3d0a504b2a58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Wed, 8 May 2024 17:37:43 +0200
Subject: [PATCH] fixup! chore(crypto): Refactor the cross-signing key wrappers

---
 crates/matrix-sdk-crypto/src/types/cross_signing/master.rs      | 2 +-
 .../matrix-sdk-crypto/src/types/cross_signing/self_signing.rs   | 2 +-
 .../matrix-sdk-crypto/src/types/cross_signing/user_signing.rs   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/matrix-sdk-crypto/src/types/cross_signing/master.rs b/crates/matrix-sdk-crypto/src/types/cross_signing/master.rs
index 171606571..81ef2a8f4 100644
--- a/crates/matrix-sdk-crypto/src/types/cross_signing/master.rs
+++ b/crates/matrix-sdk-crypto/src/types/cross_signing/master.rs
@@ -144,7 +144,7 @@ impl TryFrom<CrossSigningKey> for MasterPubkey {
 
     fn try_from(key: CrossSigningKey) -> Result<Self, Self::Error> {
         if key.usage.contains(&KeyUsage::Master) && key.usage.len() == 1 {
-            Ok(Self(key.into()))
+            Ok(Self(key))
         } else {
             Err(serde::de::Error::custom(format!(
                 "Expected cross signing key usage {} was not found",
diff --git a/crates/matrix-sdk-crypto/src/types/cross_signing/self_signing.rs b/crates/matrix-sdk-crypto/src/types/cross_signing/self_signing.rs
index 57ffafbda..b1c53c101 100644
--- a/crates/matrix-sdk-crypto/src/types/cross_signing/self_signing.rs
+++ b/crates/matrix-sdk-crypto/src/types/cross_signing/self_signing.rs
@@ -70,7 +70,7 @@ impl TryFrom<CrossSigningKey> for SelfSigningPubkey {
 
     fn try_from(key: CrossSigningKey) -> Result<Self, Self::Error> {
         if key.usage.contains(&KeyUsage::SelfSigning) && key.usage.len() == 1 {
-            Ok(Self(key.into()))
+            Ok(Self(key))
         } else {
             Err(serde::de::Error::custom(format!(
                 "Expected cross signing key usage {} was not found",
diff --git a/crates/matrix-sdk-crypto/src/types/cross_signing/user_signing.rs b/crates/matrix-sdk-crypto/src/types/cross_signing/user_signing.rs
index 0595e42cc..9f82fd044 100644
--- a/crates/matrix-sdk-crypto/src/types/cross_signing/user_signing.rs
+++ b/crates/matrix-sdk-crypto/src/types/cross_signing/user_signing.rs
@@ -64,7 +64,7 @@ impl TryFrom<CrossSigningKey> for UserSigningPubkey {
 
     fn try_from(key: CrossSigningKey) -> Result<Self, Self::Error> {
         if key.usage.contains(&KeyUsage::UserSigning) && key.usage.len() == 1 {
-            Ok(Self(key.into()))
+            Ok(Self(key))
         } else {
             Err(serde::de::Error::custom(format!(
                 "Expected cross signing key usage {} was not found",