Rename CwIntKey into IntKey

CosmWasm · Jan 3, 2022 · 6aa82e4 · 6aa82e4
1 parent 6b595b5
commit 6aa82e4
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 11 deletions.
diff --git a/packages/storage-plus/src/de.rs b/packages/storage-plus/src/de.rs
@@ -3,7 +3,7 @@ use std::convert::TryInto;
 
 use cosmwasm_std::{Addr, StdError, StdResult};
 
-use crate::int_key::CwIntKey;
+use crate::int_key::IntKey;
 
 pub trait KeyDeserialize {
     type Output: Sized;

diff --git a/packages/storage-plus/src/int_key.rs b/packages/storage-plus/src/int_key.rs
@@ -4,8 +4,7 @@ use std::mem;
 /// but "sign-flipped" (xored msb) big-endian bytes for signed ints.
 ///
 /// So that the representation of signed integers is in the right lexicographical order.
-// TODO: Rename to `IntKey` after deprecating current `IntKey` (https://github.com/CosmWasm/cw-plus/issues/570)
-pub trait CwIntKey: Sized + Copy {
+pub trait IntKey: Sized + Copy {
     type Buf: AsRef<[u8]> + AsMut<[u8]> + Into<Vec<u8>> + Default;
 
     fn to_cw_bytes(&self) -> Self::Buf;
@@ -14,7 +13,7 @@ pub trait CwIntKey: Sized + Copy {
 
 macro_rules! cw_uint_keys {
     (for $($t:ty),+) => {
-        $(impl CwIntKey for $t {
+        $(impl IntKey for $t {
             type Buf = [u8; mem::size_of::<$t>()];
 
             #[inline]
@@ -34,7 +33,7 @@ cw_uint_keys!(for u8, u16, u32, u64, u128);
 
 macro_rules! cw_int_keys {
     (for $($t:ty, $ut:ty),+) => {
-        $(impl CwIntKey for $t {
+        $(impl IntKey for $t {
             type Buf = [u8; mem::size_of::<$t>()];
 
             #[inline]

diff --git a/packages/storage-plus/src/keys.rs b/packages/storage-plus/src/keys.rs
@@ -2,7 +2,7 @@ use cosmwasm_std::Addr;
 
 use crate::de::KeyDeserialize;
 use crate::helpers::namespaces_with_key;
-use crate::int_key::CwIntKey;
+use crate::int_key::IntKey;
 
 #[derive(Debug)]
 pub enum Key<'a> {

diff --git a/packages/storage-plus/src/lib.rs b/packages/storage-plus/src/lib.rs
@@ -26,7 +26,7 @@ pub use indexes::MultiIndex;
 pub use indexes::UniqueIndex;
 #[cfg(feature = "iterator")]
 pub use indexes::{index_string, index_string_tuple, index_triple, index_tuple, Index};
-pub use int_key::CwIntKey;
+pub use int_key::IntKey;
 pub use item::Item;
 pub use keys::{Key, Prefixer, PrimaryKey};
 pub use keys_old::IntKeyOld;

diff --git a/packages/storage-plus/src/map.rs b/packages/storage-plus/src/map.rs
@@ -254,7 +254,7 @@ mod test {
     #[cfg(feature = "iterator")]
     use cosmwasm_std::{Order, StdResult};
 
-    use crate::int_key::CwIntKey;
+    use crate::int_key::IntKey;
     use crate::keys_old::IntKeyOld;
 
     #[derive(Serialize, Deserialize, PartialEq, Debug, Clone)]

diff --git a/packages/storage-plus/src/prefix.rs b/packages/storage-plus/src/prefix.rs
@@ -8,7 +8,7 @@ use std::ops::Deref;
 
 use crate::de::KeyDeserialize;
 use crate::helpers::{namespaces_with_key, nested_namespaces_with_key};
-use crate::int_key::CwIntKey;
+use crate::int_key::IntKey;
 use crate::iter_helpers::{concat, deserialize_kv, deserialize_v, trim};
 use crate::keys::Key;
 use crate::{Endian, Prefixer};
@@ -35,12 +35,12 @@ impl Bound {
     }
 
     /// Turns an int, like Option<u32> into an inclusive bound
-    pub fn inclusive_int<T: CwIntKey + Endian>(limit: T) -> Self {
+    pub fn inclusive_int<T: IntKey + Endian>(limit: T) -> Self {
         Bound::Inclusive(limit.to_cw_bytes().into())
     }
 
     /// Turns an int, like Option<u64> into an exclusive bound
-    pub fn exclusive_int<T: CwIntKey + Endian>(limit: T) -> Self {
+    pub fn exclusive_int<T: IntKey + Endian>(limit: T) -> Self {
         Bound::Exclusive(limit.to_cw_bytes().into())
     }
 }