refactor(sqlite): Encode olm hashes with rmp instead of serde_json

… like everything else in the sqlite crypto store.

Author: jplatte

Cargo.lock

@@ -32,7 +32,6 @@ rmp-serde = "1.1.1"
 ruma = { workspace = true }
 rusqlite = { version = "0.28.0", features = ["bundled"] }
 serde = { workspace = true }
-serde_json = { workspace = true }
 thiserror = { workspace = true }
 tokio = { version = "1.24.2", default-features = false, features = ["sync", "fs"] }
 tracing = { workspace = true }

crates/matrix-sdk-sqlite/Cargo.toml

@@ -0,0 +1,4 @@
+-- Hashes in the olm_hash table were initially stored as JSON, even though
+-- everything else is MessagePack. Alongside this migration, the encoding is
+-- updated.
+DELETE FROM "olm_hash";

crates/matrix-sdk-sqlite/migrations/002_reset_olm_hash.sql

@@ -179,7 +179,7 @@ impl SqliteCryptoStore {
     }
 }
 
-const DATABASE_VERSION: u8 = 1;
+const DATABASE_VERSION: u8 = 2;
 
 async fn run_migrations(conn: &SqliteConn) -> rusqlite::Result<()> {
     let kv_exists = conn
@@ -221,6 +221,13 @@ async fn run_migrations(conn: &SqliteConn) -> rusqlite::Result<()> {
             .await?;
     }
 
+    if version < 2 {
+        conn.with_transaction(|txn| {
+            txn.execute_batch(include_str!("../migrations/002_reset_olm_hash.sql"))
+        })
+        .await?;
+    }
+
     conn.set_kv("version", vec![DATABASE_VERSION]).await?;
 
     Ok(())
@@ -682,7 +689,7 @@ impl CryptoStore for SqliteCryptoStore {
                 }
 
                 for hash in &changes.message_hashes {
-                    let hash = serde_json::to_vec(hash).map_err(CryptoStoreError::from)?;
+                    let hash = rmp_serde::to_vec(hash).map_err(CryptoStoreError::backend)?;
                     txn.add_olm_hash(&hash)?;
                 }
 
@@ -906,7 +913,7 @@ impl CryptoStore for SqliteCryptoStore {
         &self,
         message_hash: &matrix_sdk_crypto::olm::OlmMessageHash,
     ) -> StoreResult<bool> {
-        let value = serde_json::to_vec(message_hash)?;
+        let value = rmp_serde::to_vec(message_hash).map_err(CryptoStoreError::backend)?;
         Ok(self.acquire().await?.has_olm_hash(value).await?)
     }