Unverified Commit 7b116e35 authored by Shawn Tabrizi's avatar Shawn Tabrizi Committed by GitHub
Browse files

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's avatarBastian Köcher <git@kchr.de>
parent 5d661e12
Pipeline #92095 passed with stages
in 22 minutes and 58 seconds
This diff is collapsed.
......@@ -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;
......
......@@ -217,7 +217,7 @@ pub trait GetSessionNumber {
impl GetSessionNumber for sp_session::MembershipProof {
fn session(&self) -> SessionIndex {
self.session()
self.session
}
}
......
......@@ -83,7 +83,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("kusama"),
impl_name: create_runtime_str!("parity-kusama"),
authoring_version: 2,
spec_version: 1063,
spec_version: 1064,
impl_version: 0,
apis: RUNTIME_API_VERSIONS,
transaction_version: 1,
......
......@@ -86,7 +86,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("polkadot"),
impl_name: create_runtime_str!("parity-polkadot"),
authoring_version: 2,
spec_version: 1010,
spec_version: 1011,
impl_version: 0,
apis: RUNTIME_API_VERSIONS,
transaction_version: 1,
......
......@@ -83,7 +83,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("westend"),
impl_name: create_runtime_str!("parity-westend"),
authoring_version: 2,
spec_version: 9,
spec_version: 10,
impl_version: 0,
apis: RUNTIME_API_VERSIONS,
transaction_version: 1,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment