Skip to content

Commit

Permalink
Fix tests
Browse files Browse the repository at this point in the history 
Former-commit-id: 05304f99aba4d3053611c61a41413a95301a8ad1
  • Loading branch information
@stanislav-tkach
stanislav-tkach committed Jul 13, 2017
1 parent 39f87f4 commit 02a2f53
Show file tree
Hide file tree
Showing 4 changed files with 88 additions and 88 deletions.
6 changes: 3 additions & 3 deletions exonum/src/storage/entry.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ where
/// let mut fork = db.fork();
/// let mut index = Entry::new(vec![1, 2, 3], &mut fork);
/// index.set(10);
/// assert!(Some(10), index.get());
/// assert_eq!(Some(10), index.get());
/// ```
pub fn set(&mut self, value: V) {
self.base.put(&(), value)
Expand All @@ -153,9 +153,9 @@ where
/// let mut fork = db.fork();
/// let mut index = Entry::new(vec![1, 2, 3], &mut fork);
/// index.set(10);
/// assert!(Some(10), index.get());
/// assert_eq!(Some(10), index.get());
/// index.remove();
/// assert!(None, index.get());
/// assert_eq!(None, index.get());
/// ```
pub fn remove(&mut self) {
self.base.remove(&())
Expand Down
24 changes: 12 additions & 12 deletions exonum/src/storage/key_set_index.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ where
/// use exonum::storage::{MemoryDB, Database, KeySetIndex};
///
/// let db = MemoryDB::new();
/// let fork = db.fork();
/// let mut index: = KeySetIndex::new(vec![1, 2, 3], &mut fork);
/// let mut fork = db.fork();
/// let mut index = KeySetIndex::new(vec![1, 2, 3], &mut fork);
/// assert!(!index.contains(&1));
/// index.insert(1);
/// assert!(index.contains(&1));
Expand All @@ -100,8 +100,8 @@ where
/// use exonum::storage::{MemoryDB, Database, KeySetIndex};
///
/// let db = MemoryDB::new();
/// let fork = db.fork();
/// let mut index: = KeySetIndex::new(vec![1, 2, 3], &mut fork);
/// let mut fork = db.fork();
/// let mut index = KeySetIndex::new(vec![1, 2, 3], &mut fork);
/// index.insert(1);
/// index.insert(2);
/// index.insert(3);
Expand All @@ -122,8 +122,8 @@ where
/// use exonum::storage::{MemoryDB, Database, KeySetIndex};
///
/// let db = MemoryDB::new();
/// let fork = db.fork();
/// let mut index: = KeySetIndex::new(vec![1, 2, 3], &mut fork);
/// let mut fork = db.fork();
/// let mut index = KeySetIndex::new(vec![1, 2, 3], &mut fork);
/// index.insert(1);
/// index.insert(2);
/// index.insert(3);
Expand All @@ -148,8 +148,8 @@ where
/// use exonum::storage::{MemoryDB, Database, KeySetIndex};
///
/// let db = MemoryDB::new();
/// let fork = db.fork();
/// let mut index: = KeySetIndex::new(vec![1, 2, 3], &mut fork);
/// let mut fork = db.fork();
/// let mut index = KeySetIndex::new(vec![1, 2, 3], &mut fork);
/// index.insert(1);
/// assert!(index.contains(&1));
/// ```
Expand All @@ -165,8 +165,8 @@ where
/// use exonum::storage::{MemoryDB, Database, KeySetIndex};
///
/// let db = MemoryDB::new();
/// let fork = db.fork();
/// let mut index: = KeySetIndex::new(vec![1, 2, 3], &mut fork);
/// let mut fork = db.fork();
/// let mut index = KeySetIndex::new(vec![1, 2, 3], &mut fork);
/// index.insert(1);
/// assert!(index.contains(&1));
/// index.remove(&1);
Expand All @@ -189,8 +189,8 @@ where
/// use exonum::storage::{MemoryDB, Database, KeySetIndex};
///
/// let db = MemoryDB::new();
/// let fork = db.fork();
/// let mut index: = KeySetIndex::new(vec![1, 2, 3], &mut fork);
/// let mut fork = db.fork();
/// let mut index = KeySetIndex::new(vec![1, 2, 3], &mut fork);
/// index.insert(1);
/// assert!(index.contains(&1));
/// index.clear();
Expand Down
68 changes: 34 additions & 34 deletions exonum/src/storage/list_index.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ where
/// use exonum::storage::{MemoryDB, Database, ListIndex};
///
/// let db = MemoryDB::new();
/// let snapshot = db.snapshot();
/// let mut index = ListIndex::new(vec![1, 2, 3], &snapshot);
/// let mut fork = db.fork();
/// let mut index = ListIndex::new(vec![1, 2, 3], &mut fork);
/// assert_eq!(None, index.get(0));
/// index.push(42);
/// assert_eq!(Some(42), index.get(0));
Expand All @@ -103,8 +103,8 @@ where
/// use exonum::storage::{MemoryDB, Database, ListIndex};
///
/// let db = MemoryDB::new();
/// let snapshot = db.snapshot();
/// let mut index = ListIndex::new(vec![1, 2, 3], &snapshot);
/// let mut fork = db.fork();
/// let mut index = ListIndex::new(vec![1, 2, 3], &mut fork);
/// assert_eq!(None, index.last());
/// index.push(42);
/// assert_eq!(Some(42), index.last());
Expand All @@ -124,8 +124,8 @@ where
/// use exonum::storage::{MemoryDB, Database, ListIndex};
///
/// let db = MemoryDB::new();
/// let snapshot = db.snapshot();
/// let mut index = ListIndex::new(vec![1, 2, 3], &snapshot);
/// let mut fork = db.fork();
/// let mut index = ListIndex::new(vec![1, 2, 3], &mut fork);
/// assert!(index.is_empty());
/// index.push(42);
/// assert!(!index.is_empty());
Expand All @@ -142,8 +142,8 @@ where
/// use exonum::storage::{MemoryDB, Database, ListIndex};
///
/// let db = MemoryDB::new();
/// let snapshot = db.snapshot();
/// let mut index = ListIndex::new(vec![1, 2, 3], &snapshot);
/// let mut fork = db.fork();
/// let mut index = ListIndex::new(vec![1, 2, 3], &mut fork);
/// assert_eq!(0, index.len());
/// index.push(10);
/// assert_eq!(1, index.len());
Expand All @@ -164,12 +164,12 @@ where
/// # Examples
///
/// ```
/// use exonum::storage::{MemoryDB, Database, KeySetIndex};
/// use exonum::storage::{MemoryDB, Database, ListIndex};
///
/// let db = MemoryDB::new();
/// let fork = db.fork();
/// let mut index: = ListIndexIter::new(vec![1, 2, 3], &mut fork);
/// index.extend([1, 2, 3, 4, 5].iter());
/// let mut fork = db.fork();
/// let mut index = ListIndex::new(vec![1, 2, 3], &mut fork);
/// index.extend([1, 2, 3, 4, 5].iter().cloned());
/// for val in index.iter() {
/// println!("{}", val);
/// }
Expand All @@ -184,12 +184,12 @@ where
/// # Examples
///
/// ```
/// use exonum::storage::{MemoryDB, Database, KeySetIndex};
/// use exonum::storage::{MemoryDB, Database, ListIndex};
///
/// let db = MemoryDB::new();
/// let fork = db.fork();
/// let mut index: = ListIndexIter::new(vec![1, 2, 3], &mut fork);
/// index.extend([1, 2, 3, 4, 5].iter());
/// let mut fork = db.fork();
/// let mut index = ListIndex::new(vec![1, 2, 3], &mut fork);
/// index.extend([1, 2, 3, 4, 5].iter().cloned());
/// for val in index.iter_from(3) {
/// println!("{}", val);
/// }
Expand All @@ -216,8 +216,8 @@ where
/// use exonum::storage::{MemoryDB, Database, ListIndex};
///
/// let db = MemoryDB::new();
/// let snapshot = db.snapshot();
/// let mut index = ListIndex::new(vec![1, 2, 3], &snapshot);
/// let mut fork = db.fork();
/// let mut index = ListIndex::new(vec![1, 2, 3], &mut fork);
/// index.push(1);
/// assert!(!index.is_empty());
/// ```
Expand All @@ -235,11 +235,11 @@ where
/// use exonum::storage::{MemoryDB, Database, ListIndex};
///
/// let db = MemoryDB::new();
/// let snapshot = db.snapshot();
/// let mut index = ListIndex::new(vec![1, 2, 3], &snapshot);
/// assert_eq!(None, !index.pop());
/// let mut fork = db.fork();
/// let mut index = ListIndex::new(vec![1, 2, 3], &mut fork);
/// assert_eq!(None, index.pop());
/// index.push(1);
/// assert_eq!(Some(1), !index.pop());
/// assert_eq!(Some(1), index.pop());
/// ```
pub fn pop(&mut self) -> Option<V> {
// TODO: shoud we get and return dropped value?
Expand All @@ -262,10 +262,10 @@ where
/// use exonum::storage::{MemoryDB, Database, ListIndex};
///
/// let db = MemoryDB::new();
/// let snapshot = db.snapshot();
/// let mut index = ListIndex::new(vec![1, 2, 3], &snapshot);
/// let mut fork = db.fork();
/// let mut index = ListIndex::new(vec![1, 2, 3], &mut fork);
/// assert!(index.is_empty());
/// index.extend([1, 2, 3].iter());
/// index.extend([1, 2, 3].iter().cloned());
/// assert_eq!(3, index.len());
/// ```
pub fn extend<I>(&mut self, iter: I)
Expand All @@ -291,9 +291,9 @@ where
/// use exonum::storage::{MemoryDB, Database, ListIndex};
///
/// let db = MemoryDB::new();
/// let snapshot = db.snapshot();
/// let mut index = ListIndex::new(vec![1, 2, 3], &snapshot);
/// index.extend([1, 2, 3, 4, 5].iter());
/// let mut fork = db.fork();
/// let mut index = ListIndex::new(vec![1, 2, 3], &mut fork);
/// index.extend([1, 2, 3, 4, 5].iter().cloned());
/// assert_eq!(5, index.len());
/// index.truncate(3);
/// assert_eq!(3, index.len());
Expand All @@ -317,8 +317,8 @@ where
/// use exonum::storage::{MemoryDB, Database, ListIndex};
///
/// let db = MemoryDB::new();
/// let snapshot = db.snapshot();
/// let mut index = ListIndex::new(vec![1, 2, 3], &snapshot);
/// let mut fork = db.fork();
/// let mut index = ListIndex::new(vec![1, 2, 3], &mut fork);
/// index.push(1);
/// assert_eq!(Some(1), index.get(0));
/// index.set(0, 10);
Expand Down Expand Up @@ -349,12 +349,12 @@ where
/// use exonum::storage::{MemoryDB, Database, ListIndex};
///
/// let db = MemoryDB::new();
/// let snapshot = db.snapshot();
/// let mut index = ListIndex::new(vec![1, 2, 3], &snapshot);
/// let mut fork = db.fork();
/// let mut index = ListIndex::new(vec![1, 2, 3], &mut fork);
/// index.push(1);
/// assert_eq!(!index.is_empty());
/// assert!(!index.is_empty());
/// index.clear();
/// assert_eq!(index.is_empty());
/// assert!(index.is_empty());
/// ```
pub fn clear(&mut self) {
self.length.set(Some(0));
Expand Down
78 changes: 39 additions & 39 deletions exonum/src/storage/map_index.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,16 +145,16 @@ where
/// # Examples
///
/// ```
/// use exonum::storage::{MemoryDB, Database, MapIndexKeys};
/// use exonum::storage::{MemoryDB, Database, MapIndex};
///
/// let db = MemoryDB::new();
/// let fork = db.fork();
/// let mut index: = MapIndexKeys::new(vec![1, 2, 3], &mut fork);
/// index.put(1, 2);
/// index.put(3, 4);
/// index.put(5, 6);
/// let mut fork = db.fork();
/// let mut index = MapIndex::new(vec![1, 2, 3], &mut fork);
/// index.put(&1, 2);
/// index.put(&3, 4);
/// index.put(&5, 6);
/// for v in index.iter() {
/// println!("{}", v);
/// println!("{:?}", v);
/// }
/// ```
pub fn iter(&self) -> MapIndexIter<K, V> {
Expand All @@ -167,14 +167,14 @@ where
/// # Examples
///
/// ```
/// use exonum::storage::{MemoryDB, Database, MapIndexKeys};
/// use exonum::storage::{MemoryDB, Database, MapIndex};
///
/// let db = MemoryDB::new();
/// let fork = db.fork();
/// let mut index: = MapIndexKeys::new(vec![1, 2, 3], &mut fork);
/// index.put(1, 2);
/// index.put(3, 4);
/// index.put(5, 6);
/// let mut fork = db.fork();
/// let mut index = MapIndex::new(vec![1, 2, 3], &mut fork);
/// index.put(&1, 2);
/// index.put(&3, 4);
/// index.put(&5, 6);
/// for key in index.keys() {
/// println!("{}", key);
/// }
Expand All @@ -189,14 +189,14 @@ where
/// # Examples
///
/// ```
/// use exonum::storage::{MemoryDB, Database, MapIndexKeys};
/// use exonum::storage::{MemoryDB, Database, MapIndex};
///
/// let db = MemoryDB::new();
/// let fork = db.fork();
/// let mut index: = MapIndexKeys::new(vec![1, 2, 3], &mut fork);
/// index.put(1, 2);
/// index.put(3, 4);
/// index.put(5, 6);
/// let mut fork = db.fork();
/// let mut index = MapIndex::new(vec![1, 2, 3], &mut fork);
/// index.put(&1, 2);
/// index.put(&3, 4);
/// index.put(&5, 6);
/// for val in index.values() {
/// println!("{}", val);
/// }
Expand All @@ -211,16 +211,16 @@ where
/// # Examples
///
/// ```
/// use exonum::storage::{MemoryDB, Database, MapIndexKeys};
/// use exonum::storage::{MemoryDB, Database, MapIndex};
///
/// let db = MemoryDB::new();
/// let fork = db.fork();
/// let mut index: = MapIndexKeys::new(vec![1, 2, 3], &mut fork);
/// index.put(1, 2);
/// index.put(3, 4);
/// index.put(5, 6);
/// let mut fork = db.fork();
/// let mut index = MapIndex::new(vec![1, 2, 3], &mut fork);
/// index.put(&1, 2);
/// index.put(&3, 4);
/// index.put(&5, 6);
/// for v in index.iter_from(&2) {
/// println!("{}", v);
/// println!("{:?}", v);
/// }
/// ```
pub fn iter_from(&self, from: &K) -> MapIndexIter<K, V> {
Expand All @@ -233,14 +233,14 @@ where
/// # Examples
///
/// ```
/// use exonum::storage::{MemoryDB, Database, MapIndexKeys};
/// use exonum::storage::{MemoryDB, Database, MapIndex};
///
/// let db = MemoryDB::new();
/// let fork = db.fork();
/// let mut index: = MapIndexKeys::new(vec![1, 2, 3], &mut fork);
/// index.put(1, 2);
/// index.put(3, 4);
/// index.put(5, 6);
/// let mut fork = db.fork();
/// let mut index = MapIndex::new(vec![1, 2, 3], &mut fork);
/// index.put(&1, 2);
/// index.put(&3, 4);
/// index.put(&5, 6);
/// for key in index.keys_from(&2) {
/// println!("{}", key);
/// }
Expand All @@ -255,14 +255,14 @@ where
/// # Examples
///
/// ```
/// use exonum::storage::{MemoryDB, Database, MapIndexKeys};
/// use exonum::storage::{MemoryDB, Database, MapIndex};
///
/// let db = MemoryDB::new();
/// let fork = db.fork();
/// let mut index: = MapIndexKeys::new(vec![1, 2, 3], &mut fork);
/// index.put(1, 2);
/// index.put(3, 4);
/// index.put(5, 6);
/// let mut fork = db.fork();
/// let mut index = MapIndex::new(vec![1, 2, 3], &mut fork);
/// index.put(&1, 2);
/// index.put(&3, 4);
/// index.put(&5, 6);
/// for val in index.values_from(&2) {
/// println!("{}", val);
/// }
Expand Down Expand Up @@ -328,7 +328,7 @@ where
/// let mut index = MapIndex::new(vec![1, 2, 3], &mut fork);
/// index.put(&1, 2);
/// assert!(index.contains(&1));
/// index.clear(&1);
/// index.clear();
/// assert!(!index.contains(&1));
pub fn clear(&mut self) {
self.base.clear()
Expand Down

0 comments on commit 02a2f53

Please sign in to comment.