refactor(indexeddb): make room id a key component rather than fixed arg to IndexedKey::encode

Signed-off-by: Michael Goldenberg <[email protected]>

Author: mgoldenberg

crates/matrix-sdk-indexeddb/src/event_cache_store/serializer/mod.rs

@@ -71,12 +71,12 @@ impl IndexeddbEventCacheStoreSerializer {
     ///
     /// Note that the particular key which is encoded is defined by the type
     /// `K`.
-    pub fn encode_key<T, K>(&self, room_id: &RoomId, components: K::KeyComponents<'_>) -> K
+    pub fn encode_key<T, K>(&self, _: &RoomId, components: K::KeyComponents<'_>) -> K
     where
         T: Indexed,
         K: IndexedKey<T>,
     {
-        K::encode(room_id, components, &self.inner)
+        K::encode(components, &self.inner)
     }
 
     /// Encodes a key for a [`Indexed`] type as a [`JsValue`].
@@ -132,11 +132,11 @@ impl IndexeddbEventCacheStoreSerializer {
     {
         let range = match range.into() {
             IndexedKeyRange::Only(components) => {
-                IndexedKeyRange::Only(K::encode(room_id, components, &self.inner))
+                IndexedKeyRange::Only(K::encode(components, &self.inner))
             }
             IndexedKeyRange::Bound(lower, upper) => {
-                let lower = K::encode(room_id, lower, &self.inner);
-                let upper = K::encode(room_id, upper, &self.inner);
+                let lower = K::encode(lower, &self.inner);
+                let upper = K::encode(upper, &self.inner);
                 IndexedKeyRange::Bound(lower, upper)
             }
         };

crates/matrix-sdk-indexeddb/src/event_cache_store/serializer/traits.rs

@@ -62,11 +62,7 @@ pub trait IndexedKey<T: Indexed> {
     /// argument, which provides the necessary context for encryption and
     /// decryption, in the case that certain components of the key must be
     /// encrypted before storage.
-    fn encode(
-        room_id: &RoomId,
-        components: Self::KeyComponents<'_>,
-        serializer: &IndexeddbSerializer,
-    ) -> Self;
+    fn encode(components: Self::KeyComponents<'_>, serializer: &IndexeddbSerializer) -> Self;
 }
 
 /// A trait for constructing the bounds of an [`IndexedKey`].
@@ -103,12 +99,12 @@ where
 {
     /// Constructs the lower bound of the key.
     fn lower_key(room_id: &RoomId, serializer: &IndexeddbSerializer) -> Self {
-        <Self as IndexedKey<T>>::encode(room_id, Self::lower_key_components(), serializer)
+        <Self as IndexedKey<T>>::encode(Self::lower_key_components(), serializer)
     }
 
     /// Constructs the upper bound of the key.
     fn upper_key(room_id: &RoomId, serializer: &IndexeddbSerializer) -> Self {
-        <Self as IndexedKey<T>>::encode(room_id, Self::upper_key_components(), serializer)
+        <Self as IndexedKey<T>>::encode(Self::upper_key_components(), serializer)
     }
 }
 
@@ -153,6 +149,21 @@ pub trait IndexedPrefixKeyBounds<T: Indexed, P>: IndexedKey<T> {
     fn upper_key_with_prefix(prefix: P, serializer: &IndexeddbSerializer) -> Self;
 }
 
+impl<'a, T, K, P> IndexedPrefixKeyBounds<T, P> for K
+where
+    T: Indexed,
+    K: IndexedPrefixKeyComponentBounds<'a, T, P> + Sized,
+    P: 'a,
+{
+    fn lower_key_with_prefix(prefix: P, serializer: &IndexeddbSerializer) -> Self {
+        <Self as IndexedKey<T>>::encode(Self::lower_key_components_with_prefix(prefix), serializer)
+    }
+
+    fn upper_key_with_prefix(prefix: P, serializer: &IndexeddbSerializer) -> Self {
+        <Self as IndexedKey<T>>::encode(Self::upper_key_components_with_prefix(prefix), serializer)
+    }
+}
+
 /// A trait for constructing the bounds of the components of an [`IndexedKey`]
 /// given a prefix `P` of that key.
 ///