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

Fix on_runtime_upgrade weight recording #7480

Merged
shawntabrizi merged 5 commits into from
Nov 3, 2020
Merged

Fix on_runtime_upgrade weight recording #7480

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7eaf472
Fix on_runtime_upgrade weight recording
shawntabrizi Nov 2, 2020
bdf870d
fix naming
shawntabrizi Nov 3, 2020
33f6051
Update lib.rs
shawntabrizi Nov 3, 2020
63c1756
fix line width
shawntabrizi Nov 3, 2020
6d225a5
fix line width again
shawntabrizi Nov 3, 2020
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
Next Next commit
Update lib.rs
  • Loading branch information
@shawntabrizi
shawntabrizi committed Nov 3, 2020
commit 33f6051482b6fae9e8eeb4047b92325550a0bae7
4 changes: 3 additions & 1 deletion frame/executive/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ where
digest,
frame_system::InitKind::Full,
);
Comment thread
apopiak marked this conversation as resolved.
<frame_system::Module<System> as OnInitialize<System::BlockNumber>>::on_initialize(*block_number);
weight = weight.saturating_add(<frame_system::Module<System> as OnInitialize<System::BlockNumber>>::on_initialize(*block_number));
weight = weight.saturating_add(<AllModules as OnInitialize<System::BlockNumber>>::on_initialize(*block_number))
.saturating_add(<System::BlockExecutionWeight as frame_support::traits::Get<_>>::get());
<frame_system::Module::<System>>::register_extra_weight_unchecked(weight, DispatchClass::Mandatory);
Expand Down Expand Up @@ -1097,6 +1097,7 @@ mod tests {
let frame_system_upgrade_weight = <frame_system::Module::<Runtime> as OnRuntimeUpgrade>::on_runtime_upgrade();
let custom_runtime_upgrade_weight = CustomOnRuntimeUpgrade::on_runtime_upgrade();
let runtime_upgrade_weight = <AllModules as OnRuntimeUpgrade>::on_runtime_upgrade();
let frame_system_on_initialize_weight = <frame_system::Module<Runtime> as OnInitialize<u64>>::on_initialize(block_number);
let on_initialize_weight = <AllModules as OnInitialize<u64>>::on_initialize(block_number);
let base_block_weight = <Runtime as frame_system::Trait>::BlockExecutionWeight::get();

Expand All @@ -1106,6 +1107,7 @@ mod tests {
frame_system_upgrade_weight +
custom_runtime_upgrade_weight +
runtime_upgrade_weight +
frame_system_on_initialize_weight +
on_initialize_weight +
base_block_weight,
);
Expand Down