From 668a267c9b30ece6f64c39bf6fff5eee7ff6b2de Mon Sep 17 00:00:00 2001
From: Andy Balaam <andy.balaam@matrix.org>
Date: Tue, 20 Aug 2024 12:42:59 +0100
Subject: [PATCH] crypto: Merge deserialize_pickled_inbound_group_session into
 unpickle_inbound_group_session

---
 crates/matrix-sdk-sqlite/src/crypto_store.rs | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/crates/matrix-sdk-sqlite/src/crypto_store.rs b/crates/matrix-sdk-sqlite/src/crypto_store.rs
index 72a83d646..a57455549 100644
--- a/crates/matrix-sdk-sqlite/src/crypto_store.rs
+++ b/crates/matrix-sdk-sqlite/src/crypto_store.rs
@@ -156,20 +156,13 @@ impl SqliteCryptoStore {
         value: Vec<u8>,
         backed_up: bool,
     ) -> Result<InboundGroupSession> {
-        let pickle = self.deserialize_pickled_inbound_group_session(&value, backed_up)?;
-        Ok(InboundGroupSession::from_pickle(pickle)?)
-    }
+        let mut pickle: PickledInboundGroupSession = self.deserialize_value(&value)?;
 
-    fn deserialize_pickled_inbound_group_session(
-        &self,
-        value: &[u8],
-        backed_up: bool,
-    ) -> Result<PickledInboundGroupSession> {
-        let mut pickle: PickledInboundGroupSession = self.deserialize_value(value)?;
         // backed_up SQL column is source of truth, backed_up field in pickle
         // needed for other stores though
         pickle.backed_up = backed_up;
-        Ok(pickle)
+
+        Ok(InboundGroupSession::from_pickle(pickle)?)
     }
 
     fn deserialize_key_request(&self, value: &[u8], sent_out: bool) -> Result<GossipRequest> {