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

Refactor away from opaque hashes #5226

Merged
gavofyork merged 44 commits into from
Mar 16, 2020
Merged

Refactor away from opaque hashes #5226

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
0b6f313
System.BlockHash
gavofyork Mar 11, 2020
051967a
Fix hash
gavofyork Mar 11, 2020
5fb1aeb
Merge remote-tracking branch 'origin/master' into gav-refactor-hashing
gavofyork Mar 11, 2020
3921666
Introduce K/V iteration in all _concat maps
gavofyork Mar 11, 2020
a926a45
Build fixes
gavofyork Mar 11, 2020
e73f349
Ensure migration happens in correct order
gavofyork Mar 11, 2020
1e8230d
Staking.*
gavofyork Mar 12, 2020
855f20e
Vesting.* Offences.*
gavofyork Mar 12, 2020
d195330
Democracy.*
gavofyork Mar 12, 2020
cc6a4d0
Merge remote-tracking branch 'origin/master' into gav-refactor-hashing
gavofyork Mar 12, 2020
c82856e
Babe.* Collective.*
gavofyork Mar 12, 2020
13ad20c
Grandpa.*
gavofyork Mar 12, 2020
bdde997
Assets.* Benchmark.* Contracts.* Elections.* Asset.* Nicks.*
gavofyork Mar 12, 2020
2cbc09e
ImOnline.*
gavofyork Mar 12, 2020
182ec5a
Treasury.*
gavofyork Mar 12, 2020
c573e56
Recovery.*
gavofyork Mar 12, 2020
cf69961
Final bits.
gavofyork Mar 12, 2020
c03a485
Docs
gavofyork Mar 12, 2020
0e3d187
Fix one test
gavofyork Mar 12, 2020
990e972
Fix test
gavofyork Mar 12, 2020
4e2acc9
All passing except the UI tests
gavofyork Mar 12, 2020
1c73a1f
Remove linked_map part 1
gavofyork Mar 12, 2020
5108dc9
Remove linked_map
gavofyork Mar 12, 2020
11a8b94
Some iterator utils for double maps.
gavofyork Mar 12, 2020
d14ba60
Remove old migrations
gavofyork Mar 12, 2020
becb495
Introduce tombstone for LinkedMap type
gavofyork Mar 13, 2020
fb97b30
Migration for genesis hash
gavofyork Mar 13, 2020
7ee5cee
Merge remote-tracking branch 'origin/master' into gav-refactor-hashing
gavofyork Mar 15, 2020
0d95a1e
Fix build
gavofyork Mar 15, 2020
1e52937
Fix hash
gavofyork Mar 15, 2020
869b18f
Rename Map is_linked -> unused, keeping backwards compat (#5256)
jacogr Mar 16, 2020
9eb0ea3
Merge remote-tracking branch 'origin/master' into gav-refactor-hashing
gavofyork Mar 16, 2020
f4e3c00
Update frame/balances/src/lib.rs
gavofyork Mar 16, 2020
43f3fb0
Update frame/elections/src/lib.rs
gavofyork Mar 16, 2020
3e50210
Remove old migration code.
gavofyork Mar 16, 2020
c90efd0
Merge remote-tracking branch 'origin/master' into gav-refactor-hashing
gavofyork Mar 16, 2020
fbbcf01
Update frame/system/src/lib.rs
gavofyork Mar 16, 2020
84af903
Update bin/node/runtime/src/lib.rs
gavofyork Mar 16, 2020
9bcf544
Merge branch 'gav-refactor-hashing' of github.com:paritytech/substrat…
gavofyork Mar 16, 2020
12382d8
Fix hash
gavofyork Mar 16, 2020
07e3361
Merge remote-tracking branch 'origin/master' into gav-refactor-hashing
gavofyork Mar 16, 2020
e971241
Merge remote-tracking branch 'origin/master' into gav-refactor-hashing
gavofyork Mar 16, 2020
a2ca4ea
fix session migration
rphmeier Mar 16, 2020
c34e064
Fix watning
gavofyork Mar 16, 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
Fix test
  • Loading branch information
@gavofyork
gavofyork committed Mar 12, 2020
commit 990e97204dd1c68d1340834ee6677096816003ca
46 changes: 23 additions & 23 deletions frame/support/test/tests/decl_storage.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ mod tests {
// non-getters: pub / $default

/// Hello, this is doc!
U32 : Option<u32>;
pub PUBU32 : Option<u32>;
U32MYDEF : Option<u32>;
pub PUBU32MYDEF : Option<u32>;
U32: Option<u32>;
pub PUBU32: Option<u32>;
U32MYDEF: Option<u32>;
pub PUBU32MYDEF: Option<u32>;

// getters: pub / $default
// we need at least one type which uses T, otherwise GenesisConfig will complain.
Expand All @@ -59,10 +59,10 @@ mod tests {
GetOptU32WithBuilderNone get(fn opt_u32_with_builder_none) build(|_| None): Option<u32>;

// map non-getters: pub / $default
MAPU32 : map hasher(blake2_128_concat) u32 => Option<String>;
pub PUBMAPU32 : map hasher(blake2_128_concat) u32 => Option<String>;
MAPU32MYDEF : map hasher(blake2_128_concat) u32 => Option<String>;
pub PUBMAPU32MYDEF : map hasher(blake2_128_concat) u32 => Option<String>;
MAPU32: map hasher(blake2_128_concat) u32 => Option<String>;
pub PUBMAPU32: map hasher(blake2_128_concat) u32 => Option<String>;
MAPU32MYDEF: map hasher(blake2_128_concat) u32 => Option<String>;
pub PUBMAPU32MYDEF: map hasher(blake2_128_concat) u32 => Option<String>;

// map getters: pub / $default
GETMAPU32 get(fn map_u32_getter): map hasher(blake2_128_concat) u32 => String;
Expand All @@ -74,16 +74,16 @@ mod tests {
map hasher(blake2_128_concat) u32 => String = "pubmap".into();

// linked map
LINKEDMAPU32 : linked_map hasher(blake2_128_concat) u32 => Option<String>;
LINKEDMAPU32: linked_map hasher(blake2_128_concat) u32 => Option<String>;
pub PUBLINKEDMAPU32MYDEF : linked_map hasher(blake2_128_concat) u32 => Option<String>;
GETLINKEDMAPU32 get(fn linked_map_u32_getter):
linked_map hasher(blake2_128_concat) u32 => String;
pub PUBGETLINKEDMAPU32MYDEF get(fn pub_linked_map_u32_getter_mydef):
linked_map hasher(blake2_128_concat) u32 => String = "pubmap".into();

COMPLEXTYPE1: ::std::vec::Vec<<T as Trait>::Origin>;
COMPLEXTYPE2: (Vec<Vec<(u16,Box<( )>)>>, u32);
COMPLEXTYPE3: [u32;25];
COMPLEXTYPE2: (Vec<Vec<(u16, Box<()>)>>, u32);
COMPLEXTYPE3: [u32; 25];
}
add_extra_genesis {
build(|_| {});
Expand Down Expand Up @@ -249,7 +249,7 @@ mod tests {
name: DecodeDifferent::Encode("MAPU32"),
modifier: StorageEntryModifier::Optional,
ty: StorageEntryType::Map {
hasher: StorageHasher::Blake2_128_Concat,
hasher: StorageHasher::Blake2_128Concat,
key: DecodeDifferent::Encode("u32"),
value: DecodeDifferent::Encode("String"),
is_linked: false,
Expand All @@ -263,7 +263,7 @@ mod tests {
name: DecodeDifferent::Encode("PUBMAPU32"),
modifier: StorageEntryModifier::Optional,
ty: StorageEntryType::Map {
hasher: StorageHasher::Blake2_128_Concat,
hasher: StorageHasher::Blake2_128Concat,
key: DecodeDifferent::Encode("u32"),
value: DecodeDifferent::Encode("String"),
is_linked: false,
Expand All @@ -277,7 +277,7 @@ mod tests {
name: DecodeDifferent::Encode("MAPU32MYDEF"),
modifier: StorageEntryModifier::Optional,
ty: StorageEntryType::Map {
hasher: StorageHasher::Blake2_128_Concat,
hasher: StorageHasher::Blake2_128Concat,
key: DecodeDifferent::Encode("u32"),
value: DecodeDifferent::Encode("String"),
is_linked: false,
Expand All @@ -291,7 +291,7 @@ mod tests {
name: DecodeDifferent::Encode("PUBMAPU32MYDEF"),
modifier: StorageEntryModifier::Optional,
ty: StorageEntryType::Map {
hasher: StorageHasher::Blake2_128_Concat,
hasher: StorageHasher::Blake2_128Concat,
key: DecodeDifferent::Encode("u32"),
value: DecodeDifferent::Encode("String"),
is_linked: false,
Expand All @@ -305,7 +305,7 @@ mod tests {
name: DecodeDifferent::Encode("GETMAPU32"),
modifier: StorageEntryModifier::Default,
ty: StorageEntryType::Map {
hasher: StorageHasher::Blake2_128_Concat,
hasher: StorageHasher::Blake2_128Concat,
key: DecodeDifferent::Encode("u32"),
value: DecodeDifferent::Encode("String"),
is_linked: false,
Expand All @@ -319,7 +319,7 @@ mod tests {
name: DecodeDifferent::Encode("PUBGETMAPU32"),
modifier: StorageEntryModifier::Default,
ty: StorageEntryType::Map {
hasher: StorageHasher::Blake2_128_Concat,
hasher: StorageHasher::Blake2_128Concat,
key: DecodeDifferent::Encode("u32"),
value: DecodeDifferent::Encode("String"),
is_linked: false,
Expand All @@ -333,7 +333,7 @@ mod tests {
name: DecodeDifferent::Encode("GETMAPU32MYDEF"),
modifier: StorageEntryModifier::Default,
ty: StorageEntryType::Map {
hasher: StorageHasher::Blake2_128_Concat,
hasher: StorageHasher::Blake2_128Concat,
key: DecodeDifferent::Encode("u32"),
value: DecodeDifferent::Encode("String"),
is_linked: false,
Expand All @@ -347,7 +347,7 @@ mod tests {
name: DecodeDifferent::Encode("PUBGETMAPU32MYDEF"),
modifier: StorageEntryModifier::Default,
ty: StorageEntryType::Map {
hasher: StorageHasher::Blake2_128_Concat,
hasher: StorageHasher::Blake2_128Concat,
key: DecodeDifferent::Encode("u32"),
value: DecodeDifferent::Encode("String"),
is_linked: false,
Expand All @@ -361,7 +361,7 @@ mod tests {
name: DecodeDifferent::Encode("LINKEDMAPU32"),
modifier: StorageEntryModifier::Optional,
ty: StorageEntryType::Map {
hasher: StorageHasher::Blake2_128_Concat,
hasher: StorageHasher::Blake2_128Concat,
key: DecodeDifferent::Encode("u32"),
value: DecodeDifferent::Encode("String"),
is_linked: true,
Expand All @@ -375,7 +375,7 @@ mod tests {
name: DecodeDifferent::Encode("PUBLINKEDMAPU32MYDEF"),
modifier: StorageEntryModifier::Optional,
ty: StorageEntryType::Map {
hasher: StorageHasher::Blake2_128_Concat,
hasher: StorageHasher::Blake2_128Concat,
key: DecodeDifferent::Encode("u32"),
value: DecodeDifferent::Encode("String"),
is_linked: true,
Expand All @@ -389,7 +389,7 @@ mod tests {
name: DecodeDifferent::Encode("GETLINKEDMAPU32"),
modifier: StorageEntryModifier::Default,
ty: StorageEntryType::Map {
hasher: StorageHasher::Blake2_128_Concat,
hasher: StorageHasher::Blake2_128Concat,
key: DecodeDifferent::Encode("u32"),
value: DecodeDifferent::Encode("String"),
is_linked: true,
Expand All @@ -403,7 +403,7 @@ mod tests {
name: DecodeDifferent::Encode("PUBGETLINKEDMAPU32MYDEF"),
modifier: StorageEntryModifier::Default,
ty: StorageEntryType::Map {
hasher: StorageHasher::Blake2_128_Concat,
hasher: StorageHasher::Blake2_128Concat,
key: DecodeDifferent::Encode("u32"),
value: DecodeDifferent::Encode("String"),
is_linked: true,
Expand Down
50 changes: 25 additions & 25 deletions frame/support/test/tests/final_keys.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
use frame_support::storage::unhashed;
use codec::Encode;
use frame_support::{StorageDoubleMap, StorageLinkedMap, StorageMap, StorageValue, StoragePrefixedMap};
use sp_io::{TestExternalities, hashing::{twox_64, blake2_128}};
use sp_io::{TestExternalities, hashing::{twox_64, twox_128, blake2_128}};

mod no_instance {
use codec::{Encode, Decode, EncodeLike};
Expand Down Expand Up @@ -101,44 +101,44 @@ fn blake2_128_concat(d: &[u8]) -> Vec<u8> {
fn final_keys_no_instance() {
TestExternalities::default().execute_with(|| {
no_instance::Value::put(1);
let k = [twox_64_concat(b"FinalKeysNone"), twox_64_concat(b"Value")].concat();
let k = [twox_128(b"FinalKeysNone"), twox_128(b"Value")].concat();
assert_eq!(unhashed::get::<u32>(&k), Some(1u32));

no_instance::Map::insert(1, 2);
let mut k = [twox_64_concat(b"FinalKeysNone"), twox_64_concat(b"Map")].concat();
let mut k = [twox_128(b"FinalKeysNone"), twox_128(b"Map")].concat();
k.extend(1u32.using_encoded(blake2_128_concat));
assert_eq!(unhashed::get::<u32>(&k), Some(2u32));
assert_eq!(&k[..32], &<no_instance::Map>::final_prefix());

no_instance::Map2::insert(1, 2);
let mut k = [twox_64_concat(b"FinalKeysNone"), twox_64_concat(b"Map2")].concat();
let mut k = [twox_128(b"FinalKeysNone"), twox_128(b"Map2")].concat();
k.extend(1u32.using_encoded(twox_64_concat));
assert_eq!(unhashed::get::<u32>(&k), Some(2u32));
assert_eq!(&k[..32], &<no_instance::Map2>::final_prefix());

let head = [twox_64_concat(b"FinalKeysNone"), twox_64_concat(b"HeadOfLinkedMap")].concat();
let head = [twox_128(b"FinalKeysNone"), twox_128(b"HeadOfLinkedMap")].concat();
assert_eq!(unhashed::get::<u32>(&head), None);

no_instance::LinkedMap::insert(1, 2);
let mut k = [twox_64_concat(b"FinalKeysNone"), twox_64_concat(b"LinkedMap")].concat();
let mut k = [twox_128(b"FinalKeysNone"), twox_128(b"LinkedMap")].concat();
k.extend(1u32.using_encoded(blake2_128_concat));
assert_eq!(unhashed::get::<u32>(&k), Some(2u32));
assert_eq!(unhashed::get::<u32>(&head), Some(1u32));

no_instance::LinkedMap2::insert(1, 2);
let mut k = [twox_64_concat(b"FinalKeysNone"), twox_64_concat(b"LinkedMap2")].concat();
let mut k = [twox_128(b"FinalKeysNone"), twox_128(b"LinkedMap2")].concat();
k.extend(1u32.using_encoded(twox_64_concat));
assert_eq!(unhashed::get::<u32>(&k), Some(2u32));

no_instance::DoubleMap::insert(&1, &2, &3);
let mut k = [twox_64_concat(b"FinalKeysNone"), twox_64_concat(b"DoubleMap")].concat();
let mut k = [twox_128(b"FinalKeysNone"), twox_128(b"DoubleMap")].concat();
k.extend(1u32.using_encoded(blake2_128_concat));
k.extend(2u32.using_encoded(blake2_128_concat));
assert_eq!(unhashed::get::<u32>(&k), Some(3u32));
assert_eq!(&k[..32], &<no_instance::DoubleMap>::final_prefix());

no_instance::DoubleMap2::insert(&1, &2, &3);
let mut k = [twox_64_concat(b"FinalKeysNone"), twox_64_concat(b"DoubleMap2")].concat();
let mut k = [twox_128(b"FinalKeysNone"), twox_128(b"DoubleMap2")].concat();
k.extend(1u32.using_encoded(twox_64_concat));
k.extend(2u32.using_encoded(twox_64_concat));
assert_eq!(unhashed::get::<u32>(&k), Some(3u32));
Expand All @@ -150,44 +150,44 @@ fn final_keys_no_instance() {
fn final_keys_default_instance() {
TestExternalities::default().execute_with(|| {
<instance::Value<instance::DefaultInstance>>::put(1);
let k = [twox_64_concat(b"FinalKeysSome"), twox_64_concat(b"Value")].concat();
let k = [twox_128(b"FinalKeysSome"), twox_128(b"Value")].concat();
assert_eq!(unhashed::get::<u32>(&k), Some(1u32));

<instance::Map<instance::DefaultInstance>>::insert(1, 2);
let mut k = [twox_64_concat(b"FinalKeysSome"), twox_64_concat(b"Map")].concat();
let mut k = [twox_128(b"FinalKeysSome"), twox_128(b"Map")].concat();
k.extend(1u32.using_encoded(blake2_128_concat));
assert_eq!(unhashed::get::<u32>(&k), Some(2u32));
assert_eq!(&k[..32], &<instance::Map<instance::DefaultInstance>>::final_prefix());

<instance::Map2<instance::DefaultInstance>>::insert(1, 2);
let mut k = [twox_64_concat(b"FinalKeysSome"), twox_64_concat(b"Map2")].concat();
let mut k = [twox_128(b"FinalKeysSome"), twox_128(b"Map2")].concat();
k.extend(1u32.using_encoded(twox_64_concat));
assert_eq!(unhashed::get::<u32>(&k), Some(2u32));
assert_eq!(&k[..32], &<instance::Map2<instance::DefaultInstance>>::final_prefix());

let head = [twox_64_concat(b"FinalKeysSome"), twox_64_concat(b"HeadOfLinkedMap")].concat();
let head = [twox_128(b"FinalKeysSome"), twox_128(b"HeadOfLinkedMap")].concat();
assert_eq!(unhashed::get::<u32>(&head), None);

<instance::LinkedMap<instance::DefaultInstance>>::insert(1, 2);
let mut k = [twox_64_concat(b"FinalKeysSome"), twox_64_concat(b"LinkedMap")].concat();
let mut k = [twox_128(b"FinalKeysSome"), twox_128(b"LinkedMap")].concat();
k.extend(1u32.using_encoded(blake2_128_concat));
assert_eq!(unhashed::get::<u32>(&k), Some(2u32));
assert_eq!(unhashed::get::<u32>(&head), Some(1u32));

<instance::LinkedMap2<instance::DefaultInstance>>::insert(1, 2);
let mut k = [twox_64_concat(b"FinalKeysSome"), twox_64_concat(b"LinkedMap2")].concat();
let mut k = [twox_128(b"FinalKeysSome"), twox_128(b"LinkedMap2")].concat();
k.extend(1u32.using_encoded(twox_64_concat));
assert_eq!(unhashed::get::<u32>(&k), Some(2u32));

<instance::DoubleMap<instance::DefaultInstance>>::insert(&1, &2, &3);
let mut k = [twox_64_concat(b"FinalKeysSome"), twox_64_concat(b"DoubleMap")].concat();
let mut k = [twox_128(b"FinalKeysSome"), twox_128(b"DoubleMap")].concat();
k.extend(1u32.using_encoded(blake2_128_concat));
k.extend(2u32.using_encoded(blake2_128_concat));
assert_eq!(unhashed::get::<u32>(&k), Some(3u32));
assert_eq!(&k[..32], &<instance::DoubleMap<instance::DefaultInstance>>::final_prefix());

<instance::DoubleMap2<instance::DefaultInstance>>::insert(&1, &2, &3);
let mut k = [twox_64_concat(b"FinalKeysSome"), twox_64_concat(b"DoubleMap2")].concat();
let mut k = [twox_128(b"FinalKeysSome"), twox_128(b"DoubleMap2")].concat();
k.extend(1u32.using_encoded(twox_64_concat));
k.extend(2u32.using_encoded(twox_64_concat));
assert_eq!(unhashed::get::<u32>(&k), Some(3u32));
Expand All @@ -199,44 +199,44 @@ fn final_keys_default_instance() {
fn final_keys_instance_2() {
TestExternalities::default().execute_with(|| {
<instance::Value<instance::Instance2>>::put(1);
let k = [twox_64_concat(b"Instance2FinalKeysSome"), twox_64_concat(b"Value")].concat();
let k = [twox_128(b"Instance2FinalKeysSome"), twox_128(b"Value")].concat();
assert_eq!(unhashed::get::<u32>(&k), Some(1u32));

<instance::Map<instance::Instance2>>::insert(1, 2);
let mut k = [twox_64_concat(b"Instance2FinalKeysSome"), twox_64_concat(b"Map")].concat();
let mut k = [twox_128(b"Instance2FinalKeysSome"), twox_128(b"Map")].concat();
k.extend(1u32.using_encoded(blake2_128_concat));
assert_eq!(unhashed::get::<u32>(&k), Some(2u32));
assert_eq!(&k[..32], &<instance::Map<instance::Instance2>>::final_prefix());

<instance::Map2<instance::Instance2>>::insert(1, 2);
let mut k = [twox_64_concat(b"Instance2FinalKeysSome"), twox_64_concat(b"Map2")].concat();
let mut k = [twox_128(b"Instance2FinalKeysSome"), twox_128(b"Map2")].concat();
k.extend(1u32.using_encoded(twox_64_concat));
assert_eq!(unhashed::get::<u32>(&k), Some(2u32));
assert_eq!(&k[..32], &<instance::Map2<instance::Instance2>>::final_prefix());

let head = [twox_64_concat(b"Instance2FinalKeysSome"), twox_64_concat(b"HeadOfLinkedMap")].concat();
let head = [twox_128(b"Instance2FinalKeysSome"), twox_128(b"HeadOfLinkedMap")].concat();
assert_eq!(unhashed::get::<u32>(&head), None);

<instance::LinkedMap<instance::Instance2>>::insert(1, 2);
let mut k = [twox_64_concat(b"Instance2FinalKeysSome"), twox_64_concat(b"LinkedMap")].concat();
let mut k = [twox_128(b"Instance2FinalKeysSome"), twox_128(b"LinkedMap")].concat();
k.extend(1u32.using_encoded(blake2_128_concat));
assert_eq!(unhashed::get::<u32>(&k), Some(2u32));
assert_eq!(unhashed::get::<u32>(&head), Some(1u32));

<instance::LinkedMap2<instance::Instance2>>::insert(1, 2);
let mut k = [twox_64_concat(b"Instance2FinalKeysSome"), twox_64_concat(b"LinkedMap2")].concat();
let mut k = [twox_128(b"Instance2FinalKeysSome"), twox_128(b"LinkedMap2")].concat();
k.extend(1u32.using_encoded(twox_64_concat));
assert_eq!(unhashed::get::<u32>(&k), Some(2u32));

<instance::DoubleMap<instance::Instance2>>::insert(&1, &2, &3);
let mut k = [twox_64_concat(b"Instance2FinalKeysSome"), twox_64_concat(b"DoubleMap")].concat();
let mut k = [twox_128(b"Instance2FinalKeysSome"), twox_128(b"DoubleMap")].concat();
k.extend(1u32.using_encoded(blake2_128_concat));
k.extend(2u32.using_encoded(blake2_128_concat));
assert_eq!(unhashed::get::<u32>(&k), Some(3u32));
assert_eq!(&k[..32], &<instance::DoubleMap<instance::Instance2>>::final_prefix());

<instance::DoubleMap2<instance::Instance2>>::insert(&1, &2, &3);
let mut k = [twox_64_concat(b"Instance2FinalKeysSome"), twox_64_concat(b"DoubleMap2")].concat();
let mut k = [twox_128(b"Instance2FinalKeysSome"), twox_128(b"DoubleMap2")].concat();
k.extend(1u32.using_encoded(twox_64_concat));
k.extend(2u32.using_encoded(twox_64_concat));
assert_eq!(unhashed::get::<u32>(&k), Some(3u32));
Expand Down
8 changes: 4 additions & 4 deletions frame/support/test/tests/instance.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ const EXPECTED_METADATA: StorageMetadata = StorageMetadata {
name: DecodeDifferent::Encode("Map"),
modifier: StorageEntryModifier::Default,
ty: StorageEntryType::Map {
hasher: StorageHasher::Blake2_256,
hasher: StorageHasher::Identity,
key: DecodeDifferent::Encode("u64"),
value: DecodeDifferent::Encode("u64"),
is_linked: false,
Expand All @@ -434,7 +434,7 @@ const EXPECTED_METADATA: StorageMetadata = StorageMetadata {
name: DecodeDifferent::Encode("LinkedMap"),
modifier: StorageEntryModifier::Default,
ty: StorageEntryType::Map {
hasher: StorageHasher::Blake2_256,
hasher: StorageHasher::Identity,
key: DecodeDifferent::Encode("u64"),
value: DecodeDifferent::Encode("Vec<u8>"),
is_linked: true,
Expand All @@ -452,8 +452,8 @@ const EXPECTED_METADATA: StorageMetadata = StorageMetadata {
name: DecodeDifferent::Encode("DoubleMap"),
modifier: StorageEntryModifier::Default,
ty: StorageEntryType::DoubleMap {
hasher: StorageHasher::Blake2_256,
key2_hasher: StorageHasher::Blake2_256,
hasher: StorageHasher::Identity,
key2_hasher: StorageHasher::Identity,
key1: DecodeDifferent::Encode("u64"),
key2: DecodeDifferent::Encode("u64"),
value: DecodeDifferent::Encode("u64"),
Expand Down