shorter name

Author: bnjbvr

crates/matrix-sdk-ui/src/timeline/pagination.rs

@@ -29,9 +29,7 @@ impl super::Timeline {
     pub async fn paginate_backwards(&self, num_events: u16) -> Result<bool, Error> {
         if self.inner.is_live().await {
             Ok(self
-                .live_paginate_backwards_with_options(PaginationOptions::until_num_items(
-                    num_events, 20,
-                ))
+                .live_paginate_backwards(PaginationOptions::until_num_items(num_events, 20))
                 .await?)
         } else {
             Ok(self.focused_paginate_backwards(num_events.into()).await?)
@@ -63,7 +61,7 @@ impl super::Timeline {
     ///
     /// Returns whether we hit the start of the timeline.
     #[instrument(skip_all, fields(room_id = ?self.room().room_id(), ?options))]
-    pub async fn live_paginate_backwards_with_options(
+    pub async fn live_paginate_backwards(
         &self,
         mut options: PaginationOptions<'_>,
     ) -> event_cache::Result<bool> {

crates/matrix-sdk-ui/tests/integration/timeline/pagination.rs

@@ -71,10 +71,7 @@ async fn test_back_pagination() {
         .await;
 
     let paginate = async {
-        timeline
-            .live_paginate_backwards_with_options(PaginationOptions::simple_request(10))
-            .await
-            .unwrap();
+        timeline.live_paginate_backwards(PaginationOptions::simple_request(10)).await.unwrap();
         server.reset().await;
     };
     let observe_paginating = async {
@@ -133,10 +130,7 @@ async fn test_back_pagination() {
         .mount(&server)
         .await;
 
-    timeline
-        .live_paginate_backwards_with_options(PaginationOptions::simple_request(10))
-        .await
-        .unwrap();
+    timeline.live_paginate_backwards(PaginationOptions::simple_request(10)).await.unwrap();
     assert_next_eq!(back_pagination_status, PaginationStatus::TimelineEndReached);
 }
 
@@ -201,10 +195,7 @@ async fn test_back_pagination_highlighted() {
         .mount(&server)
         .await;
 
-    timeline
-        .live_paginate_backwards_with_options(PaginationOptions::simple_request(10))
-        .await
-        .unwrap();
+    timeline.live_paginate_backwards(PaginationOptions::simple_request(10)).await.unwrap();
     server.reset().await;
 
     let first = assert_next_matches!(
@@ -272,9 +263,7 @@ async fn test_wait_for_token() {
 
     let paginate = async {
         timeline
-            .live_paginate_backwards_with_options(
-                PaginationOptions::simple_request(10).wait_for_token(),
-            )
+            .live_paginate_backwards(PaginationOptions::simple_request(10).wait_for_token())
             .await
             .unwrap();
     };
@@ -339,16 +328,10 @@ async fn test_dedup() {
 
     // If I try to paginate twice at the same time,
     let paginate_1 = async {
-        timeline
-            .live_paginate_backwards_with_options(PaginationOptions::simple_request(10))
-            .await
-            .unwrap();
+        timeline.live_paginate_backwards(PaginationOptions::simple_request(10)).await.unwrap();
     };
     let paginate_2 = async {
-        timeline
-            .live_paginate_backwards_with_options(PaginationOptions::simple_request(10))
-            .await
-            .unwrap();
+        timeline.live_paginate_backwards(PaginationOptions::simple_request(10)).await.unwrap();
     };
     timeout(Duration::from_secs(5), join(paginate_1, paginate_2)).await.unwrap();
 
@@ -439,9 +422,7 @@ async fn test_timeline_reset_while_paginating() {
 
     let paginate = async {
         timeline
-            .live_paginate_backwards_with_options(
-                PaginationOptions::simple_request(10).wait_for_token(),
-            )
+            .live_paginate_backwards(PaginationOptions::simple_request(10).wait_for_token())
             .await
             .unwrap();
     };
@@ -579,10 +560,7 @@ async fn test_empty_chunk() {
         .await;
 
     let paginate = async {
-        timeline
-            .live_paginate_backwards_with_options(PaginationOptions::simple_request(10))
-            .await
-            .unwrap();
+        timeline.live_paginate_backwards(PaginationOptions::simple_request(10)).await.unwrap();
         server.reset().await;
     };
     let observe_paginating = async {
@@ -681,10 +659,7 @@ async fn test_until_num_items_with_empty_chunk() {
         .await;
 
     let paginate = async {
-        timeline
-            .live_paginate_backwards_with_options(PaginationOptions::until_num_items(4, 4))
-            .await
-            .unwrap();
+        timeline.live_paginate_backwards(PaginationOptions::until_num_items(4, 4)).await.unwrap();
         server.reset().await;
     };
     let observe_paginating = async {

labs/multiverse/src/main.rs

@@ -344,7 +344,7 @@ impl App {
         // have been added.
         *pagination = Some(spawn(async move {
             if let Err(err) = sdk_timeline
-                .live_paginate_backwards_with_options(PaginationOptions::until_num_items(20, 10))
+                .live_paginate_backwards(PaginationOptions::until_num_items(20, 10))
                 .await
             {
                 // TODO: would be nice to be able to set the status