Skip to content

Commit 35505f9

Browse files
mgoldenbergHywan
authored andcommitted
refactor(indexeddb): remove room id argument from Indexed::to_indexed
Signed-off-by: Michael Goldenberg <[email protected]>
1 parent a6d6302 commit 35505f9

File tree

3 files changed

+8
-13
lines changed

3 files changed

+8
-13
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,8 @@ impl IndexeddbEventCacheStoreSerializer {
163163
T: Indexed,
164164
T::IndexedType: Serialize,
165165
{
166-
let indexed = t
167-
.to_indexed(room_id, &self.inner)
168-
.map_err(IndexeddbEventCacheStoreSerializerError::Indexing)?;
166+
let indexed =
167+
t.to_indexed(&self.inner).map_err(IndexeddbEventCacheStoreSerializerError::Indexing)?;
169168
serde_wasm_bindgen::to_value(&indexed).map_err(Into::into)
170169
}
171170

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ pub trait Indexed: Sized {
3535
/// Converts the high-level type into an indexed type.
3636
fn to_indexed(
3737
&self,
38-
room_id: &RoomId,
3938
serializer: &IndexeddbSerializer,
4039
) -> Result<Self::IndexedType, Self::Error>;
4140

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

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -224,17 +224,16 @@ impl Indexed for Chunk {
224224

225225
fn to_indexed(
226226
&self,
227-
room_id: &RoomId,
228227
serializer: &IndexeddbSerializer,
229228
) -> Result<Self::IndexedType, Self::Error> {
230229
Ok(IndexedChunk {
231230
id: <IndexedChunkIdKey as IndexedKey<Chunk>>::encode(
232-
room_id,
231+
&self.room_id,
233232
ChunkIdentifier::new(self.identifier),
234233
serializer,
235234
),
236235
next: IndexedNextChunkIdKey::encode(
237-
room_id,
236+
&self.room_id,
238237
self.next.map(ChunkIdentifier::new),
239238
serializer,
240239
),
@@ -384,17 +383,16 @@ impl Indexed for Event {
384383

385384
fn to_indexed(
386385
&self,
387-
room_id: &RoomId,
388386
serializer: &IndexeddbSerializer,
389387
) -> Result<Self::IndexedType, Self::Error> {
390388
let event_id = self.event_id().ok_or(Self::Error::NoEventId)?;
391-
let id = IndexedEventIdKey::encode(room_id, &event_id, serializer);
389+
let id = IndexedEventIdKey::encode(self.room_id(), &event_id, serializer);
392390
let position = self
393391
.position()
394-
.map(|position| IndexedEventPositionKey::encode(room_id, position, serializer));
392+
.map(|position| IndexedEventPositionKey::encode(self.room_id(), position, serializer));
395393
let relation = self.relation().map(|(related_event, relation_type)| {
396394
IndexedEventRelationKey::encode(
397-
room_id,
395+
self.room_id(),
398396
(&related_event, &RelationType::from(relation_type)),
399397
serializer,
400398
)
@@ -564,12 +562,11 @@ impl Indexed for Gap {
564562

565563
fn to_indexed(
566564
&self,
567-
room_id: &RoomId,
568565
serializer: &IndexeddbSerializer,
569566
) -> Result<Self::IndexedType, Self::Error> {
570567
Ok(IndexedGap {
571568
id: <IndexedGapIdKey as IndexedKey<Gap>>::encode(
572-
room_id,
569+
&self.room_id,
573570
ChunkIdentifier::new(self.chunk_identifier),
574571
serializer,
575572
),

0 commit comments

Comments
 (0)