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

Fix generate_storage_alias! (#11102)

Browse Source 
* add test

* fix issues

* make order intuitive
This commit is contained in:
Shawn Tabrizi
2022-03-23 18:10:13 -04:00
committed by GitHub
parent 661d0ea5bb
commit 5c9f23af13
10 changed files with 45 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/frame/support/src/storage/bounded_btree_map.rs
+2 -2
View File
@@ -344,10 +344,10 @@ pub mod test {
use sp_io::TestExternalities;
crate::generate_storage_alias! { Prefix, Foo => Value<BoundedBTreeMap<u32, (), ConstU32<7>>> }
crate::generate_storage_alias! { Prefix, FooMap => Map<(u32, Twox128), BoundedBTreeMap<u32, (), ConstU32<7>>> }
crate::generate_storage_alias! { Prefix, FooMap => Map<(Twox128, u32), BoundedBTreeMap<u32, (), ConstU32<7>>> }
crate::generate_storage_alias! {
Prefix,
FooDoubleMap => DoubleMap<(u32, Twox128), (u32, Twox128), BoundedBTreeMap<u32, (), ConstU32<7>>>
FooDoubleMap => DoubleMap<(Twox128, u32), (Twox128, u32), BoundedBTreeMap<u32, (), ConstU32<7>>>
}
fn map_from_keys<K>(keys: &[K]) -> BTreeMap<K, ()>
substrate/frame/support/src/storage/bounded_btree_set.rs
+2 -2
View File
@@ -327,10 +327,10 @@ pub mod test {
use sp_std::convert::TryInto;
crate::generate_storage_alias! { Prefix, Foo => Value<BoundedBTreeSet<u32, ConstU32<7>>> }
crate::generate_storage_alias! { Prefix, FooMap => Map<(u32, Twox128), BoundedBTreeSet<u32, ConstU32<7>>> }
crate::generate_storage_alias! { Prefix, FooMap => Map<(Twox128, u32), BoundedBTreeSet<u32, ConstU32<7>>> }
crate::generate_storage_alias! {
Prefix,
FooDoubleMap => DoubleMap<(u32, Twox128), (u32, Twox128), BoundedBTreeSet<u32, ConstU32<7>>>
FooDoubleMap => DoubleMap<(Twox128, u32), (Twox128, u32), BoundedBTreeSet<u32, ConstU32<7>>>
}
fn set_from_keys<T>(keys: &[T]) -> BTreeSet<T>
substrate/frame/support/src/storage/bounded_vec.rs
+2 -2
View File
@@ -589,10 +589,10 @@ pub mod test {
use sp_io::TestExternalities;
crate::generate_storage_alias! { Prefix, Foo => Value<BoundedVec<u32, ConstU32<7>>> }
crate::generate_storage_alias! { Prefix, FooMap => Map<(u32, Twox128), BoundedVec<u32, ConstU32<7>>> }
crate::generate_storage_alias! { Prefix, FooMap => Map<(Twox128, u32), BoundedVec<u32, ConstU32<7>>> }
crate::generate_storage_alias! {
Prefix,
FooDoubleMap => DoubleMap<(u32, Twox128), (u32, Twox128), BoundedVec<u32, ConstU32<7>>>
FooDoubleMap => DoubleMap<(Twox128, u32), (Twox128, u32), BoundedVec<u32, ConstU32<7>>>
}
#[test]
substrate/frame/support/src/storage/generator/double_map.rs
+1 -1
View File
@@ -527,7 +527,7 @@ mod test_iterators {
use crate::hash::Identity;
crate::generate_storage_alias!(
MyModule,
MyDoubleMap => DoubleMap<(u64, Identity), (u64, Identity), u64>
MyDoubleMap => DoubleMap<(Identity, u64), (Identity, u64), u64>
);
MyDoubleMap::insert(1, 10, 100);
substrate/frame/support/src/storage/generator/map.rs
+1 -1
View File
@@ -384,7 +384,7 @@ mod test_iterators {
fn map_iter_from() {
sp_io::TestExternalities::default().execute_with(|| {
use crate::hash::Identity;
crate::generate_storage_alias!(MyModule, MyMap => Map<(u64, Identity), u64>);
crate::generate_storage_alias!(MyModule, MyMap => Map<(Identity, u64), u64>);
MyMap::insert(1, 10);
MyMap::insert(2, 20);
substrate/frame/support/src/storage/generator/nmap.rs
+3 -3
View File
@@ -477,7 +477,7 @@ mod test_iterators {
use crate::{hash::Identity, storage::Key as NMapKey};
crate::generate_storage_alias!(
MyModule,
MyNMap => NMap<Key<(u64, Identity), (u64, Identity), (u64, Identity)>, u64>
MyNMap => NMap<Key<(Identity, u64), (Identity, u64), (Identity, u64)>, u64>
);
MyNMap::insert((1, 1, 1), 11);
@@ -519,8 +519,8 @@ mod test_iterators {
{
crate::generate_storage_alias!(Test, NMap => DoubleMap<
(u16, crate::Blake2_128Concat),
(u32, crate::Twox64Concat),
(crate::Blake2_128Concat, u16),
(crate::Twox64Concat, u32),
u64
>);
substrate/frame/support/src/storage/mod.rs
+3 -3
View File
@@ -1618,7 +1618,7 @@ mod test {
use crate::{hash::Identity, storage::generator::map::StorageMap};
crate::generate_storage_alias! {
MyModule,
MyStorageMap => Map<(u64, Identity), u64>
MyStorageMap => Map<(Identity, u64), u64>
}
MyStorageMap::insert(1, 10);
@@ -1735,10 +1735,10 @@ mod test {
}
crate::generate_storage_alias! { Prefix, Foo => Value<WeakBoundedVec<u32, ConstU32<7>>> }
crate::generate_storage_alias! { Prefix, FooMap => Map<(u32, Twox128), BoundedVec<u32, ConstU32<7>>> }
crate::generate_storage_alias! { Prefix, FooMap => Map<(Twox128, u32), BoundedVec<u32, ConstU32<7>>> }
crate::generate_storage_alias! {
Prefix,
FooDoubleMap => DoubleMap<(u32, Twox128), (u32, Twox128), BoundedVec<u32, ConstU32<7>>>
FooDoubleMap => DoubleMap<(Twox128, u32), (Twox128, u32), BoundedVec<u32, ConstU32<7>>>
}
#[test]
substrate/frame/support/src/storage/types/nmap.rs
+1 -1
View File
@@ -569,7 +569,7 @@ mod test {
{
crate::generate_storage_alias!(test, Foo => NMap<
Key<(u16, Blake2_128Concat)>,
Key<(Blake2_128Concat, u16)>,
u32
>);
substrate/frame/support/src/storage/weak_bounded_vec.rs
+2 -2
View File
@@ -323,10 +323,10 @@ pub mod test {
use sp_std::convert::TryInto;
crate::generate_storage_alias! { Prefix, Foo => Value<WeakBoundedVec<u32, ConstU32<7>>> }
crate::generate_storage_alias! { Prefix, FooMap => Map<(u32, Twox128), WeakBoundedVec<u32, ConstU32<7>>> }
crate::generate_storage_alias! { Prefix, FooMap => Map<(Twox128, u32), WeakBoundedVec<u32, ConstU32<7>>> }
crate::generate_storage_alias! {
Prefix,
FooDoubleMap => DoubleMap<(u32, Twox128), (u32, Twox128), WeakBoundedVec<u32, ConstU32<7>>>
FooDoubleMap => DoubleMap<(Twox128, u32), (Twox128, u32), WeakBoundedVec<u32, ConstU32<7>>>
}
#[test]