From bd5758932b3ce664c2c87069fd6c49a4173ea4d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Fri, 27 Mar 2020 11:21:14 +0100
Subject: [PATCH] Make all `PerThing` types implement all trait methods on the
type (#5422)
This removes the requirement to import `PerThing` to use a type that
implements the trait.
---
substrate/frame/babe/src/lib.rs | 2 +-
substrate/frame/grandpa/src/lib.rs | 2 +-
substrate/frame/im-online/src/lib.rs | 2 +-
substrate/frame/staking/src/inflation.rs | 2 +-
substrate/frame/staking/src/slashing.rs | 2 +-
.../fuzzer/src/per_thing_rational.rs | 3 +-
.../primitives/arithmetic/src/per_things.rs | 55 ++++++++++++++++---
substrate/primitives/runtime/src/curve.rs | 2 +-
8 files changed, 53 insertions(+), 17 deletions(-)
diff --git a/substrate/frame/babe/src/lib.rs b/substrate/frame/babe/src/lib.rs
index 7315d176184..32d5d3c7a5b 100644
--- a/substrate/frame/babe/src/lib.rs
+++ b/substrate/frame/babe/src/lib.rs
@@ -28,7 +28,7 @@ use frame_support::{
weights::{Weight, SimpleDispatchInfo, WeighData},
};
use sp_timestamp::OnTimestampSet;
-use sp_runtime::{generic::DigestItem, ConsensusEngineId, Perbill, PerThing};
+use sp_runtime::{generic::DigestItem, ConsensusEngineId, Perbill};
use sp_runtime::traits::{IsMember, SaturatedConversion, Saturating, Hash, One};
use sp_staking::{
SessionIndex,
diff --git a/substrate/frame/grandpa/src/lib.rs b/substrate/frame/grandpa/src/lib.rs
index 9635bba2d12..030699b5258 100644
--- a/substrate/frame/grandpa/src/lib.rs
+++ b/substrate/frame/grandpa/src/lib.rs
@@ -34,7 +34,7 @@ use sp_std::prelude::*;
use codec::{self as codec, Encode, Decode};
use frame_support::{decl_event, decl_storage, decl_module, decl_error, storage};
use sp_runtime::{
- DispatchResult, generic::{DigestItem, OpaqueDigestItemId}, traits::Zero, Perbill, PerThing,
+ DispatchResult, generic::{DigestItem, OpaqueDigestItemId}, traits::Zero, Perbill,
};
use sp_staking::{
SessionIndex,
diff --git a/substrate/frame/im-online/src/lib.rs b/substrate/frame/im-online/src/lib.rs
index 59f2c681b36..cbce3095b69 100644
--- a/substrate/frame/im-online/src/lib.rs
+++ b/substrate/frame/im-online/src/lib.rs
@@ -81,7 +81,7 @@ use pallet_session::historical::IdentificationTuple;
use sp_runtime::{
offchain::storage::StorageValueRef,
RuntimeDebug,
- traits::{Convert, Member, Saturating, AtLeast32Bit}, Perbill, PerThing,
+ traits::{Convert, Member, Saturating, AtLeast32Bit}, Perbill,
transaction_validity::{
TransactionValidity, ValidTransaction, InvalidTransaction, TransactionSource,
TransactionPriority,
diff --git a/substrate/frame/staking/src/inflation.rs b/substrate/frame/staking/src/inflation.rs
index e75ac3af2bf..d20741d9bc4 100644
--- a/substrate/frame/staking/src/inflation.rs
+++ b/substrate/frame/staking/src/inflation.rs
@@ -19,7 +19,7 @@
//! The staking rate in NPoS is the total amount of tokens staked by nominators and validators,
//! divided by the total token supply.
-use sp_runtime::{Perbill, PerThing, traits::AtLeast32Bit, curve::PiecewiseLinear};
+use sp_runtime::{Perbill, traits::AtLeast32Bit, curve::PiecewiseLinear};
/// The total payout to all validators (and their nominators) per era.
///
diff --git a/substrate/frame/staking/src/slashing.rs b/substrate/frame/staking/src/slashing.rs
index 3d5ea3bad53..26f0828989d 100644
--- a/substrate/frame/staking/src/slashing.rs
+++ b/substrate/frame/staking/src/slashing.rs
@@ -52,7 +52,7 @@ use super::{
EraIndex, Trait, Module, Store, BalanceOf, Exposure, Perbill, SessionInterface,
NegativeImbalanceOf, UnappliedSlash,
};
-use sp_runtime::{traits::{Zero, Saturating}, PerThing, RuntimeDebug};
+use sp_runtime::{traits::{Zero, Saturating}, RuntimeDebug};
use frame_support::{
StorageMap, StorageDoubleMap,
traits::{Currency, OnUnbalanced, Imbalance},
diff --git a/substrate/primitives/arithmetic/fuzzer/src/per_thing_rational.rs b/substrate/primitives/arithmetic/fuzzer/src/per_thing_rational.rs
index 84207cbd164..c2dda3de229 100644
--- a/substrate/primitives/arithmetic/fuzzer/src/per_thing_rational.rs
+++ b/substrate/primitives/arithmetic/fuzzer/src/per_thing_rational.rs
@@ -24,8 +24,7 @@
use honggfuzz::fuzz;
use sp_arithmetic::{
- PerThing, PerU16, Percent, Perbill, Perquintill, assert_eq_error_rate,
- traits::SaturatedConversion,
+ PerThing, PerU16, Percent, Perbill, Perquintill, traits::SaturatedConversion,
};
fn main() {
diff --git a/substrate/primitives/arithmetic/src/per_things.rs b/substrate/primitives/arithmetic/src/per_things.rs
index ca6967456b1..86b0fa59a6b 100644
--- a/substrate/primitives/arithmetic/src/per_things.rs
+++ b/substrate/primitives/arithmetic/src/per_things.rs
@@ -19,9 +19,7 @@ use serde::{Serialize, Deserialize};
use sp_std::{ops, fmt, prelude::*, convert::TryInto};
use codec::{Encode, Decode, CompactAs};
-use crate::{
- traits::{SaturatedConversion, UniqueSaturatedInto, Saturating, BaseArithmetic, Bounded},
-};
+use crate::traits::{SaturatedConversion, UniqueSaturatedInto, Saturating, BaseArithmetic, Bounded};
use sp_debug_derive::RuntimeDebug;
/// Something that implements a fixed point ration with an arbitrary granularity `X`, as _parts per
@@ -103,8 +101,8 @@ pub trait PerThing:
/// # }
/// ```
fn mul_collapse<N>(self, b: N) -> N
- where N: Clone + From<Self::Inner> + UniqueSaturatedInto<Self::Inner> + ops::Rem<N, Output=N>
- + ops::Div<N, Output=N> + ops::Mul<N, Output=N> + ops::Add<N, Output=N>;
+ where N: Clone + From<Self::Inner> + UniqueSaturatedInto<Self::Inner> + ops::Rem<N, Output=N>
+ + ops::Div<N, Output=N> + ops::Mul<N, Output=N> + ops::Add<N, Output=N>;
}
macro_rules! implement_per_thing {
@@ -259,13 +257,52 @@ macro_rules! implement_per_thing {
Self([x, 100][(x > 100) as usize] * ($max / 100))
}
- /// Everything.
- ///
- /// To avoid having to import `PerThing` when one needs to be used in test mocks.
- #[cfg(feature = "std")]
+ /// See [`PerThing::one`].
pub fn one() -> Self {
<Self as PerThing>::one()
}
+
+ /// See [`PerThing::zero`].
+ pub fn zero() -> Self {
+ <Self as PerThing>::zero()
+ }
+
+ /// See [`PerThing::is_zero`].
+ pub fn is_zero(&self) -> bool {
+ PerThing::is_zero(self)
+ }
+
+ /// See [`PerThing::deconstruct`].
+ pub fn deconstruct(self) -> $type {
+ PerThing::deconstruct(self)
+ }
+
+ /// See [`PerThing::square`].
+ pub fn square(self) -> Self {
+ PerThing::square(self)
+ }
+
+ /// See [`PerThing::from_fraction`].
+ #[cfg(feature = "std")]
+ pub fn from_fraction(x: f64) -> Self {
+ <Self as PerThing>::from_fraction(x)
+ }
+
+ /// See [`PerThing::from_rational_approximation`].
+ pub fn from_rational_approximation<N>(p: N, q: N) -> Self
+ where N: Clone + Ord + From<$type> + TryInto<$type> +
+ TryInto<$upper_type> + ops::Div<N, Output=N> + ops::Rem<N, Output=N> +
+ ops::Add<N, Output=N> {
+ <Self as PerThing>::from_rational_approximation(p, q)
+ }
+
+ /// See [`PerThing::mul_collapse`].
+ pub fn mul_collapse<N>(self, b: N) -> N
+ where N: Clone + From<$type> + UniqueSaturatedInto<$type> +
+ ops::Rem<N, Output=N> + ops::Div<N, Output=N> + ops::Mul<N, Output=N> +
+ ops::Add<N, Output=N> {
+ PerThing::mul_collapse(self, b)
+ }
}
impl Saturating for $name {
diff --git a/substrate/primitives/runtime/src/curve.rs b/substrate/primitives/runtime/src/curve.rs
index e04ce77fb2c..b00cbed6525 100644
--- a/substrate/primitives/runtime/src/curve.rs
+++ b/substrate/primitives/runtime/src/curve.rs
@@ -16,7 +16,7 @@
//! Provides some utilities to define a piecewise linear function.
-use crate::{Perbill, PerThing, traits::{AtLeast32Bit, SaturatedConversion}};
+use crate::{Perbill, traits::{AtLeast32Bit, SaturatedConversion}};
use core::ops::Sub;
/// Piecewise Linear function in [0, 1] -> [0, 1].
--
GitLab