@@ -86,7 +86,8 @@ impl EventLinkedChunk {
86
86
/// Push events after all events or gaps.
87
87
///
88
88
/// The last event in `events` is the most recent one.
89
- pub fn push_events < I > ( & mut self , events : I )
89
+ #[ cfg( test) ]
90
+ pub ( in crate :: event_cache) fn push_events < I > ( & mut self , events : I )
90
91
where
91
92
I : IntoIterator < Item = Event > ,
92
93
I :: IntoIter : ExactSizeIterator ,
@@ -298,7 +299,7 @@ impl EventLinkedChunk {
298
299
}
299
300
}
300
301
301
- self . push_events ( events. to_vec ( ) ) ;
302
+ self . chunks . push_items_back ( events. to_vec ( ) ) ;
302
303
}
303
304
304
305
/// Finish a network back-pagination for this linked chunk by updating the
@@ -348,7 +349,7 @@ impl EventLinkedChunk {
348
349
// No prior gap, and no prior events: push the events.
349
350
trace ! ( "pushing events received from back-pagination" ) ;
350
351
351
- self . push_events ( events. to_vec ( ) ) ;
352
+ self . chunks . push_items_back ( events. to_vec ( ) ) ;
352
353
353
354
// A new gap may be inserted before the new events, if there are any.
354
355
self . events ( ) . next ( ) . map ( |( item_pos, _) | item_pos)
@@ -547,27 +548,6 @@ mod tests {
547
548
assert_eq ! ( linked_chunk. events( ) . count( ) , 0 ) ;
548
549
}
549
550
550
- #[ test]
551
- fn test_push_events ( ) {
552
- let ( event_id_0, event_0) = new_event ( "$ev0" ) ;
553
- let ( event_id_1, event_1) = new_event ( "$ev1" ) ;
554
- let ( event_id_2, event_2) = new_event ( "$ev2" ) ;
555
-
556
- let mut linked_chunk = EventLinkedChunk :: new ( ) ;
557
-
558
- linked_chunk. push_events ( [ event_0, event_1] ) ;
559
- linked_chunk. push_events ( [ event_2] ) ;
560
-
561
- assert_events_eq ! (
562
- linked_chunk. events( ) ,
563
- [
564
- ( event_id_0 at ( 0 , 0 ) ) ,
565
- ( event_id_1 at ( 0 , 1 ) ) ,
566
- ( event_id_2 at ( 0 , 2 ) ) ,
567
- ]
568
- ) ;
569
- }
570
-
571
551
#[ test]
572
552
fn test_replace_gap_at ( ) {
573
553
let ( event_id_0, event_0) = new_event ( "$ev0" ) ;
@@ -576,7 +556,7 @@ mod tests {
576
556
577
557
let mut linked_chunk = EventLinkedChunk :: new ( ) ;
578
558
579
- linked_chunk. push_events ( [ event_0] ) ;
559
+ linked_chunk. chunks . push_items_back ( [ event_0] ) ;
580
560
linked_chunk. chunks . push_gap_back ( Gap { prev_token : "hello" . to_owned ( ) } ) ;
581
561
582
562
let gap_chunk_id = linked_chunk
@@ -616,9 +596,9 @@ mod tests {
616
596
617
597
let mut linked_chunk = EventLinkedChunk :: new ( ) ;
618
598
619
- linked_chunk. push_events ( [ event_0, event_1] ) ;
599
+ linked_chunk. chunks . push_items_back ( [ event_0, event_1] ) ;
620
600
linked_chunk. chunks . push_gap_back ( Gap { prev_token : "middle" . to_owned ( ) } ) ;
621
- linked_chunk. push_events ( [ event_2] ) ;
601
+ linked_chunk. chunks . push_items_back ( [ event_2] ) ;
622
602
linked_chunk. chunks . push_gap_back ( Gap { prev_token : "end" . to_owned ( ) } ) ;
623
603
624
604
// Remove the first gap.
@@ -651,9 +631,9 @@ mod tests {
651
631
652
632
// Push some events.
653
633
let mut linked_chunk = EventLinkedChunk :: new ( ) ;
654
- linked_chunk. push_events ( [ event_0, event_1] ) ;
634
+ linked_chunk. chunks . push_items_back ( [ event_0, event_1] ) ;
655
635
linked_chunk. chunks . push_gap_back ( Gap { prev_token : "hello" . to_owned ( ) } ) ;
656
- linked_chunk. push_events ( [ event_2, event_3] ) ;
636
+ linked_chunk. chunks . push_items_back ( [ event_2, event_3] ) ;
657
637
658
638
assert_events_eq ! (
659
639
linked_chunk. events( ) ,
@@ -724,9 +704,9 @@ mod tests {
724
704
725
705
// Push some events.
726
706
let mut linked_chunk = EventLinkedChunk :: new ( ) ;
727
- linked_chunk. push_events ( [ event_0, event_1] ) ;
707
+ linked_chunk. chunks . push_items_back ( [ event_0, event_1] ) ;
728
708
linked_chunk. chunks . push_gap_back ( Gap { prev_token : "raclette" . to_owned ( ) } ) ;
729
- linked_chunk. push_events ( [ event_2] ) ;
709
+ linked_chunk. chunks . push_items_back ( [ event_2] ) ;
730
710
731
711
// Read the updates as `VectorDiff`.
732
712
let diffs = linked_chunk. updates_as_vector_diffs ( ) ;
@@ -751,7 +731,7 @@ mod tests {
751
731
752
732
// Now we can reset and see what happens.
753
733
linked_chunk. reset ( ) ;
754
- linked_chunk. push_events ( [ event_3] ) ;
734
+ linked_chunk. chunks . push_items_back ( [ event_3] ) ;
755
735
756
736
// Read the updates as `VectorDiff`.
757
737
let diffs = linked_chunk. updates_as_vector_diffs ( ) ;
@@ -773,7 +753,7 @@ mod tests {
773
753
let event_factory = EventFactory :: new ( ) . room ( & DEFAULT_TEST_ROOM_ID ) . sender ( * ALICE ) ;
774
754
775
755
let mut linked_chunk = EventLinkedChunk :: new ( ) ;
776
- linked_chunk. push_events ( vec ! [
756
+ linked_chunk. chunks . push_items_back ( vec ! [
777
757
event_factory
778
758
. text_msg( "hey" )
779
759
. event_id( event_id!( "$123456789101112131415617181920" ) )
0 commit comments