Skip to content

Commit

Permalink
rename back
Browse files Browse the repository at this point in the history
  • Loading branch information
@ruseinov
ruseinov committed Feb 10, 2024
1 parent aac30b7 commit 8821a58
Show file tree
Hide file tree
Showing 8 changed files with 135 additions and 151 deletions.
14 changes: 7 additions & 7 deletions near-sdk/src/store/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
//! Maps:
//!
//! - [`LookupMap`]: Wrapper around key-value storage interactions, similar to
//! [`FrangibleUnorderedMap`]/[`std::collections::HashMap`] except that keys are not persisted and cannot be
//! [`UnorderedMap`]/[`std::collections::HashMap`] except that keys are not persisted and cannot be
//! iterated over.
//!
//! - [`FrangibleUnorderedMap`]: Storage version of [`std::collections::HashMap`]. No ordering
//! - [`UnorderedMap`]: Storage version of [`std::collections::HashMap`]. No ordering
//! guarantees.
//!
//! - [`TreeMap`](TreeMap) (`unstable`): Storage version of [`std::collections::BTreeMap`]. Ordered by key,
Expand All @@ -46,7 +46,7 @@
//!
//! - [`LookupSet`]: Non-iterable storage version of [`std::collections::HashSet`].
//!
//! - [`FrangibleUnorderedSet`]: Analogous to [`std::collections::HashSet`], and is an iterable
//! - [`UnorderedSet`]: Analogous to [`std::collections::HashSet`], and is an iterable
//! version of [`LookupSet`] and persisted to storage.
//!
//! Basic Types:
Expand Down Expand Up @@ -77,13 +77,13 @@ pub use self::lookup_map::LookupMap;
mod lookup_set;
pub use self::lookup_set::LookupSet;

pub mod frangible_map;
pub mod unordered_map;
#[allow(deprecated)]
pub use self::frangible_map::FrangibleUnorderedMap as UnorderedMap;
pub use self::unordered_map::UnorderedMap;

pub mod frangible_set;
pub mod unordered_set;
#[allow(deprecated)]
pub use self::frangible_set::FrangibleUnorderedSet as UnorderedSet;
pub use self::unordered_set::UnorderedSet;

#[cfg(feature = "unstable")]
pub mod tree_map;
Expand Down
76 changes: 38 additions & 38 deletions near-sdk/src/store/frangible_map/entry.rs → near-sdk/src/store/unordered_map/entry.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ where
/// # Examples
///
/// ```
/// use near_sdk::store::FrangibleUnorderedMap;
/// use near_sdk::store::UnorderedMap;
///
/// let mut map: FrangibleUnorderedMap<String, u32> = FrangibleUnorderedMap::new(b"m");
/// let mut map: UnorderedMap<String, u32> = UnorderedMap::new(b"m");
/// assert_eq!(map.entry("poneyland".to_string()).key(), "poneyland");
/// ```
pub fn key(&self) -> &K {
Expand All @@ -59,9 +59,9 @@ where
/// # Examples
///
/// ```
/// use near_sdk::store::FrangibleUnorderedMap;
/// use near_sdk::store::UnorderedMap;
///
/// let mut map: FrangibleUnorderedMap<String, u32> = FrangibleUnorderedMap::new(b"m");
/// let mut map: UnorderedMap<String, u32> = UnorderedMap::new(b"m");
///
/// map.entry("poneyland".to_string()).or_insert(3);
/// assert_eq!(map["poneyland"], 3);
Expand All @@ -79,9 +79,9 @@ where
/// # Examples
///
/// ```
/// use near_sdk::store::FrangibleUnorderedMap;
/// use near_sdk::store::UnorderedMap;
///
/// let mut map: FrangibleUnorderedMap<String, String> = FrangibleUnorderedMap::new(b"m");
/// let mut map: UnorderedMap<String, String> = UnorderedMap::new(b"m");
/// let s = "hoho".to_string();
///
/// map.entry("poneyland".to_string()).or_insert_with(|| s);
Expand All @@ -102,9 +102,9 @@ where
/// # Examples
///
/// ```
/// use near_sdk::store::FrangibleUnorderedMap;
/// use near_sdk::store::UnorderedMap;
///
/// let mut map: FrangibleUnorderedMap<String, u32> = FrangibleUnorderedMap::new(b"m");
/// let mut map: UnorderedMap<String, u32> = UnorderedMap::new(b"m");
///
/// map.entry("poneyland".to_string()).or_insert_with_key(|key| key.chars().count() as u32);
///
Expand All @@ -130,9 +130,9 @@ where
///
/// ```
/// # fn main() {
/// use near_sdk::store::FrangibleUnorderedMap;
/// use near_sdk::store::UnorderedMap;
///
/// let mut map: FrangibleUnorderedMap<String, Option<u32>> = FrangibleUnorderedMap::new(b"m");
/// let mut map: UnorderedMap<String, Option<u32>> = UnorderedMap::new(b"m");
/// map.entry("poneyland".to_string()).or_default();
///
/// assert_eq!(map["poneyland"], None);
Expand All @@ -154,9 +154,9 @@ where
/// # Examples
///
/// ```
/// use near_sdk::store::FrangibleUnorderedMap;
/// use near_sdk::store::UnorderedMap;
///
/// let mut map: FrangibleUnorderedMap<String, u32> = FrangibleUnorderedMap::new(b"m");
/// let mut map: UnorderedMap<String, u32> = UnorderedMap::new(b"m");
///
/// map.entry("poneyland".to_string())
/// .and_modify(|e| { *e += 1 })
Expand All @@ -179,7 +179,7 @@ where
}
}

/// View into an occupied entry in a [`UnorderedMap`](super::FrangibleUnorderedMap).
/// View into an occupied entry in a [`UnorderedMap`](super::UnorderedMap).
/// This is part of the [`Entry`] enum.
pub struct OccupiedEntry<'a, K, V>
where
Expand All @@ -203,10 +203,10 @@ where
/// # Examples
///
/// ```
/// use near_sdk::store::FrangibleUnorderedMap;
/// use near_sdk::store::frangible_map::Entry;
/// use near_sdk::store::UnorderedMap;
/// use near_sdk::store::unordered_map::Entry;
///
/// let mut map: FrangibleUnorderedMap<String, u32> = FrangibleUnorderedMap::new(b"m");
/// let mut map: UnorderedMap<String, u32> = UnorderedMap::new(b"m");
/// map.entry("poneyland".to_string()).or_insert(12);
///
/// if let Entry::Occupied(o) = map.entry("poneyland".to_string()) {
Expand All @@ -230,10 +230,10 @@ where
/// # Examples
///
/// ```
/// use near_sdk::store::FrangibleUnorderedMap;
/// use near_sdk::store::frangible_map::Entry;
/// use near_sdk::store::UnorderedMap;
/// use near_sdk::store::unordered_map::Entry;
///
/// let mut map: FrangibleUnorderedMap<String, u32> = FrangibleUnorderedMap::new(b"m");
/// let mut map: UnorderedMap<String, u32> = UnorderedMap::new(b"m");
/// map.entry("poneyland".to_string()).or_insert(12);
///
/// if let Entry::Occupied(o) = map.entry("poneyland".to_string()) {
Expand All @@ -254,10 +254,10 @@ where
/// # Examples
///
/// ```
/// use near_sdk::store::FrangibleUnorderedMap;
/// use near_sdk::store::frangible_map::Entry;
/// use near_sdk::store::UnorderedMap;
/// use near_sdk::store::unordered_map::Entry;
///
/// let mut map: FrangibleUnorderedMap<String, u32> = FrangibleUnorderedMap::new(b"m");
/// let mut map: UnorderedMap<String, u32> = UnorderedMap::new(b"m");
/// map.entry("poneyland".to_string()).or_insert(12);
///
/// assert_eq!(map["poneyland"], 12);
Expand Down Expand Up @@ -285,10 +285,10 @@ where
/// # Examples
///
/// ```
/// use near_sdk::store::FrangibleUnorderedMap;
/// use near_sdk::store::frangible_map::Entry;
/// use near_sdk::store::UnorderedMap;
/// use near_sdk::store::unordered_map::Entry;
///
/// let mut map: FrangibleUnorderedMap<String, u32> = FrangibleUnorderedMap::new(b"m");
/// let mut map: UnorderedMap<String, u32> = UnorderedMap::new(b"m");
/// map.entry("poneyland".to_string()).or_insert(12);
///
/// assert_eq!(map["poneyland"], 12);
Expand All @@ -307,10 +307,10 @@ where
/// # Examples
///
/// ```
/// use near_sdk::store::FrangibleUnorderedMap;
/// use near_sdk::store::frangible_map::Entry;
/// use near_sdk::store::UnorderedMap;
/// use near_sdk::store::unordered_map::Entry;
///
/// let mut map: FrangibleUnorderedMap<String, u32> = FrangibleUnorderedMap::new(b"m");
/// let mut map: UnorderedMap<String, u32> = UnorderedMap::new(b"m");
/// map.entry("poneyland".to_string()).or_insert(12);
///
/// if let Entry::Occupied(mut o) = map.entry("poneyland".to_string()) {
Expand All @@ -328,10 +328,10 @@ where
/// # Examples
///
/// ```
/// use near_sdk::store::FrangibleUnorderedMap;
/// use near_sdk::store::frangible_map::Entry;
/// use near_sdk::store::UnorderedMap;
/// use near_sdk::store::unordered_map::Entry;
///
/// let mut map: FrangibleUnorderedMap<String, u32> = FrangibleUnorderedMap::new(b"m");
/// let mut map: UnorderedMap<String, u32> = UnorderedMap::new(b"m");
/// map.entry("poneyland".to_string()).or_insert(12);
///
/// if let Entry::Occupied(o) = map.entry("poneyland".to_string()) {
Expand All @@ -348,7 +348,7 @@ where
}
}

/// View into a vacant entry in a [`UnorderedMap`](super::FrangibleUnorderedMap).
/// View into a vacant entry in a [`UnorderedMap`](super::UnorderedMap).
/// This is part of the [`Entry`] enum.
pub struct VacantEntry<'a, K, V>
where
Expand All @@ -373,10 +373,10 @@ where
/// # Examples
///
/// ```
/// use near_sdk::store::FrangibleUnorderedMap;
/// use near_sdk::store::frangible_map::Entry;
/// use near_sdk::store::UnorderedMap;
/// use near_sdk::store::unordered_map::Entry;
///
/// let mut map: FrangibleUnorderedMap<String, u32> = FrangibleUnorderedMap::new(b"m");
/// let mut map: UnorderedMap<String, u32> = UnorderedMap::new(b"m");
///
/// if let Entry::Vacant(v) = map.entry("poneyland".to_string()) {
/// v.into_key();
Expand All @@ -392,10 +392,10 @@ where
/// # Examples
///
/// ```
/// use near_sdk::store::FrangibleUnorderedMap;
/// use near_sdk::store::frangible_map::Entry;
/// use near_sdk::store::UnorderedMap;
/// use near_sdk::store::unordered_map::Entry;
///
/// let mut map: FrangibleUnorderedMap<String, u32> = FrangibleUnorderedMap::new(b"m");
/// let mut map: UnorderedMap<String, u32> = UnorderedMap::new(b"m");
///
/// if let Entry::Vacant(o) = map.entry("poneyland".to_string()) {
/// o.insert(37);
Expand Down
6 changes: 3 additions & 3 deletions near-sdk/src/store/frangible_map/impls.rs → near-sdk/src/store/unordered_map/impls.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ use std::borrow::Borrow;

use borsh::{BorshDeserialize, BorshSerialize};

use super::{FrangibleUnorderedMap, ToKey, ERR_NOT_EXIST};
use super::{ToKey, UnorderedMap, ERR_NOT_EXIST};
use crate::env;

impl<K, V, H> Extend<(K, V)> for FrangibleUnorderedMap<K, V, H>
impl<K, V, H> Extend<(K, V)> for UnorderedMap<K, V, H>
where
K: BorshSerialize + Ord + BorshDeserialize + Clone,
V: BorshSerialize + BorshDeserialize,
Expand All @@ -21,7 +21,7 @@ where
}
}

impl<K, V, H, Q: ?Sized> core::ops::Index<&Q> for FrangibleUnorderedMap<K, V, H>
impl<K, V, H, Q: ?Sized> core::ops::Index<&Q> for UnorderedMap<K, V, H>
where
K: BorshSerialize + Ord + Clone + Borrow<Q>,
V: BorshSerialize + BorshDeserialize,
Expand Down
Loading

0 comments on commit 8821a58

Please sign in to comment.