pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-17 14:51:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Companion for #5877 (#1123)

Browse Source 
* Fixed point methods renames.

* Bump

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
Co-authored-by: Gav Wood <gavin@parity.io>
This commit is contained in:
Marcio Diaz
2020-05-21 22:11:33 +02:00
committed by GitHub
parent ddc6d5d5f8
commit aa13e5df14
2 changed files with 138 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/Cargo.lock
Generated
+132 -133
View File
File diff suppressed because it is too large Load Diff
polkadot/runtime/common/src/impls.rs
+6 -10
View File
@@ -16,9 +16,8 @@
//! Auxillary struct/enums for polkadot runtime. //! Auxillary struct/enums for polkadot runtime.
use core::num::NonZeroI128;
use sp_runtime::traits::{Convert, Saturating}; use sp_runtime::traits::{Convert, Saturating};
use sp_runtime::{Fixed128, Perquintill}; use sp_runtime::{FixedPointNumber, Fixed128, Perquintill};
use frame_support::traits::{OnUnbalanced, Imbalance, Currency, Get}; use frame_support::traits::{OnUnbalanced, Imbalance, Currency, Get};
use crate::{MaximumBlockWeight, NegativeImbalance}; use crate::{MaximumBlockWeight, NegativeImbalance};
@@ -95,17 +94,14 @@ impl<T: Get<Perquintill>, R: system::Trait> Convert<Fixed128, Fixed128> for Targ
let positive = block_weight >= target_weight; let positive = block_weight >= target_weight;
let diff_abs = block_weight.max(target_weight) - block_weight.min(target_weight); let diff_abs = block_weight.max(target_weight) - block_weight.min(target_weight);
// safe, diff_abs cannot exceed u64 and it can always be computed safely even with the lossy // safe, diff_abs cannot exceed u64 and it can always be computed safely even with the lossy
// `Fixed128::from_rational`. // `Fixed128::saturating_from_rational`.
let diff = Fixed128::from_rational( let diff = Fixed128::saturating_from_rational(diff_abs, max_weight.max(1));
diff_abs as i128,
NonZeroI128::new(max_weight.max(1) as i128).unwrap(),
);
let diff_squared = diff.saturating_mul(diff); let diff_squared = diff.saturating_mul(diff);
// 0.00004 = 4/100_000 = 40_000/10^9 // 0.00004 = 4/100_000 = 40_000/10^9
let v = Fixed128::from_rational(4, NonZeroI128::new(100_000).unwrap()); let v = Fixed128::saturating_from_rational(4, 100_000);
// 0.00004^2 = 16/10^10 Taking the future /2 into account... 8/10^10 // 0.00004^2 = 16/10^10 Taking the future /2 into account... 8/10^10
let v_squared_2 = Fixed128::from_rational(8, NonZeroI128::new(10_000_000_000).unwrap()); let v_squared_2 = Fixed128::saturating_from_rational(8, 10_000_000_000u64);
let first_term = v.saturating_mul(diff); let first_term = v.saturating_mul(diff);
let second_term = v_squared_2.saturating_mul(diff_squared); let second_term = v_squared_2.saturating_mul(diff_squared);
@@ -124,7 +120,7 @@ impl<T: Get<Perquintill>, R: system::Trait> Convert<Fixed128, Fixed128> for Targ
// multiplier. While at -1, it means that the network is so un-congested that all // multiplier. While at -1, it means that the network is so un-congested that all
// transactions have no weight fee. We stop here and only increase if the network // transactions have no weight fee. We stop here and only increase if the network
// became more busy. // became more busy.
.max(Fixed128::from_natural(-1)) .max(Fixed128::saturating_from_integer(-1))
} }
} }
} }