This commit is contained in:
thiolliere
2020-03-27 12:38:14 +01:00
committed by GitHub
parent eed0045a0c
commit 7abc577017
3 changed files with 12 additions and 5 deletions
+11 -1
View File
@@ -40,6 +40,8 @@ use crate::{
CompactAssignments, ValidatorIndex, NominatorIndex, Validators, OffchainAccuracy,
};
const INIT_TIMESTAMP: u64 = 30_000;
/// The AccountId alias in this test module.
pub(crate) type AccountId = u64;
pub(crate) type AccountIndex = u64;
@@ -482,6 +484,14 @@ impl ExtBuilder {
let validators = Session::validators();
SESSION.with(|x| *x.borrow_mut() = (validators.clone(), HashSet::new()));
});
// We consider all test to start after timestamp is initialized
// This must be ensured by having `timestamp::on_initialize` called before
// `staking::on_initialize`
ext.execute_with(|| {
Timestamp::set_timestamp(INIT_TIMESTAMP);
});
ext
}
}
@@ -593,7 +603,7 @@ pub fn start_session(session_index: SessionIndex) {
for i in Session::current_index()..session_index {
Staking::on_finalize(System::block_number());
System::set_block_number((i + 1).into());
Timestamp::set_timestamp(System::block_number() * 1000);
Timestamp::set_timestamp(System::block_number() * 1000 + INIT_TIMESTAMP);
Session::on_initialize(System::block_number());
Staking::on_initialize(System::block_number());
}