pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-12 08:51:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove enumerate_trie_root in favour of ordered_trie_root #2382 (#3360)

Browse Source
This commit is contained in:
Juan Aguilar
2019-08-12 16:13:02 +02:00
committed by Gavin Wood
parent 70d716dc48
commit db5e6712d7
8 changed files with 29 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/core/sr-io/without_std.rs
+17 -11
View File
@@ -128,8 +128,11 @@ pub mod ext {
/// Ensures we use the right crypto when calling into native
pub trait ExternTrieCrypto: Hasher {
/// Calculate enumerated trie root.
fn enumerated_trie_root(values: &[&[u8]]) -> Self::Out;
/// A trie root formed from the enumerated items.
fn ordered_trie_root<
A: AsRef<[u8]>,
I: IntoIterator<Item = A>
>(values: I) -> Self::Out;
}
/// Additional bounds for Hasher trait for without_std.
@@ -138,9 +141,16 @@ pub mod ext {
// Ensures we use a Blake2_256-flavored Hasher when calling into native
impl ExternTrieCrypto for Blake2Hasher {
fn enumerated_trie_root(values: &[&[u8]]) -> Self::Out {
let lengths = values.iter().map(|v| (v.len() as u32).to_le()).collect::<Vec<_>>();
let values = values.iter().fold(Vec::new(), |mut acc, sl| { acc.extend_from_slice(sl); acc });
fn ordered_trie_root<
A: AsRef<[u8]>,
I: IntoIterator<Item = A>
>(items: I) -> Self::Out {
let mut values = Vec::new();
let mut lengths = Vec::new();
for v in items.into_iter() {
values.extend_from_slice(v.as_ref());
lengths.push((v.as_ref().len() as u32).to_le());
}
let mut result: [u8; 32] = Default::default();
unsafe {
ext_blake2_256_enumerated_trie_root.get()(
@@ -767,10 +777,6 @@ impl StorageApi for () {
}
}
fn enumerated_trie_root<H: Hasher + ExternTrieCrypto>(values: &[&[u8]]) -> H::Out {
H::enumerated_trie_root(values)
}
fn trie_root<
H: Hasher + ExternTrieCrypto,
I: IntoIterator<Item = (A, B)>,
@@ -784,8 +790,8 @@ impl StorageApi for () {
H: Hasher + ExternTrieCrypto,
I: IntoIterator<Item = A>,
A: AsRef<[u8]>
>(_input: I) -> H::Out {
unimplemented!()
>(values: I) -> H::Out {
H::ordered_trie_root(values)
}
}