crypto: Merge deserialize_pickled_inbound_group_session into unpickle_inbound_group_session

This commit is contained in:
Andy Balaam
2024-08-20 12:42:59 +01:00
committed by Andy Balaam
parent fed08fad76
commit 668a267c9b

View File

@@ -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> {