Update substrate for new on_initialize syntax and update on_initialize weight (#937)

* update new on_initialize syntax

* update substrate

* update spec_version
This commit is contained in:
thiolliere
2020-03-25 14:10:11 +01:00
committed by GitHub
parent d52c3a45a7
commit 62cddd6fcb
8 changed files with 1419 additions and 1288 deletions
+6 -3
View File
@@ -35,7 +35,7 @@ use sp_staking::{
use frame_support::{
traits::KeyOwnerProofSystem,
dispatch::{IsSubType},
weights::{DispatchInfo, SimpleDispatchInfo},
weights::{DispatchInfo, SimpleDispatchInfo, Weight, WeighData},
};
use primitives::{
Balance,
@@ -516,7 +516,7 @@ decl_module! {
Ok(())
}
fn on_initialize() {
fn on_initialize() -> Weight {
<Self as Store>::DidUpdate::kill();
let current_session = <session::Module<T>>::current_index();
@@ -538,6 +538,8 @@ decl_module! {
}
}
<ParentToSessionIndex<T>>::insert(parent_hash, current_session);
SimpleDispatchInfo::default().weigh_data(())
}
fn on_finalize() {
@@ -1204,7 +1206,7 @@ mod tests {
impl_opaque_keys,
Perbill, curve::PiecewiseLinear, testing::{Header},
traits::{
BlakeTwo256, IdentityLookup, OnInitialize, OnFinalize, SaturatedConversion,
BlakeTwo256, IdentityLookup, SaturatedConversion,
OpaqueKeys,
},
};
@@ -1218,6 +1220,7 @@ mod tests {
use keyring::Sr25519Keyring;
use frame_support::{
impl_outer_origin, impl_outer_dispatch, assert_ok, assert_err, parameter_types,
traits::{OnInitialize, OnFinalize},
};
use crate::parachains;
use crate::registrar;