Skip to content

Commit 0ee89c8

Browse files
committed
refactor(event cache): remove methods that are plain private wrappers
These two methods could be only made private now, since they're only used in `finish_back_pagination` (and in tests). But they only call inside other methods of the underlying linked chunk without any extra value, so they can be inlined instead. This reduces the public API and removes tests for other APIs that were tested some place else.
1 parent 216f0df commit 0ee89c8

File tree

1 file changed

+5
-91
lines changed
  • crates/matrix-sdk/src/event_cache/room

1 file changed

+5
-91
lines changed

crates/matrix-sdk/src/event_cache/room/events.rs

Lines changed: 5 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -99,21 +99,6 @@ impl EventLinkedChunk {
9999
self.chunks.push_gap_back(gap);
100100
}
101101

102-
/// Insert events at a specified position.
103-
pub fn insert_events_at(
104-
&mut self,
105-
position: Position,
106-
events: Vec<Event>,
107-
) -> Result<(), Error> {
108-
self.chunks.insert_items_at(position, events)?;
109-
Ok(())
110-
}
111-
112-
/// Insert a gap at a specified position.
113-
pub fn insert_gap_at(&mut self, gap: Gap, position: Position) -> Result<(), Error> {
114-
self.chunks.insert_gap_at(gap, position)
115-
}
116-
117102
/// Remove an empty chunk at the given position.
118103
///
119104
/// Note: the chunk must either be a gap, or an empty items chunk, and it
@@ -135,7 +120,7 @@ impl EventLinkedChunk {
135120
///
136121
/// This method returns the position of the (first if many) newly created
137122
/// `Chunk` that contains the `items`.
138-
pub fn replace_gap_at(
123+
fn replace_gap_at(
139124
&mut self,
140125
gap_identifier: ChunkIdentifier,
141126
events: Vec<Event>,
@@ -351,7 +336,8 @@ impl EventLinkedChunk {
351336
// before those.
352337
trace!("inserted events before the first known event");
353338

354-
self.insert_events_at(pos, events.to_vec())
339+
self.chunks
340+
.insert_items_at(pos, events.to_vec())
355341
.expect("pos is a valid position we just read above");
356342

357343
Some(pos)
@@ -373,7 +359,8 @@ impl EventLinkedChunk {
373359
let has_new_gap = new_gap.is_some();
374360
if let Some(new_gap) = new_gap {
375361
if let Some(new_pos) = insert_new_gap_pos {
376-
self.insert_gap_at(new_gap, new_pos)
362+
self.chunks
363+
.insert_gap_at(new_gap, new_pos)
377364
.expect("events_chunk_pos represents a valid chunk position");
378365
} else {
379366
self.push_gap(new_gap);
@@ -613,79 +600,6 @@ mod tests {
613600
}
614601
}
615602

616-
#[test]
617-
fn test_insert_events_at() {
618-
let (event_id_0, event_0) = new_event("$ev0");
619-
let (event_id_1, event_1) = new_event("$ev1");
620-
let (event_id_2, event_2) = new_event("$ev2");
621-
622-
let mut linked_chunk = EventLinkedChunk::new();
623-
624-
linked_chunk.push_events([event_0, event_1]);
625-
626-
let pos_ev1 = linked_chunk
627-
.events()
628-
.find_map(|(position, event)| {
629-
(event.event_id().unwrap() == event_id_1).then_some(position)
630-
})
631-
.unwrap();
632-
633-
linked_chunk.insert_events_at(pos_ev1, vec![event_2]).unwrap();
634-
635-
assert_events_eq!(
636-
linked_chunk.events(),
637-
[
638-
(event_id_0 at (0, 0)),
639-
(event_id_2 at (0, 1)),
640-
(event_id_1 at (0, 2)),
641-
]
642-
);
643-
}
644-
645-
#[test]
646-
fn test_insert_gap_at() {
647-
let (event_id_0, event_0) = new_event("$ev0");
648-
let (event_id_1, event_1) = new_event("$ev1");
649-
650-
let mut linked_chunk = EventLinkedChunk::new();
651-
652-
linked_chunk.push_events([event_0, event_1]);
653-
654-
let position_of_event_1 = linked_chunk
655-
.events()
656-
.find_map(|(position, event)| {
657-
(event.event_id().unwrap() == event_id_1).then_some(position)
658-
})
659-
.unwrap();
660-
661-
linked_chunk
662-
.insert_gap_at(Gap { prev_token: "hello".to_owned() }, position_of_event_1)
663-
.unwrap();
664-
665-
assert_events_eq!(
666-
linked_chunk.events(),
667-
[
668-
(event_id_0 at (0, 0)),
669-
(event_id_1 at (2, 0)),
670-
]
671-
);
672-
673-
{
674-
let mut chunks = linked_chunk.chunks();
675-
676-
assert_let!(Some(chunk) = chunks.next());
677-
assert!(chunk.is_items());
678-
679-
assert_let!(Some(chunk) = chunks.next());
680-
assert!(chunk.is_gap());
681-
682-
assert_let!(Some(chunk) = chunks.next());
683-
assert!(chunk.is_items());
684-
685-
assert!(chunks.next().is_none());
686-
}
687-
}
688-
689603
#[test]
690604
fn test_replace_gap_at() {
691605
let (event_id_0, event_0) = new_event("$ev0");

0 commit comments

Comments
 (0)