Merge branch 'master' into rh-primitives-refactor

runtime/test-runtime/client/src/lib.rs

@@ -322,7 +322,13 @@ pub fn new_native_executor() -> sc_executor::NativeExecutor<LocalExecutor> {
 }
 
 /// Extrinsics that must be included in each block.
-pub fn needed_extrinsics(heads: Vec<polkadot_primitives::v0::AttestedCandidate>) -> Vec<polkadot_test_runtime::UncheckedExtrinsic> {
+///
+/// The index of the block must be provided to calculate a valid timestamp for the block. The value starts at 0 and
+/// should be incremented by one for every block produced.
+pub fn needed_extrinsics(
+	heads: Vec<polkadot_primitives::v0::AttestedCandidate>,
+	i: u64,
+) -> Vec<polkadot_test_runtime::UncheckedExtrinsic> {
 	use polkadot_runtime_common::parachains;
 
 	let timestamp = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH)