mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-05-06 14:58:03 +00:00
49b6dfd2e5
* Cargo.lock after merge * Restore scale-info feature * Fully qualify TypeInfo derive * Skip PendingSwap T * Add missing skip_type_params attr * metadata docs features * Reduce pallet event attribute to struct * Cargo.lock * Update frame/balances/src/tests_composite.rs Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com> * Line widths check * Cargo.lock * Add scale-info/std * Update frame/system/src/lib.rs Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com> * Use `skip_type_params` to remove `TypeInfo` requirements on checks * Revert "Remove unused Call metadata stuff" This reverts commit 41311f85 * Skip BalanceSwapAction type parameter * Remove unused event metadata macro * Update frame-metadata * Update primitives/npos-elections/compact/src/codec.rs Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com> * Manual TypeInfo for Header * Remove TypeInfo requirement for consts in BoundedVec etc. * Another TypeInfo bound removed * review: fix indentation * TypeInfo impls for Identity types * Add some todos to add custom TypeInfo impls * Update frame/support/procedural/src/pallet/expand/pallet_struct.rs Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com> * Add some todos to add custom TypeInfo impls * Add a test for manual Data TypeInfo impl * Add custom TypeInfo impl for Vote * Era custom TypeInfo crimes * Revert finality-grandpa version to 0.14.z * review: renamed module to pallet_constants_metadata * New line at end of file * Add missing scale-info/std * Update frame/support/src/storage/types/mod.rs Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com> * Remove StorageEntryType::Map unused flag * Add missing scale-info dependency after merge * SignedExtension::AdditionalSigned metadata * Update frame-metadata, use abbreviated docs and args fields * Update frame/example/Cargo.toml Co-authored-by: Keith Yeung <kungfukeith11@gmail.com> * Add scale_info/std and remove unused scale-info dependency * Remove scale-info dependency * Remove treasury pallet::metadata * Remove redundant Event test * Add back scale-info as dev dependency * fix error metadata when no error defined in decl_module * Add Module3 to tests * Fix metadata test * Add docs feature to frame-support test * WIP fixing pallet metadata test * Remove redundant FunctionMetadata, FunctionArgumentMetadata as per https://github.com/paritytech/frame-metadata/pull/20 * Use main branch of frame-metadata * Use patch of scale-info for latest changes * Use latest patched scale-info * Manual TypeInfo for DigestItem * Manual TypeInfo for DigestItem * Update scale-info * Skip __Ignore variants for Error, depends on https://github.com/paritytech/scale-info/pull/117 * Named fields for FRAME v2 pallet Call variants * Named fields for FRAME v1 pallet Call variants * Add missing scale-info dependency * WIP expand benchmark call variant * fix benchmark with new function create a new function for each variant of a pallet call. This function is called by benchmarking macro in order not to break call creation with unnamed argument * fix tests * more fix * Fix staking tests * Fix offchain workers calls * Cherry pick rustfmt.toml from master * cargo +nightly-2021-06-22 fmt --all * Update to new call variant structs * More call variant struct updates * Remove unused import * More call variant structs * More call variant structs * Even more call variant structs * Mooar variant structs * Evermore variant structs * Call variant structs ad infinitum * Fmt * More call variants * Last call variant * Call variants all done? * Fix SS58Prefix type * Potential workaround for BitFlags<IdentityFields> TypeInfo * Enable docs capturing for Call, Event, and Error types * Fix IdentityFields TypeInfo * Remove metadata-docs feature * Add capture_docs = true for legacy Call, Event and Error types * Fmt * Fix metadata test type * Update benchmarks with call struct variants * Fmt * More test fixes * Fmt * Fix benches * Use latest capture_docs attr * Latest scale_info * Fmt * review: change &Vec to &[] * Remove pallet metadata attr * review: remove commented out test code * review: skip_type_params trailing comma suggestion * Update to scale-info 0.10.0 * Update construct_runtime ui tests, different because of metadata TypeInfo impls * Add some TypeInfo derives for UI tests * Update storage ensure span ui stderrs * Update call argument bound ui tests Possibly changed because change from tuple to struct variants? * Add scale-info dev dependency * Update to latest finality-grandpa release * review: missing newline * review: missing scale-info/std * review: remove duplicate scale-info/std * review: remove fully qualified TypeInfo * review: add missing scale-info/std * review: remove unnecessary imports. * Fmt * Use crates.io RC version of frame-metadata * Remove scale-info/std because it is a dev dependency * Add missing scale_info dev-dependency for test * Delete empty metadata folder * Fix sp_std import * review: improve manual UncheckedExtrinsic TypeInfo impl * review: use full scale-info for dev-dependency * Remove DefaultByteGetter impl * review: derive TypeInfo for generic header * Fmt * Update primitives/runtime/src/generic/unchecked_extrinsic.rs Co-authored-by: Keith Yeung <kungfukeith11@gmail.com> * Update primitives/runtime/src/generic/unchecked_extrinsic.rs Co-authored-by: Keith Yeung <kungfukeith11@gmail.com> * Update bin/node/executor/Cargo.toml Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * Update frame/identity/src/types.rs Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * Update frame/support/src/dispatch.rs Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * Remove redundant derive * Simplify scale-info dependency * Strip underscore prefix from call variant struct names * Another underscore field * More underscore fields * Another underscore field * Update to frame-metadata 14.0.0-rc.2 with combined StorageEntryType::Map * Fmt * Revert weights formatting * Fix up some tests * Fix up some tests for StorageEntryTypeMetadata * scale-info dev dependency * Fix test error * Add missing TypeInfo derives * Add back missing scale-info dependency * Add back missing scale-info dependency * Fix npos compact impls * Cargo.lock * Fmt * Fix errors * Fmt * Fix renamed raw_solution field * Fix error * Fmt * Fix some benchmarks * Fmt * Stray R * Fix * Add missing TypeInfos * ui test fix * Fix line widths * Revert "ui test fix" This reverts commit 2d15ec058a216e3f92d713f1174603a2bb1eac65. * Upgrade to scale-info 0.11.0 * Revert "Upgrade to scale-info 0.11.0" This reverts commit 047bb179085a0059c36cd20ab405f55cf0867e28. * Add Runtime type * Update to scale-info 0.12 * Update to scale-info 1.0 * Update frame-metadata to version 14.0.0 * Patch finality-grandpa until release available * Fix metadata tests * Fix metadata tests * Fmt * Remove patched finality-grandpa * Fix tests, use scale_info imports * Fix pallet tests * Add BlockNumber TypeInfo bound * ui test fix * Cargo.lock * Remove pallet metadata * Cargo.lock * Add missing scale-info dependency * Remove pallet event metadata * Fix error * Fix collective errors * Semicolol * Fmt * Remove another metadata attribute * Add new variant to custom digest TypeInfo * Fmt * Cargo.lock from master * Remove comma lol * Fix example call error * Fix example call error properly Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com> Co-authored-by: Keith Yeung <kungfukeith11@gmail.com> Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com> Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
167 lines
5.1 KiB
Rust
167 lines
5.1 KiB
Rust
// This file is part of Substrate.
|
|
|
|
// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
//! Provides some utilities to define a piecewise linear function.
|
|
|
|
use crate::{
|
|
traits::{AtLeast32BitUnsigned, SaturatedConversion},
|
|
Perbill,
|
|
};
|
|
use core::ops::Sub;
|
|
|
|
/// Piecewise Linear function in [0, 1] -> [0, 1].
|
|
#[derive(PartialEq, Eq, sp_core::RuntimeDebug, scale_info::TypeInfo)]
|
|
pub struct PiecewiseLinear<'a> {
|
|
/// Array of points. Must be in order from the lowest abscissas to the highest.
|
|
pub points: &'a [(Perbill, Perbill)],
|
|
/// The maximum value that can be returned.
|
|
pub maximum: Perbill,
|
|
}
|
|
|
|
fn abs_sub<N: Ord + Sub<Output = N> + Clone>(a: N, b: N) -> N where {
|
|
a.clone().max(b.clone()) - a.min(b)
|
|
}
|
|
|
|
impl<'a> PiecewiseLinear<'a> {
|
|
/// Compute `f(n/d)*d` with `n <= d`. This is useful to avoid loss of precision.
|
|
pub fn calculate_for_fraction_times_denominator<N>(&self, n: N, d: N) -> N
|
|
where
|
|
N: AtLeast32BitUnsigned + Clone,
|
|
{
|
|
let n = n.min(d.clone());
|
|
|
|
if self.points.is_empty() {
|
|
return N::zero()
|
|
}
|
|
|
|
let next_point_index = self.points.iter().position(|p| n < p.0 * d.clone());
|
|
|
|
let (prev, next) = if let Some(next_point_index) = next_point_index {
|
|
if let Some(previous_point_index) = next_point_index.checked_sub(1) {
|
|
(self.points[previous_point_index], self.points[next_point_index])
|
|
} else {
|
|
// There is no previous points, take first point ordinate
|
|
return self.points.first().map(|p| p.1).unwrap_or_else(Perbill::zero) * d
|
|
}
|
|
} else {
|
|
// There is no next points, take last point ordinate
|
|
return self.points.last().map(|p| p.1).unwrap_or_else(Perbill::zero) * d
|
|
};
|
|
|
|
let delta_y = multiply_by_rational_saturating(
|
|
abs_sub(n.clone(), prev.0 * d.clone()),
|
|
abs_sub(next.1.deconstruct(), prev.1.deconstruct()),
|
|
// Must not saturate as prev abscissa > next abscissa
|
|
next.0.deconstruct().saturating_sub(prev.0.deconstruct()),
|
|
);
|
|
|
|
// If both subtractions are same sign then result is positive
|
|
if (n > prev.0 * d.clone()) == (next.1.deconstruct() > prev.1.deconstruct()) {
|
|
(prev.1 * d).saturating_add(delta_y)
|
|
// Otherwise result is negative
|
|
} else {
|
|
(prev.1 * d).saturating_sub(delta_y)
|
|
}
|
|
}
|
|
}
|
|
|
|
// Compute value * p / q.
|
|
// This is guaranteed not to overflow on whatever values nor lose precision.
|
|
// `q` must be superior to zero.
|
|
fn multiply_by_rational_saturating<N>(value: N, p: u32, q: u32) -> N
|
|
where
|
|
N: AtLeast32BitUnsigned + Clone,
|
|
{
|
|
let q = q.max(1);
|
|
|
|
// Mul can saturate if p > q
|
|
let result_divisor_part = (value.clone() / q.into()).saturating_mul(p.into());
|
|
|
|
let result_remainder_part = {
|
|
let rem = value % q.into();
|
|
|
|
// Fits into u32 because q is u32 and remainder < q
|
|
let rem_u32 = rem.saturated_into::<u32>();
|
|
|
|
// Multiplication fits into u64 as both term are u32
|
|
let rem_part = rem_u32 as u64 * p as u64 / q as u64;
|
|
|
|
// Can saturate if p > q
|
|
rem_part.saturated_into::<N>()
|
|
};
|
|
|
|
// Can saturate if p > q
|
|
result_divisor_part.saturating_add(result_remainder_part)
|
|
}
|
|
|
|
#[test]
|
|
fn test_multiply_by_rational_saturating() {
|
|
use std::convert::TryInto;
|
|
|
|
let div = 100u32;
|
|
for value in 0..=div {
|
|
for p in 0..=div {
|
|
for q in 1..=div {
|
|
let value: u64 =
|
|
(value as u128 * u64::MAX as u128 / div as u128).try_into().unwrap();
|
|
let p = (p as u64 * u32::MAX as u64 / div as u64).try_into().unwrap();
|
|
let q = (q as u64 * u32::MAX as u64 / div as u64).try_into().unwrap();
|
|
|
|
assert_eq!(
|
|
multiply_by_rational_saturating(value, p, q),
|
|
(value as u128 * p as u128 / q as u128).try_into().unwrap_or(u64::MAX)
|
|
);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn test_calculate_for_fraction_times_denominator() {
|
|
use std::convert::TryInto;
|
|
|
|
let curve = PiecewiseLinear {
|
|
points: &[
|
|
(Perbill::from_parts(0_000_000_000), Perbill::from_parts(0_500_000_000)),
|
|
(Perbill::from_parts(0_500_000_000), Perbill::from_parts(1_000_000_000)),
|
|
(Perbill::from_parts(1_000_000_000), Perbill::from_parts(0_000_000_000)),
|
|
],
|
|
maximum: Perbill::from_parts(1_000_000_000),
|
|
};
|
|
|
|
pub fn formal_calculate_for_fraction_times_denominator(n: u64, d: u64) -> u64 {
|
|
if n <= Perbill::from_parts(0_500_000_000) * d.clone() {
|
|
n + d / 2
|
|
} else {
|
|
(d as u128 * 2 - n as u128 * 2).try_into().unwrap()
|
|
}
|
|
}
|
|
|
|
let div = 100u32;
|
|
for d in 0..=div {
|
|
for n in 0..=d {
|
|
let d: u64 = (d as u128 * u64::MAX as u128 / div as u128).try_into().unwrap();
|
|
let n: u64 = (n as u128 * u64::MAX as u128 / div as u128).try_into().unwrap();
|
|
|
|
let res = curve.calculate_for_fraction_times_denominator(n, d);
|
|
let expected = formal_calculate_for_fraction_times_denominator(n, d);
|
|
|
|
assert!(abs_sub(res, expected) <= 1);
|
|
}
|
|
}
|
|
}
|