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 <git@kchr.de>
This commit is contained in:
Shawn Tabrizi
2020-05-12 14:07:20 +02:00
committed by GitHub
parent d5033456bb
commit 105b4b4d56
6 changed files with 224 additions and 208 deletions
+219 -203
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -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> { impl<T: Get<Perquintill>, R: system::Trait> Convert<Fixed128, Fixed128> for TargetedFeeAdjustment<T, R> {
fn convert(multiplier: Fixed128) -> Fixed128 { fn convert(multiplier: Fixed128) -> Fixed128 {
let block_weight = <system::Module<R>>::all_extrinsics_weight();
let max_weight = MaximumBlockWeight::get(); 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 target_weight = (T::get() * max_weight) as u128;
let block_weight = block_weight as u128; let block_weight = block_weight as u128;
+1 -1
View File
@@ -217,7 +217,7 @@ pub trait GetSessionNumber {
impl GetSessionNumber for sp_session::MembershipProof { impl GetSessionNumber for sp_session::MembershipProof {
fn session(&self) -> SessionIndex { fn session(&self) -> SessionIndex {
self.session() self.session
} }
} }
+1 -1
View File
@@ -83,7 +83,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("kusama"), spec_name: create_runtime_str!("kusama"),
impl_name: create_runtime_str!("parity-kusama"), impl_name: create_runtime_str!("parity-kusama"),
authoring_version: 2, authoring_version: 2,
spec_version: 1063, spec_version: 1064,
impl_version: 0, impl_version: 0,
apis: RUNTIME_API_VERSIONS, apis: RUNTIME_API_VERSIONS,
transaction_version: 1, transaction_version: 1,
+1 -1
View File
@@ -86,7 +86,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("polkadot"), spec_name: create_runtime_str!("polkadot"),
impl_name: create_runtime_str!("parity-polkadot"), impl_name: create_runtime_str!("parity-polkadot"),
authoring_version: 2, authoring_version: 2,
spec_version: 1010, spec_version: 1011,
impl_version: 0, impl_version: 0,
apis: RUNTIME_API_VERSIONS, apis: RUNTIME_API_VERSIONS,
transaction_version: 1, transaction_version: 1,
+1 -1
View File
@@ -83,7 +83,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("westend"), spec_name: create_runtime_str!("westend"),
impl_name: create_runtime_str!("parity-westend"), impl_name: create_runtime_str!("parity-westend"),
authoring_version: 2, authoring_version: 2,
spec_version: 9, spec_version: 10,
impl_version: 0, impl_version: 0,
apis: RUNTIME_API_VERSIONS, apis: RUNTIME_API_VERSIONS,
transaction_version: 1, transaction_version: 1,