mirror/matrix-rust-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-rust-sdk.git synced 2026-05-18 21:52:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor(sqlite): Inline inherent methods that duplicate trait methods

Browse Source
This commit is contained in:
Jonas Platte
2023-02-08 14:25:27 +01:00
committed by Jonas Platte
parent 64b7c4eb59
commit a22529344a
1 changed files with 19 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
crates/matrix-sdk-sqlite/src/crypto_store.rs
View File

@@ -177,33 +177,6 @@ impl SqliteCryptoStore {
async fn acquire(&self) -> Result<deadpool_sqlite::Object> {
Ok(self.pool.get().await?)
}
async fn load_tracked_users(&self) -> Result<Vec<TrackedUser>> {
self.acquire()
.await?
.get_tracked_users()
.await?
.iter()
.map(|value| Ok(self.deserialize_value(value)?))
.collect()
}
async fn save_tracked_users(
&self,
tracked_users: &[(&UserId, bool)],
) -> Result<(), CryptoStoreError> {
let users: Vec<(Key, Vec<u8>)> = tracked_users
.iter()
.map(|(u, d)| {
let user_id = self.encode_key("tracked_users", u.as_bytes());
let data =
self.serialize_value(&TrackedUser { user_id: (*u).into(), dirty: *d })?;
Ok((user_id, data))
})
.collect::<Result<_>>()?;
Ok(self.acquire().await?.add_tracked_users(users).await?)
}
}
const DATABASE_VERSION: u8 = 1;
@@ -859,11 +832,27 @@ impl CryptoStore for SqliteCryptoStore {
}
async fn load_tracked_users(&self) -> StoreResult<Vec<TrackedUser>> {
Ok(self.load_tracked_users().await?)
self.acquire()
.await?
.get_tracked_users()
.await?
.iter()
.map(|value| self.deserialize_value(value))
.collect()
}
async fn save_tracked_users(&self, users: &[(&UserId, bool)]) -> StoreResult<()> {
self.save_tracked_users(users).await
async fn save_tracked_users(&self, tracked_users: &[(&UserId, bool)]) -> StoreResult<()> {
let users: Vec<(Key, Vec<u8>)> = tracked_users
.iter()
.map(|(u, d)| {
let user_id = self.encode_key("tracked_users", u.as_bytes());
let data =
self.serialize_value(&TrackedUser { user_id: (*u).into(), dirty: *d })?;
Ok((user_id, data))
})
.collect::<Result<_>>()?;
Ok(self.acquire().await?.add_tracked_users(users).await?)
}
async fn get_device(