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

Refactor EncodeKey implementations

Browse Source
This commit is contained in:
Jonas Platte
2022-01-23 17:33:15 +01:00
parent c6594edc92
commit 6baffc4b0b
2 changed files with 53 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
crates/matrix-sdk-base/src/store/sled_store/mod.rs
View File

@@ -93,19 +93,37 @@ trait EncodeKey {
fn encode(&self) -> Vec<u8>;
}
impl EncodeKey for &UserId {
impl<T: EncodeKey> EncodeKey for &T {
fn encode(&self) -> Vec<u8> {
T::encode(self)
}
}
impl<T: EncodeKey> EncodeKey for Box<T> {
fn encode(&self) -> Vec<u8> {
T::encode(self)
}
}
impl EncodeKey for UserId {
fn encode(&self) -> Vec<u8> {
self.as_str().encode()
}
}
impl EncodeKey for &RoomId {
impl EncodeKey for RoomId {
fn encode(&self) -> Vec<u8> {
self.as_str().encode()
}
}
impl EncodeKey for &str {
impl EncodeKey for String {
fn encode(&self) -> Vec<u8> {
self.as_str().encode()
}
}
impl EncodeKey for str {
fn encode(&self) -> Vec<u8> {
[self.as_bytes(), &[ENCODE_SEPARATOR]].concat()
}
@@ -425,7 +443,7 @@ impl SledStore {
for (event_type, event) in &changes.account_data {
account_data.insert(
event_type.as_str().encode(),
event_type.encode(),
self.serialize_event(&event)
.map_err(ConflictableTransactionError::Abort)?,
)?;
@@ -456,7 +474,7 @@ impl SledStore {
for (room_id, room_info) in &changes.room_infos {
rooms.insert(
(&**room_id).encode(),
room_id.encode(),
self.serialize_event(room_info)
.map_err(ConflictableTransactionError::Abort)?,
)?;
@@ -464,7 +482,7 @@ impl SledStore {
for (sender, event) in &changes.presence {
presence.insert(
(&**sender).encode(),
sender.encode(),
self.serialize_event(&event)
.map_err(ConflictableTransactionError::Abort)?,
)?;
@@ -472,7 +490,7 @@ impl SledStore {
for (room_id, info) in &changes.invited_room_info {
striped_rooms.insert(
(&**room_id).encode(),
room_id.encode(),
self.serialize_event(&info)
.map_err(ConflictableTransactionError::Abort)?,
)?;

40
crates/matrix-sdk-crypto/src/store/sled.rs
View File

@@ -57,6 +57,18 @@ trait EncodeKey {
fn encode(&self) -> Vec<u8>;
}
impl<T: EncodeKey> EncodeKey for &T {
fn encode(&self) -> Vec<u8> {
T::encode(self)
}
}
impl<T: EncodeKey> EncodeKey for Box<T> {
fn encode(&self) -> Vec<u8> {
T::encode(self)
}
}
impl EncodeKey for Uuid {
fn encode(&self) -> Vec<u8> {
self.as_u128().to_be_bytes().to_vec()
@@ -78,7 +90,7 @@ impl EncodeKey for SecretInfo {
}
}
impl EncodeKey for &RequestedKeyInfo {
impl EncodeKey for RequestedKeyInfo {
fn encode(&self) -> Vec<u8> {
[
self.room_id.as_bytes(),
@@ -94,25 +106,31 @@ impl EncodeKey for &RequestedKeyInfo {
}
}
impl EncodeKey for &UserId {
impl EncodeKey for UserId {
fn encode(&self) -> Vec<u8> {
self.as_str().encode()
}
}
impl EncodeKey for &ReadOnlyDevice {
impl EncodeKey for ReadOnlyDevice {
fn encode(&self) -> Vec<u8> {
(self.user_id().as_str(), self.device_id().as_str()).encode()
}
}
impl EncodeKey for &RoomId {
impl EncodeKey for RoomId {
fn encode(&self) -> Vec<u8> {
self.as_str().encode()
}
}
impl EncodeKey for &str {
impl EncodeKey for String {
fn encode(&self) -> Vec<u8> {
self.as_str().encode()
}
}
impl EncodeKey for str {
fn encode(&self) -> Vec<u8> {
[self.as_bytes(), &[Self::SEPARATOR]].concat()
}
@@ -613,7 +631,7 @@ impl SledStore {
for (key, session) in &outbound_session_changes {
outbound_sessions.insert(
(&**key).encode(),
key.encode(),
serde_json::to_vec(&session)
.map_err(ConflictableTransactionError::Abort)?,
)?;
@@ -628,10 +646,8 @@ impl SledStore {
}
for key_request in &key_requests {
secret_requests_by_info.insert(
(&key_request.info).encode(),
key_request.request_id.encode(),
)?;
secret_requests_by_info
.insert(key_request.info.encode(), key_request.request_id.encode())?;
let key_request_id = key_request.request_id.encode();
@@ -965,11 +981,11 @@ impl CryptoStore for SledStore {
.map_err(ConflictableTransactionError::Abort)?;
if let Some(request) = sent_request {
key_requests_by_info.remove((&request.info).encode())?;
key_requests_by_info.remove(request.info.encode())?;
}
if let Some(request) = unsent_request {
key_requests_by_info.remove((&request.info).encode())?;
key_requests_by_info.remove(request.info.encode())?;
}
Ok(())