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

WeightInfo for System, Timestamp, and Utility #6868

Merged
15 commits merged into from
Aug 17, 2020
Merged

WeightInfo for System, Timestamp, and Utility #6868

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
8672f1b
initial updates to system
shawntabrizi Aug 5, 2020
78daffb
fix compile
shawntabrizi Aug 5, 2020
996f083
Update writer.rs
shawntabrizi Aug 5, 2020
66fa889
update weights
shawntabrizi Aug 5, 2020
0277875
finish system weights
shawntabrizi Aug 5, 2020
e57195c
Merge branch 'master' into shawntabrizi-more-weights
shawntabrizi Aug 10, 2020
676236d
timestamp weights
shawntabrizi Aug 10, 2020
792a216
utility weight
shawntabrizi Aug 10, 2020
50a724f
Fix overflow in weight calculations
shawntabrizi Aug 13, 2020
2e58cdd
add back weight notes
shawntabrizi Aug 13, 2020
da6b4f9
Update for whitelisted benchmarks
shawntabrizi Aug 16, 2020
12b08b7
add trait bounds
shawntabrizi Aug 17, 2020
a79855a
Revert "add trait bounds"
shawntabrizi Aug 17, 2020
50dba7c
Merge branch 'master' into shawntabrizi-more-weights
shawntabrizi Aug 17, 2020
124a2a3
Update weights for unaccounted for read
shawntabrizi Aug 17, 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
Fix overflow in weight calculations
  • Loading branch information
@shawntabrizi
shawntabrizi committed Aug 13, 2020
commit 50a724f4b4d4d680c9dc30f972975062c35cccb7
2 changes: 1 addition & 1 deletion frame/system/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -682,7 +682,7 @@ decl_module! {
/// - Writes: Number of subkeys + 1
/// # </weight>
#[weight = (
T::SystemWeightInfo::kill_prefix(*_subkeys + 1),
T::SystemWeightInfo::kill_prefix(_subkeys.saturating_add(1)),
DispatchClass::Operational,
)]
fn kill_prefix(origin, prefix: Key, _subkeys: u32) {
Expand Down
2 changes: 1 addition & 1 deletion frame/utility/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ decl_module! {
#[weight = (
calls.iter()
.map(|call| call.get_dispatch_info().weight)
.sum::<Weight>()
.fold(0, |total: Weight, weight: Weight| total.saturating_add(weight))
.saturating_add(T::WeightInfo::batch(calls.len() as u32)),
{
let all_operational = calls.iter()
Expand Down
20 changes: 19 additions & 1 deletion frame/utility/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ impl_outer_dispatch! {
pub struct Test;
parameter_types! {
pub const BlockHashCount: u64 = 250;
pub const MaximumBlockWeight: Weight = 1024;
pub const MaximumBlockWeight: Weight = Weight::max_value();
pub const MaximumBlockLength: u32 = 2 * 1024;
pub const AvailableBlockRatio: Perbill = Perbill::one();
}
Expand Down Expand Up @@ -121,6 +121,7 @@ type System = frame_system::Module<Test>;
type Balances = pallet_balances::Module<Test>;
type Utility = Module<Test>;

use frame_system::Call as SystemCall;
use pallet_balances::Call as BalancesCall;
use pallet_balances::Error as BalancesError;

Expand Down Expand Up @@ -236,3 +237,20 @@ fn batch_early_exit_works() {
assert_eq!(Balances::free_balance(2), 15);
});
}

#[test]
fn batch_weight_calculation_doesnt_overflow() {
new_test_ext().execute_with(|| {
let big_call = Call::System(SystemCall::fill_block(Perbill::from_percent(50)));
assert_eq!(big_call.get_dispatch_info().weight, Weight::max_value() / 2);

// 3 * 50% saturates to 100%
let batch_call = Call::Utility(crate::Call::batch(vec![
big_call.clone(),
big_call.clone(),
big_call.clone(),
]));

assert_eq!(batch_call.get_dispatch_info().weight, Weight::max_value());
});
}