From d14519decf346a97d32940adba4aff48911ee7cb Mon Sep 17 00:00:00 2001 From: Robert Klotzner Date: Thu, 27 Jan 2022 19:34:20 +0100 Subject: [PATCH] Arkadi's fix for the 0.9.16 release (#10742) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Enable download of future forks * Fixed external tests * Fix warning. * cargo fmt * Fix benchmarking test Co-authored-by: arkpar Co-authored-by: Bastian Köcher --- frame/support/src/storage/child.rs | 3 +-- test-utils/runtime/src/system.rs | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/frame/support/src/storage/child.rs b/frame/support/src/storage/child.rs index cf4c0e0148746..7a09be7d3250d 100644 --- a/frame/support/src/storage/child.rs +++ b/frame/support/src/storage/child.rs @@ -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 { 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()), } } diff --git a/test-utils/runtime/src/system.rs b/test-utils/runtime/src/system.rs index 618b27683fc42..977e3212f6fe4 100644 --- a/test-utils/runtime/src/system.rs +++ b/test-utils/runtime/src/system.rs @@ -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()));