[fix] Change output params from Vec<...> to impl IntoIterator (#3740)

Signed-off-by: VAmuzing <[email protected]>

client/src/client.rs

@@ -980,7 +980,7 @@ impl Client {
                     .join(uri::PENDING_TRANSACTIONS)
                     .expect("Valid URI"),
             )
-            .params(&pagination)
+            .params(pagination.clone())
             .headers(self.headers.clone())
             .build()?
             .send()?;

data_model/src/query/pagination.rs

@@ -39,18 +39,21 @@ pub struct Pagination {
 }
 
 impl Pagination {
-    /// Converts self to Vec of tuples to be used in queries
+    /// Converts self to iterator of tuples to be used in queries
     ///
-    /// The length of the output Vec is not constant and it's in (0..3)
-    pub fn into_query_parameters(self) -> Vec<(&'static str, NonZeroU64)> {
-        match (self.start, self.limit) {
+    /// The length of the output iterator is not constant and it's in (0..3)
+    pub fn into_query_parameters(
+        self,
+    ) -> impl IntoIterator<Item = (&'static str, NonZeroU64)> + Clone {
+        let result_vec = match (self.start, self.limit) {
             (Some(start), Some(limit)) => {
                 vec![(PAGINATION_LIMIT, limit.into()), (PAGINATION_START, start)]
             }
             (Some(start), None) => vec![(PAGINATION_START, start)],
             (None, Some(limit)) => vec![(PAGINATION_LIMIT, limit.into())],
             (None, None) => Vec::new(),
-        }
+        };
+        result_vec.into_iter()
     }
 }
 

data_model/src/query/sorting.rs

@@ -39,12 +39,13 @@ impl Sorting {
 }
 
 impl Sorting {
-    /// Converts self to Vec of tuples to be used in queries
+    /// Converts self to iterator of tuples to be used in queries
     ///
-    /// The length of the output Vec is not constant and it's in (0..3)
-    pub fn into_query_parameters(self) -> Vec<(&'static str, Name)> {
+    /// The length of the output iterator is not constant and has either 0 or 1 value
+    pub fn into_query_parameters(self) -> impl IntoIterator<Item = (&'static str, Name)> + Clone {
         self.sort_by_metadata_key
-            .map_or(Vec::new(), |key| vec![(SORT_BY_KEY, key)])
+            .map(|key| (SORT_BY_KEY, key))
+            .into_iter()
     }
 }