pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-19 11:11:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix tests (#5416)

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
substrate/frame/staking/src/mock.rs
+11 -1
View File
@@ -40,6 +40,8 @@ use crate::{
CompactAssignments, ValidatorIndex, NominatorIndex, Validators, OffchainAccuracy, CompactAssignments, ValidatorIndex, NominatorIndex, Validators, OffchainAccuracy,
}; };
const INIT_TIMESTAMP: u64 = 30_000;
/// The AccountId alias in this test module. /// The AccountId alias in this test module.
pub(crate) type AccountId = u64; pub(crate) type AccountId = u64;
pub(crate) type AccountIndex = u64; pub(crate) type AccountIndex = u64;
@@ -482,6 +484,14 @@ impl ExtBuilder {
let validators = Session::validators(); let validators = Session::validators();
SESSION.with(|x| *x.borrow_mut() = (validators.clone(), HashSet::new())); 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 ext
} }
} }
@@ -593,7 +603,7 @@ pub fn start_session(session_index: SessionIndex) {
for i in Session::current_index()..session_index { for i in Session::current_index()..session_index {
Staking::on_finalize(System::block_number()); Staking::on_finalize(System::block_number());
System::set_block_number((i + 1).into()); 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()); Session::on_initialize(System::block_number());
Staking::on_initialize(System::block_number()); Staking::on_initialize(System::block_number());
} }
substrate/frame/staking/src/tests.rs
-3
View File
@@ -254,8 +254,6 @@ fn staking_should_work() {
// --- Block 1: // --- Block 1:
start_session(1); start_session(1);
Timestamp::set_timestamp(1); // Initialize time.
// remember + compare this along with the test. // remember + compare this along with the test.
assert_eq_uvec!(validator_controllers(), vec![20, 10]); assert_eq_uvec!(validator_controllers(), vec![20, 10]);
@@ -1039,7 +1037,6 @@ fn bond_extra_and_withdraw_unbonded_works() {
assert_ne!(Staking::eras_stakers(Staking::active_era().unwrap().index, 11), Exposure { total: 1000 + 100, own: 1000 + 100, others: vec![] }); assert_ne!(Staking::eras_stakers(Staking::active_era().unwrap().index, 11), Exposure { total: 1000 + 100, own: 1000 + 100, others: vec![] });
// trigger next era. // trigger next era.
Timestamp::set_timestamp(10);
start_era(2); start_era(2);
assert_eq!(Staking::active_era().unwrap().index, 2); assert_eq!(Staking::active_era().unwrap().index, 2);
substrate/frame/timestamp/src/lib.rs
+1 -1
View File
@@ -250,7 +250,7 @@ impl<T: Trait> UnixTime for Module<T> {
// now is duration since unix epoch in millisecond as documented in // now is duration since unix epoch in millisecond as documented in
// `sp_timestamp::InherentDataProvider`. // `sp_timestamp::InherentDataProvider`.
let now = Self::now(); let now = Self::now();
sp_std::if_std! { sp_std::if_std! {
if now == T::Moment::zero() { if now == T::Moment::zero() {
debug::error!( debug::error!(
"`pallet_timestamp::UnixTime::now` is called at genesis, invalid value returned: 0" "`pallet_timestamp::UnixTime::now` is called at genesis, invalid value returned: 0"