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

Fix compact proof decoding unaccessed last child trie. #9715

Merged
3 commits merged into from
Sep 7, 2021
Merged

Fix compact proof decoding unaccessed last child trie. #9715

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c03911d
fix no child proof attached but root included.
cheme Sep 7, 2021
9fa0e35
small stress test for proof of child tries.
cheme Sep 7, 2021
a53729e
rust fmt
cheme Sep 7, 2021
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
rust fmt
  • Loading branch information
@cheme
cheme committed Sep 7, 2021
commit a53729e18886fff6c6021e66975ceae16c1d3722
23 changes: 15 additions & 8 deletions primitives/state-machine/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1573,9 +1573,9 @@ mod tests {

#[test]
fn child_read_compact_stress_test() {
use rand::{RngCore, SeedableRng};
use rand::rngs::SmallRng;
let mut storage: HashMap<Option<ChildInfo>, BTreeMap<StorageKey, StorageValue>> = Default::default();
use rand::{rngs::SmallRng, RngCore, SeedableRng};
let mut storage: HashMap<Option<ChildInfo>, BTreeMap<StorageKey, StorageValue>> =
Default::default();
let mut seed = [0; 16];
for i in 0..50u32 {
let mut child_infos = Vec::new();
Expand All @@ -1601,7 +1601,7 @@ mod tests {
storage.insert(Some(child_info), items);
}

let trie: InMemoryBackend::<BlakeTwo256> = storage.clone().into();
let trie: InMemoryBackend<BlakeTwo256> = storage.clone().into();
let trie_root = trie.root().clone();
let backend = crate::ProvingBackend::new(&trie);
let mut queries = Vec::new();
Expand All @@ -1614,7 +1614,7 @@ mod tests {
rand.fill_bytes(&mut key[..]);
ChildInfo::new_default(key.as_slice())
} else {
child_infos[rand.next_u32() as usize % nb_child_trie].clone()
child_infos[rand.next_u32() as usize % nb_child_trie].clone()
};

if let Some(values) = storage.get(&Some(child_info.clone())) {
Expand All @@ -1623,11 +1623,18 @@ mod tests {
for (i, (key, value)) in values.iter().enumerate() {
if i == ix {
assert_eq!(
&backend.child_storage(&child_info, key.as_slice()).unwrap().unwrap(),
&backend
.child_storage(&child_info, key.as_slice())
.unwrap()
.unwrap(),
value
);
queries.push((child_info.clone(), key.clone(), Some(value.clone())));
break;
queries.push((
child_info.clone(),
key.clone(),
Some(value.clone()),
));
break
}
}
}
Expand Down