Skip to content

Commit

Permalink
Arkadi's fix for the 0.9.16 release (paritytech#10742)
Browse files Browse the repository at this point in the history
* Enable download of future forks

* Fixed external tests

* Fix warning.

* cargo fmt

* Fix benchmarking test

Co-authored-by: arkpar <arkady.paronyan@gmail.com>
Co-authored-by: Bastian Köcher <info@kchr.de>
  • Loading branch information
3 people authored and Wizdave97 committed Feb 4, 2022
1 parent 19fb774 commit d14519d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
3 changes: 1 addition & 2 deletions frame/support/src/storage/child.rs
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,7 @@ pub fn put_raw(child_info: &ChildInfo, key: &[u8], value: &[u8]) {
/// Calculate current child root value.
pub fn root(child_info: &ChildInfo, _: StateVersion) -> Vec<u8> {
match child_info.child_type() {
ChildType::ParentKeyId =>
sp_io::default_child_storage::root(child_info.storage_key()),
ChildType::ParentKeyId => sp_io::default_child_storage::root(child_info.storage_key()),
}
}

Expand Down
4 changes: 2 additions & 2 deletions test-utils/runtime/src/system.rs
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,8 @@ pub fn finalize_block() -> Header {

// This MUST come after all changes to storage are done. Otherwise we will fail the
// “Storage root does not match that calculated” assertion.
let storage_root = Hash::decode(&mut &storage_root()[..])
.expect("`storage_root` is a valid hash");
let storage_root =
Hash::decode(&mut &storage_root()[..]).expect("`storage_root` is a valid hash");

if let Some(new_authorities) = o_new_authorities {
digest.push(generic::DigestItem::Consensus(*b"aura", new_authorities.encode()));
Expand Down

0 comments on commit d14519d

Please sign in to comment.