Update substrate and codec crate aliases (#54)

* Replace substrate crate aliases with actual crate names

* Alias parity-scale-codec to just codec, like in substrate

* Format code
This commit is contained in:
Andrew Jones
2019-12-16 15:57:48 +00:00
committed by GitHub
parent c2097aa2e3
commit f1926f55cf
12 changed files with 102 additions and 114 deletions
+9 -9
View File
@@ -21,7 +21,7 @@ use std::{
str::FromStr,
};
use parity_scale_codec::{
use codec::{
Decode,
Encode,
};
@@ -37,7 +37,7 @@ use frame_metadata::{
};
use sp_core::storage::StorageKey;
use crate::codec::Encoded;
use crate::Encoded;
#[derive(Debug, thiserror::Error)]
pub enum MetadataError {
@@ -236,12 +236,8 @@ impl<K: Encode, V: Decode + Clone> StorageMap<K, V> {
bytes.extend(&sp_core::twox_128(&self.storage_prefix)[..]);
let encoded_key = key.encode();
let hash = match self.hasher {
StorageHasher::Blake2_128 => {
sp_core::blake2_128(&encoded_key).to_vec()
}
StorageHasher::Blake2_256 => {
sp_core::blake2_256(&encoded_key).to_vec()
}
StorageHasher::Blake2_128 => sp_core::blake2_128(&encoded_key).to_vec(),
StorageHasher::Blake2_256 => sp_core::blake2_256(&encoded_key).to_vec(),
StorageHasher::Twox128 => sp_core::twox_128(&encoded_key).to_vec(),
StorageHasher::Twox256 => sp_core::twox_256(&encoded_key).to_vec(),
StorageHasher::Twox64Concat => sp_core::twox_64(&encoded_key).to_vec(),
@@ -360,7 +356,11 @@ impl TryFrom<RuntimeMetadataPrefixed> for Metadata {
let module_prefix = convert(storage.prefix)?;
for entry in convert(storage.entries)?.into_iter() {
let storage_prefix = convert(entry.name.clone())?;
let entry = convert_entry(module_prefix.clone(), storage_prefix.clone(), entry)?;
let entry = convert_entry(
module_prefix.clone(),
storage_prefix.clone(),
entry,
)?;
storage_map.insert(storage_prefix, entry);
}
}