initial merge

substrate/wasm-runtime/polkadot/src/runtime/staking.rs

@@ -18,6 +18,7 @@
 
 use runtime_std::prelude::*;
 use runtime_std::cell::RefCell;
+use runtime_std::print;
 use codec::KeyedVec;
 use support::{storage, StorageVec};
 use primitives::{BlockNumber, AccountId};
@@ -150,6 +151,12 @@ pub mod privileged {
 	pub fn set_validator_count(new: u32) {
 		storage::put(VALIDATOR_COUNT, &new);
 	}
+
+	/// Force there to be a new era. This also forces a new session immediately after.
+	pub fn force_new_era() {
+		new_era();
+		session::privileged::force_new_session();
+	}
 }
 
 pub mod internal {