refactor(indexeddb): remove redundant room id arg on relevant serializer and transaction fns

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

Author: mgoldenberg

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

@@ -160,7 +160,6 @@ impl_event_cache_store! {
                     trace!(%room_id, "Inserting new chunk (prev={previous:?}, new={new:?}, next={next:?})");
                     transaction
                         .add_chunk(
-                            room_id,
                             &types::Chunk {
                                 room_id: room_id.to_owned(),
                                 identifier: new.index(),
@@ -175,7 +174,6 @@ impl_event_cache_store! {
                     trace!(%room_id, "Inserting new gap (prev={previous:?}, new={new:?}, next={next:?})");
                     transaction
                         .add_item(
-                            room_id,
                             &types::Gap {
                                 room_id: room_id.to_owned(),
                                 chunk_identifier: new.index(),
@@ -185,7 +183,6 @@ impl_event_cache_store! {
                         .await?;
                     transaction
                         .add_chunk(
-                            room_id,
                             &types::Chunk {
                                 room_id: room_id.to_owned(),
                                 identifier: new.index(),
@@ -207,8 +204,7 @@ impl_event_cache_store! {
 
                     for (i, item) in items.into_iter().enumerate() {
                         transaction
-                            .put_item(
-                                room_id,
+                            .put_event(
                                 &types::Event::InBand(InBandEvent {
                                     room_id: room_id.to_owned(),
                                     content: item,
@@ -229,7 +225,6 @@ impl_event_cache_store! {
 
                     transaction
                         .put_event(
-                            room_id,
                             &types::Event::InBand(InBandEvent {
                                 room_id: room_id.to_owned(),
                                 content: item,
@@ -531,7 +526,7 @@ impl_event_cache_store! {
             Some(mut inner) => inner.with_content(event),
             None => types::Event::OutOfBand(OutOfBandEvent { room_id: room_id.to_owned(), content: event, position: () }),
         };
-        transaction.put_event(room_id, &event).await?;
+        transaction.put_event(&event).await?;
         transaction.commit().await?;
         Ok(())
     }

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

@@ -71,7 +71,7 @@ impl IndexeddbEventCacheStoreSerializer {
     ///
     /// Note that the particular key which is encoded is defined by the type
     /// `K`.
-    pub fn encode_key<T, K>(&self, _: &RoomId, components: K::KeyComponents<'_>) -> K
+    pub fn encode_key<T, K>(&self, components: K::KeyComponents<'_>) -> K
     where
         T: Indexed,
         K: IndexedKey<T>,
@@ -85,14 +85,13 @@ impl IndexeddbEventCacheStoreSerializer {
     /// `K`.
     pub fn encode_key_as_value<T, K>(
         &self,
-        room_id: &RoomId,
         components: K::KeyComponents<'_>,
     ) -> Result<JsValue, serde_wasm_bindgen::Error>
     where
         T: Indexed,
         K: IndexedKey<T> + Serialize,
     {
-        serde_wasm_bindgen::to_value(&self.encode_key::<T, K>(room_id, components))
+        serde_wasm_bindgen::to_value(&self.encode_key::<T, K>(components))
     }
 
     /// Encodes a key component range for an [`Indexed`] type.
@@ -101,7 +100,6 @@ impl IndexeddbEventCacheStoreSerializer {
     /// `K`.
     pub fn encode_key_range<T, K>(
         &self,
-        room_id: &RoomId,
         range: impl Into<IndexedKeyRange<K>>,
     ) -> Result<IdbKeyRange, serde_wasm_bindgen::Error>
     where
@@ -123,7 +121,6 @@ impl IndexeddbEventCacheStoreSerializer {
     /// `K`.
     pub fn encode_key_component_range<'a, T, K>(
         &self,
-        room_id: &RoomId,
         range: impl Into<IndexedKeyRange<K::KeyComponents<'a>>>,
     ) -> Result<IdbKeyRange, serde_wasm_bindgen::Error>
     where
@@ -140,13 +137,12 @@ impl IndexeddbEventCacheStoreSerializer {
                 IndexedKeyRange::Bound(lower, upper)
             }
         };
-        self.encode_key_range::<T, K>(room_id, range)
+        self.encode_key_range::<T, K>(range)
     }
 
     /// Serializes an [`Indexed`] type into a [`JsValue`]
     pub fn serialize<T>(
         &self,
-        room_id: &RoomId,
         t: &T,
     ) -> Result<JsValue, IndexeddbEventCacheStoreSerializerError<T::Error>>
     where

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

@@ -86,10 +86,10 @@ pub trait IndexedKey<T: Indexed> {
 /// the proper bound.
 pub trait IndexedKeyBounds<T: Indexed>: IndexedKey<T> {
     /// Constructs the lower bound of the key.
-    fn lower_key(room_id: &RoomId, serializer: &IndexeddbSerializer) -> Self;
+    fn lower_key(serializer: &IndexeddbSerializer) -> Self;
 
     /// Constructs the upper bound of the key.
-    fn upper_key(room_id: &RoomId, serializer: &IndexeddbSerializer) -> Self;
+    fn upper_key(serializer: &IndexeddbSerializer) -> Self;
 }
 
 impl<T, K> IndexedKeyBounds<T> for K
@@ -98,12 +98,12 @@ where
     K: IndexedKeyComponentBounds<T> + Sized,
 {
     /// Constructs the lower bound of the key.
-    fn lower_key(room_id: &RoomId, serializer: &IndexeddbSerializer) -> Self {
+    fn lower_key(serializer: &IndexeddbSerializer) -> Self {
         <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 {
+    fn upper_key(serializer: &IndexeddbSerializer) -> Self {
         <Self as IndexedKey<T>>::encode(Self::upper_key_components(), serializer)
     }
 }

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

@@ -165,11 +165,7 @@ pub enum IndexedKeyRange<K> {
 impl<'a, C: 'a> IndexedKeyRange<C> {
     /// Encodes a range of key components of type `K::KeyComponents`
     /// into a range of keys of type `K`.
-    pub fn encoded<T, K>(
-        self,
-        room_id: &RoomId,
-        serializer: &IndexeddbSerializer,
-    ) -> IndexedKeyRange<K>
+    pub fn encoded<T, K>(self, serializer: &IndexeddbSerializer) -> IndexedKeyRange<K>
     where
         T: Indexed,
         K: IndexedKey<T, KeyComponents<'a> = C>,
@@ -194,12 +190,12 @@ impl<K> IndexedKeyRange<K> {
         }
     }
 
-    pub fn all<T>(room_id: &RoomId, serializer: &IndexeddbSerializer) -> IndexedKeyRange<K>
+    pub fn all<T>(serializer: &IndexeddbSerializer) -> IndexedKeyRange<K>
     where
         T: Indexed,
         K: IndexedKeyBounds<T>,
     {
-        IndexedKeyRange::Bound(K::lower_key(room_id, serializer), K::upper_key(room_id, serializer))
+        IndexedKeyRange::Bound(K::lower_key(serializer), K::upper_key(serializer))
     }
 
     pub fn all_with_prefix<T, P>(prefix: P, serializer: &IndexeddbSerializer) -> IndexedKeyRange<K>