Companion PR for paritytech/substrate#5954 (#1081)

* Update for split weights

* Update `Cargo.lock`

* Bump all `spec_version`s

Co-authored-by: Bastian Köcher <git@kchr.de>
This commit is contained in:
Shawn Tabrizi
2020-05-12 14:07:20 +02:00
committed by GitHub
parent d5033456bb
commit 105b4b4d56
6 changed files with 224 additions and 208 deletions
+1 -1
View File
@@ -86,8 +86,8 @@ pub struct TargetedFeeAdjustment<T, R>(sp_std::marker::PhantomData<(T, R)>);
impl<T: Get<Perquintill>, R: system::Trait> Convert<Fixed128, Fixed128> for TargetedFeeAdjustment<T, R> {
fn convert(multiplier: Fixed128) -> Fixed128 {
let block_weight = <system::Module<R>>::all_extrinsics_weight();
let max_weight = MaximumBlockWeight::get();
let block_weight = <system::Module<R>>::all_extrinsics_weight().total().min(max_weight);
let target_weight = (T::get() * max_weight) as u128;
let block_weight = block_weight as u128;