Merge pull request #548 from CosmWasm/530-refactor-indexes-into-module

Refactor indexes into module
CosmWasm · Nov 15, 2021 · 37d9988 · 37d9988
2 parents 30affd4 + 481d66b
commit 37d9988
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/packages/storage-plus/src/indexes.rs → packages/storage-plus/src/indexes/mod.rs b/packages/storage-plus/src/indexes.rs → packages/storage-plus/src/indexes/mod.rs
@@ -1,5 +1,10 @@
 // this module requires iterator to be useful at all
 #![cfg(feature = "iterator")]
+mod multi;
+mod unique;
+
+pub use multi::MultiIndex;
+pub use unique::UniqueIndex;
 
 use serde::de::DeserializeOwned;
 use serde::Serialize;

diff --git a/packages/storage-plus/src/multi_index.rs → packages/storage-plus/src/indexes/multi.rs b/packages/storage-plus/src/multi_index.rs → packages/storage-plus/src/indexes/multi.rs
diff --git a/packages/storage-plus/src/unique_index.rs → packages/storage-plus/src/indexes/unique.rs b/packages/storage-plus/src/unique_index.rs → packages/storage-plus/src/indexes/unique.rs
diff --git a/packages/storage-plus/src/lib.rs b/packages/storage-plus/src/lib.rs
@@ -8,29 +8,27 @@ mod item;
 mod iter_helpers;
 mod keys;
 mod map;
-mod multi_index;
 mod path;
 mod prefix;
 mod snapshot;
-mod unique_index;
 
 pub use endian::Endian;
 #[cfg(feature = "iterator")]
 pub use indexed_map::{IndexList, IndexedMap};
 #[cfg(feature = "iterator")]
 pub use indexed_snapshot::IndexedSnapshotMap;
 #[cfg(feature = "iterator")]
+pub use indexes::MultiIndex;
+#[cfg(feature = "iterator")]
+pub use indexes::UniqueIndex;
+#[cfg(feature = "iterator")]
 pub use indexes::{index_string, index_string_tuple, index_triple, index_tuple, Index};
 pub use item::Item;
 pub use keys::{I128Key, I16Key, I32Key, I64Key, I8Key};
 pub use keys::{Prefixer, PrimaryKey, U128Key, U16Key, U32Key, U64Key, U8Key};
 pub use map::Map;
-#[cfg(feature = "iterator")]
-pub use multi_index::MultiIndex;
 pub use path::Path;
 #[cfg(feature = "iterator")]
 pub use prefix::{range_with_prefix, Bound, Prefix};
 #[cfg(feature = "iterator")]
 pub use snapshot::{SnapshotItem, SnapshotMap, Strategy};
-#[cfg(feature = "iterator")]
-pub use unique_index::UniqueIndex;