pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-04-26 21:37:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add BoundedBTreeMap to frame_support::storage (#8745)

Browse Source 
* Add `BoundedBTreeMap` to `frame_support::storage`

Part of https://github.com/paritytech/substrate/issues/8719.

* max_encoded_len will never encode length > bound

* requiring users to maintain an unchecked invariant is unsafe

* only impl debug when std

* add some marker traits

* add tests
This commit is contained in:
Peter Goodspeed-Niklaus
2021-05-06 15:54:13 +02:00
committed by GitHub
parent 221aa2b865
commit db69eb04bb
3 changed files with 431 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/frame/support/src/storage/bounded_vec.rs
+8 -15
View File
@@ -58,22 +58,14 @@ impl<T: BoundedVecValue, S: Get<u32>> BoundedVec<T, S> {
}
/// Create `Self` from `t` without any checks.
///
/// # WARNING
///
/// Only use when you are sure you know what you are doing.
fn unchecked_from(t: Vec<T>) -> Self {
unsafe fn unchecked_from(t: Vec<T>) -> Self {
Self(t, Default::default())
}
/// Create `Self` from `t` without any checks. Logs warnings if the bound is not being
/// respected. The additional scope can be used to indicate where a potential overflow is
/// happening.
///
/// # WARNING
///
/// Only use when you are sure you know what you are doing.
pub fn force_from(t: Vec<T>, scope: Option<&'static str>) -> Self {
pub unsafe fn force_from(t: Vec<T>, scope: Option<&'static str>) -> Self {
if t.len() > Self::bound() {
log::warn!(
target: crate::LOG_TARGET,
@@ -166,7 +158,8 @@ impl<T: BoundedVecValue, S: Get<u32>> TryFrom<Vec<T>> for BoundedVec<T, S> {
type Error = ();
fn try_from(t: Vec<T>) -> Result<Self, Self::Error> {
if t.len() <= Self::bound() {
Ok(Self::unchecked_from(t))
// explicit check just above
Ok(unsafe {Self::unchecked_from(t)})
} else {
Err(())
}
@@ -434,11 +427,11 @@ pub mod test {
// append to a non-existing
assert!(FooMap::get(2).is_none());
assert_ok!(FooMap::try_append(2, 4));
assert_eq!(FooMap::get(2).unwrap(), BoundedVec::<u32, Seven>::unchecked_from(vec![4]));
assert_eq!(FooMap::get(2).unwrap(), unsafe {BoundedVec::<u32, Seven>::unchecked_from(vec![4])});
assert_ok!(FooMap::try_append(2, 5));
assert_eq!(
FooMap::get(2).unwrap(),
BoundedVec::<u32, Seven>::unchecked_from(vec![4, 5])
unsafe {BoundedVec::<u32, Seven>::unchecked_from(vec![4, 5])}
);
});
@@ -458,12 +451,12 @@ pub mod test {
assert_ok!(FooDoubleMap::try_append(2, 1, 4));
assert_eq!(
FooDoubleMap::get(2, 1).unwrap(),
BoundedVec::<u32, Seven>::unchecked_from(vec![4])
unsafe {BoundedVec::<u32, Seven>::unchecked_from(vec![4])}
);
assert_ok!(FooDoubleMap::try_append(2, 1, 5));
assert_eq!(
FooDoubleMap::get(2, 1).unwrap(),
BoundedVec::<u32, Seven>::unchecked_from(vec![4, 5])
unsafe {BoundedVec::<u32, Seven>::unchecked_from(vec![4, 5])}
);
});
}