From cffb565a5f51dd463a92a98258ff9323c4d0ea69 Mon Sep 17 00:00:00 2001
From: Jonas Platte <jplatte@matrix.org>
Date: Thu, 23 Jun 2022 13:32:19 +0200
Subject: [PATCH] chore: Allow some usage of deprecated fields
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

… to allow CI to succeed. They should be removed soon.
---
 .../src/gossiping/machine.rs                  |  1 +
 crates/matrix-sdk-crypto/src/gossiping/mod.rs |  1 +
 crates/matrix-sdk-crypto/src/machine.rs       | 32 ++++++++++++++++---
 .../src/store/memorystore.rs                  |  1 +
 crates/matrix-sdk-sled/src/cryptostore.rs     |  2 ++
 5 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/crates/matrix-sdk-crypto/src/gossiping/machine.rs b/crates/matrix-sdk-crypto/src/gossiping/machine.rs
index 3d6f01320..29eb5c72b 100644
--- a/crates/matrix-sdk-crypto/src/gossiping/machine.rs
+++ b/crates/matrix-sdk-crypto/src/gossiping/machine.rs
@@ -343,6 +343,7 @@ impl GossipMachine {
             .store
             .get_inbound_group_session(
                 &key_info.room_id,
+                #[allow(deprecated)]
                 &key_info.sender_key,
                 &key_info.session_id,
             )
diff --git a/crates/matrix-sdk-crypto/src/gossiping/mod.rs b/crates/matrix-sdk-crypto/src/gossiping/mod.rs
index d998081a1..58b35f9ff 100644
--- a/crates/matrix-sdk-crypto/src/gossiping/mod.rs
+++ b/crates/matrix-sdk-crypto/src/gossiping/mod.rs
@@ -89,6 +89,7 @@ impl SecretInfo {
     /// comparison
     pub fn as_key(&self) -> String {
         match &self {
+            #[allow(deprecated)]
             SecretInfo::KeyRequest(ref info) => format!(
                 "keyRequest:{:}:{:}:{:}:{:}",
                 info.room_id.as_str(),
diff --git a/crates/matrix-sdk-crypto/src/machine.rs b/crates/matrix-sdk-crypto/src/machine.rs
index 90a40af00..74cd62a8c 100644
--- a/crates/matrix-sdk-crypto/src/machine.rs
+++ b/crates/matrix-sdk-crypto/src/machine.rs
@@ -1002,7 +1002,12 @@ impl OlmMachine {
 
         Ok(self
             .key_request_machine
-            .request_key(room_id, &content.sender_key, &content.session_id)
+            .request_key(
+                room_id,
+                #[allow(deprecated)]
+                &content.sender_key,
+                &content.session_id,
+            )
             .await?)
     }
 
@@ -1050,7 +1055,12 @@ impl OlmMachine {
     ) -> MegolmResult<RoomEvent> {
         if let Some(session) = self
             .store
-            .get_inbound_group_session(room_id, &content.sender_key, &content.session_id)
+            .get_inbound_group_session(
+                room_id,
+                #[allow(deprecated)]
+                &content.sender_key,
+                &content.session_id,
+            )
             .await?
         {
             // TODO check the message index.
@@ -1084,13 +1094,24 @@ impl OlmMachine {
                 }
             }
 
-            let encryption_info =
-                self.get_encryption_info(&session, &event.sender, &content.device_id).await?;
+            let encryption_info = self
+                .get_encryption_info(
+                    &session,
+                    &event.sender,
+                    #[allow(deprecated)]
+                    &content.device_id,
+                )
+                .await?;
 
             Ok(RoomEvent { encryption_info: Some(encryption_info), event: decrypted_event })
         } else {
             self.key_request_machine
-                .create_outgoing_key_request(room_id, &content.sender_key, &content.session_id)
+                .create_outgoing_key_request(
+                    room_id,
+                    #[allow(deprecated)]
+                    &content.sender_key,
+                    &content.session_id,
+                )
                 .await?;
 
             Err(MegolmError::MissingRoomKey)
@@ -1114,6 +1135,7 @@ impl OlmMachine {
                 match self.decrypt_megolm_v1_event(room_id, event, c).await {
                     Ok(r) => Ok(r),
                     Err(e) => {
+                        #[allow(deprecated)]
                         if let MegolmError::MissingRoomKey = e {
                             // TODO log the withheld reason if we have one.
                             debug!(
diff --git a/crates/matrix-sdk-crypto/src/store/memorystore.rs b/crates/matrix-sdk-crypto/src/store/memorystore.rs
index bb8111ae0..ea1dded47 100644
--- a/crates/matrix-sdk-crypto/src/store/memorystore.rs
+++ b/crates/matrix-sdk-crypto/src/store/memorystore.rs
@@ -37,6 +37,7 @@ use crate::{
 
 fn encode_key_info(info: &SecretInfo) -> String {
     match info {
+        #[allow(deprecated)]
         SecretInfo::KeyRequest(info) => {
             format!("{}{}{}{}", info.room_id, info.sender_key, info.algorithm, info.session_id)
         }
diff --git a/crates/matrix-sdk-sled/src/cryptostore.rs b/crates/matrix-sdk-sled/src/cryptostore.rs
index b9119240c..871c2d2e0 100644
--- a/crates/matrix-sdk-sled/src/cryptostore.rs
+++ b/crates/matrix-sdk-sled/src/cryptostore.rs
@@ -118,10 +118,12 @@ impl EncodeKey for SecretInfo {
 
 impl EncodeKey for RequestedKeyInfo {
     fn encode(&self) -> Vec<u8> {
+        #[allow(deprecated)]
         (&self.room_id, &self.sender_key, &self.algorithm, &self.session_id).encode()
     }
     fn encode_secure(&self, table_name: &str, store_cipher: &StoreCipher) -> Vec<u8> {
         let room_id = store_cipher.hash_key(table_name, self.room_id.as_bytes());
+        #[allow(deprecated)]
         let sender_key = store_cipher.hash_key(table_name, self.sender_key.as_bytes());
         let algorithm = store_cipher.hash_key(table_name, self.algorithm.as_ref().as_bytes());
         let session_id = store_cipher.hash_key(table_name, self.session_id.as_bytes());