Companion for #6046 (#1104)

* Update impls.rs

* companion for substrate#6069

* update to latest changes

* Update Cargo.lock

* Bump

Co-authored-by: André Silva <andre.beat@gmail.com>
Co-authored-by: Gav Wood <gavin@parity.io>
This commit is contained in:
Shawn Tabrizi
2020-05-21 17:00:45 +02:00
committed by GitHub
parent bf79c453d9
commit b01ee6eb00
2 changed files with 133 additions and 133 deletions
+132 -132
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -87,7 +87,7 @@ 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 max_weight = MaximumBlockWeight::get();
let block_weight = <system::Module<R>>::all_extrinsics_weight().total().min(max_weight);
let block_weight = <system::Module<R>>::block_weight().total().min(max_weight);
let target_weight = (T::get() * max_weight) as u128;
let block_weight = block_weight as u128;