Move PaginatedResponse from lib to cache

src/cache/cache_db.rs

@@ -4,10 +4,9 @@ use std::sync::Mutex;
 
 use crate::cache::cache_container::CacheContainer;
 use crate::cache::change_set::ChangeSet;
-use crate::cache::SnapshotId;
+use crate::cache::{PaginatedResponse, SnapshotId};
 use crate::iterator::ScanDirection;
 use crate::schema::KeyDecoder;
-use crate::PaginatedResponse;
 use crate::{
     KeyCodec, Operation, ReadOnlyLock, Schema, SchemaBatch, SchemaKey, SchemaValue, SeekKeyEncoder,
     ValueCodec,

src/cache/delta_reader.rs

@@ -1,9 +1,8 @@
 //! Module with `DeltaReader`, a handler of `DB` and uncommited snapshots.
+use crate::cache::PaginatedResponse;
 use crate::iterator::{RawDbIter, ScanDirection};
 use crate::schema::{KeyCodec, KeyDecoder, ValueCodec};
-use crate::{
-    Operation, PaginatedResponse, Schema, SchemaBatch, SchemaKey, SchemaValue, SeekKeyEncoder, DB,
-};
+use crate::{Operation, Schema, SchemaBatch, SchemaKey, SchemaValue, SeekKeyEncoder, DB};
 use std::cmp::Ordering;
 use std::collections::btree_map;
 use std::iter::{Peekable, Rev};

src/cache/mod.rs

@@ -1,9 +1,21 @@
 //! All structs related to caching layer of Rockbound.
 
+use crate::Schema;
+
 pub mod cache_container;
 pub mod cache_db;
 pub mod change_set;
 pub mod delta_reader;
 
 /// Id of ChangeSet/snapshot/cache layer
 pub type SnapshotId = u64;
+
+/// Response for a paginated query which also includes the "next" key to pass.
+#[derive(Debug)]
+pub struct PaginatedResponse<S: Schema> {
+    /// A vector of storage keys and their values
+    pub key_value: Vec<(S::Key, S::Value)>,
+    /// Key indicating the first key after the final pair from key_value.
+    /// Meant to be passed in subsequent queries
+    pub next: Option<S::Key>,
+}

src/lib.rs

@@ -446,16 +446,6 @@ impl<T> From<Arc<RwLock<T>>> for ReadOnlyLock<T> {
     }
 }
 
-/// Response for a paginated query which also includes the "next" key to pass.
-#[derive(Debug)]
-pub struct PaginatedResponse<S: Schema> {
-    /// A vector of storage keys and their values
-    pub key_value: Vec<(S::Key, S::Value)>,
-    /// Key indicating the first key after the final pair from key_value.
-    /// Meant to be passed in subsequent queries
-    pub next: Option<S::Key>,
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;