Merge pull request #67 from CosmWasm/start-end-bound

Use same bound type for start and end of iteration
CosmWasm · Sep 23, 2024 · ded4533 · ded4533
2 parents 55f0234 + a267fda
commit ded4533
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 17 deletions.
diff --git a/packages/storey/src/containers/column.rs b/packages/storey/src/containers/column.rs
@@ -558,28 +558,73 @@ mod tests {
         access.push(&2).unwrap();
         access.remove(2).unwrap();
 
+        // start and end set
         assert_eq!(
             access
                 .bounded_pairs(Some(1), Some(4))
                 .collect::<Result<Vec<_>, _>>()
                 .unwrap(),
             vec![(1, 42), (3, 1)]
         );
-
         assert_eq!(
             access
                 .bounded_keys(Some(1), Some(4))
                 .collect::<Result<Vec<_>, _>>()
                 .unwrap(),
             vec![1, 3]
         );
-
         assert_eq!(
             access
                 .bounded_values(Some(1), Some(4))
                 .collect::<Result<Vec<_>, _>>()
                 .unwrap(),
             vec![42, 1]
         );
+
+        // end unset
+        assert_eq!(
+            access
+                .bounded_pairs(Some(1), None)
+                .collect::<Result<Vec<_>, _>>()
+                .unwrap(),
+            vec![(1, 42), (3, 1), (4, 2)]
+        );
+        assert_eq!(
+            access
+                .bounded_keys(Some(1), None)
+                .collect::<Result<Vec<_>, _>>()
+                .unwrap(),
+            vec![1, 3, 4]
+        );
+        assert_eq!(
+            access
+                .bounded_values(Some(1), None)
+                .collect::<Result<Vec<_>, _>>()
+                .unwrap(),
+            vec![42, 1, 2]
+        );
+
+        // start unset
+        assert_eq!(
+            access
+                .bounded_pairs(None, Some(4))
+                .collect::<Result<Vec<_>, _>>()
+                .unwrap(),
+            vec![(0, 1337), (1, 42), (3, 1)]
+        );
+        assert_eq!(
+            access
+                .bounded_keys(None, Some(4))
+                .collect::<Result<Vec<_>, _>>()
+                .unwrap(),
+            vec![0, 1, 3]
+        );
+        assert_eq!(
+            access
+                .bounded_values(None, Some(4))
+                .collect::<Result<Vec<_>, _>>()
+                .unwrap(),
+            vec![1337, 42, 1]
+        );
     }
 }
diff --git a/packages/storey/src/containers/mod.rs b/packages/storey/src/containers/mod.rs
@@ -125,14 +125,13 @@ pub trait IterableAccessor: Sized {
 /// in turn means the entries found between two string keys may not be the expected ones.
 pub trait BoundedIterableAccessor: IterableAccessor {
     /// Iterate over key-value pairs in this collection, respecting the given bounds.
-    fn bounded_pairs<S, E>(
+    fn bounded_pairs<B>(
         &self,
-        start: Option<S>,
-        end: Option<E>,
+        start: Option<B>,
+        end: Option<B>,
     ) -> StorableIter<'_, Self::Storable, Self::Storage>
     where
-        S: BoundFor<Self::Storable>,
-        E: BoundFor<Self::Storable>,
+        B: BoundFor<Self::Storable>,
     {
         let start = start.map(|b| b.into_bytes());
         let end = end.map(|b| b.into_bytes());
@@ -144,14 +143,13 @@ pub trait BoundedIterableAccessor: IterableAccessor {
     }
 
     /// Iterate over keys in this collection, respecting the given bounds.
-    fn bounded_keys<S, E>(
+    fn bounded_keys<B>(
         &self,
-        start: Option<S>,
-        end: Option<E>,
+        start: Option<B>,
+        end: Option<B>,
     ) -> StorableKeys<'_, Self::Storable, Self::Storage>
     where
-        S: BoundFor<Self::Storable>,
-        E: BoundFor<Self::Storable>,
+        B: BoundFor<Self::Storable>,
     {
         let start = start.map(|b| b.into_bytes());
         let end = end.map(|b| b.into_bytes());
@@ -163,14 +161,13 @@ pub trait BoundedIterableAccessor: IterableAccessor {
     }
 
     /// Iterate over values in this collection, respecting the given bounds.
-    fn bounded_values<S, E>(
+    fn bounded_values<B>(
         &self,
-        start: Option<S>,
-        end: Option<E>,
+        start: Option<B>,
+        end: Option<B>,
     ) -> StorableValues<'_, Self::Storable, Self::Storage>
     where
-        S: BoundFor<Self::Storable>,
-        E: BoundFor<Self::Storable>,
+        B: BoundFor<Self::Storable>,
     {
         let start = start.map(|b| b.into_bytes());
         let end = end.map(|b| b.into_bytes());