Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Frame-support storage: make iterations and translate consistent #5470

Merged
5 commits merged into from
Sep 15, 2020
Merged

Frame-support storage: make iterations and translate consistent #5470

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
42c73f7
implementation and factorisation
gui1117 Sep 9, 2020
fed1fda
factorize test
gui1117 Sep 9, 2020
3b5b4b0
doc
gui1117 Sep 9, 2020
bf25dd0
fix bug and improve test
gui1117 Sep 9, 2020
8e41aa8
address suggestions
gui1117 Sep 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
factorize test
  • Loading branch information
@gui1117
gui1117 committed Sep 9, 2020
commit fed1fda3f44b8754ab76f0fb66b4ca2db75b0f1a
8 changes: 2 additions & 6 deletions frame/support/src/storage/generator/double_map.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,6 +537,7 @@ mod test_iterators {
&[prefix.clone(), vec![1, 2, 3]].concat(),
&3u64.encode()
);

// Wrong key2
unhashed::put(
&[prefix.clone(), crate::Blake2_128Concat::hash(&1u16.encode())].concat(),
Expand All @@ -556,12 +557,7 @@ mod test_iterators {
DoubleMap::translate(|_k1, _k2, v: u64| Some(v*2));
assert_eq!(
DoubleMap::iter().collect::<Vec<_>>(),
vec![
(3, 3, 6),
(0, 0, 0),
(2, 2, 4),
(1, 1, 2),
]
vec![(3, 3, 6), (0, 0, 0), (2, 2, 4), (1, 1, 2)],
);
})
}
Expand Down
35 changes: 6 additions & 29 deletions frame/support/src/storage/generator/map.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,20 +374,11 @@ mod test_iterators {
Map::insert(i as u16, i as u64);
}

assert_eq!(
Map::iter().collect::<Vec<_>>(),
vec![(3, 3), (0, 0), (2, 2), (1, 1)],
);
assert_eq!(Map::iter().collect::<Vec<_>>(), vec![(3, 3), (0, 0), (2, 2), (1, 1)]);

assert_eq!(
Map::iter_values().collect::<Vec<_>>(),
vec![3, 0, 2, 1],
);
assert_eq!(Map::iter_values().collect::<Vec<_>>(), vec![3, 0, 2, 1]);

assert_eq!(
Map::drain().collect::<Vec<_>>(),
vec![(3, 3), (0, 0), (2, 2), (1, 1)],
);
assert_eq!(Map::drain().collect::<Vec<_>>(), vec![(3, 3), (0, 0), (2, 2), (1, 1)]);

assert_eq!(Map::iter().collect::<Vec<_>>(), vec![]);
assert_eq!(unhashed::get(&key_before_prefix(prefix.clone())), Some(1u64));
Expand All @@ -403,30 +394,16 @@ mod test_iterators {
}

// Wrong key
unhashed::put(
&[prefix.clone(), vec![1, 2, 3]].concat(),
&3u64.encode()
);
unhashed::put(&[prefix.clone(), vec![1, 2, 3]].concat(), &3u64.encode());

// Wrong value
unhashed::put(
&[
prefix.clone(),
crate::Blake2_128Concat::hash(&6u16.encode()),
].concat(),
&[prefix.clone(), crate::Blake2_128Concat::hash(&6u16.encode())].concat(),
&vec![1],
);

Map::translate(|_k1, v: u64| Some(v*2));
assert_eq!(
Map::iter().collect::<Vec<_>>(),
vec![
(3, 6),
(0, 0),
(2, 4),
(1, 2),
]
);
assert_eq!(Map::iter().collect::<Vec<_>>(), vec![(3, 6), (0, 0), (2, 4), (1, 2)]);
})
}
}