fixed cargo test

core-primitives/stf-executor/src/lib.rs

@@ -233,7 +233,8 @@ mod tests {
 		int: u8,
 	) -> (ExecutedOperation<TrustedCallSignedMock, GetterMock>, H256) {
 		let hash = H256::from([int; 32]);
-		let opaque_call: Vec<OpaqueCall> = vec![OpaqueCall(vec![int; 10])];
+		let opaque_call: Vec<ParentchainCall> =
+			vec![ParentchainCall::Integritee(OpaqueCall(vec![int; 10]))];
 		let operation =
 			ExecutedOperation::success(hash, TrustedOperationOrHash::Hash(hash), opaque_call);
 		(operation, hash)

core/parentchain/block-importer/src/block_importer_mock.rs

@@ -21,6 +21,7 @@ use crate::{
 	error::{Error, Result},
 	ImportParentchainBlocks,
 };
+use itp_types::parentchain::ParentchainId;
 use std::{sync::RwLock, vec::Vec};
 
 /// Mock implementation for the block importer.
@@ -58,4 +59,7 @@ where
 		imported_blocks_lock.extend(blocks_to_import);
 		Ok(())
 	}
+	fn parentchain_id(&self) -> ParentchainId {
+		ParentchainId::Integritee
+	}
 }

sidechain/consensus/aura/src/lib.rs

@@ -403,7 +403,14 @@ mod tests {
 		onchain_mock: OnchainMock,
 		trigger_parentchain_import: Arc<TriggerParentchainBlockImportMock<SignedParentchainBlock>>,
 	) -> TestAura {
-		Aura::new(Keyring::Alice.pair(), onchain_mock, trigger_parentchain_import, EnvironmentMock)
+		Aura::new(
+			Keyring::Alice.pair(),
+			onchain_mock,
+			trigger_parentchain_import,
+			None,
+			None,
+			EnvironmentMock,
+		)
 	}
 
 	fn get_default_aura() -> TestAura {
@@ -417,7 +424,9 @@ mod tests {
 			timestamp: now,
 			duration: SLOT_DURATION,
 			ends_at: now + SLOT_DURATION,
-			last_imported_parentchain_head: header.clone(),
+			last_imported_integritee_parentchain_head: header.clone(),
+			maybe_last_imported_target_a_parentchain_head: None,
+			maybe_last_imported_target_b_parentchain_head: None,
 		}
 	}
 
@@ -533,7 +542,9 @@ mod tests {
 			timestamp: now,
 			duration: nano_dur,
 			ends_at: now + nano_dur,
-			last_imported_parentchain_head: ParentchainHeaderBuilder::default().build(),
+			last_imported_integritee_parentchain_head: ParentchainHeaderBuilder::default().build(),
+			maybe_last_imported_target_a_parentchain_head: None,
+			maybe_last_imported_target_b_parentchain_head: None,
 		};
 
 		let result = PerShardSlotWorkerScheduler::on_slot(

sidechain/consensus/aura/src/test/fixtures/types.rs

@@ -40,4 +40,6 @@ pub type TestAura = Aura<
 	EnvironmentMock,
 	OnchainMock,
 	TriggerParentchainBlockImportMock<SignedBlock<ParentchainBlock>>,
+	TriggerParentchainBlockImportMock<SignedBlock<ParentchainBlock>>,
+	TriggerParentchainBlockImportMock<SignedBlock<ParentchainBlock>>,
 >;

sidechain/consensus/slots/src/mocks.rs

@@ -94,14 +94,36 @@ where
 		todo!()
 	}
 
-	fn import_parentchain_blocks_until(
+	fn import_integritee_parentchain_blocks_until(
 		&self,
 		_last_imported_parentchain_header: &<B::Header as ParentchainHeaderTrait>::Hash,
 	) -> Result<Option<B::Header>> {
 		todo!()
 	}
 
-	fn peek_latest_parentchain_header(&self) -> Result<Option<B::Header>> {
+	fn peek_latest_integritee_parentchain_header(&self) -> Result<Option<B::Header>> {
+		todo!()
+	}
+
+	fn import_target_a_parentchain_blocks_until(
+		&self,
+		_last_imported_parentchain_header: &<B::Header as ParentchainHeaderTrait>::Hash,
+	) -> Result<Option<B::Header>> {
+		todo!()
+	}
+
+	fn peek_latest_target_a_parentchain_header(&self) -> Result<Option<B::Header>> {
+		todo!()
+	}
+
+	fn import_target_b_parentchain_blocks_until(
+		&self,
+		_last_imported_parentchain_header: &<B::Header as ParentchainHeaderTrait>::Hash,
+	) -> Result<Option<B::Header>> {
+		todo!()
+	}
+
+	fn peek_latest_target_b_parentchain_header(&self) -> Result<Option<B::Header>> {
 		todo!()
 	}
 

sidechain/consensus/slots/src/per_shard_slot_worker_tests.rs

@@ -86,5 +86,7 @@ fn slot_info_from_now() -> SlotInfo<ParentchainBlock> {
 		SLOT_DURATION,
 		slot_ends_at,
 		ParentchainHeaderBuilder::default().build(),
+		None,
+		None,
 	)
 }

sidechain/consensus/slots/src/slots.rs

@@ -231,7 +231,9 @@ mod tests {
 			timestamp: duration_now(),
 			duration: SLOT_DURATION,
 			ends_at: duration_now() + SLOT_DURATION,
-			last_imported_parentchain_head: ParentchainHeaderBuilder::default().build(),
+			last_imported_integritee_parentchain_head: ParentchainHeaderBuilder::default().build(),
+			maybe_last_imported_target_a_parentchain_head: None,
+			maybe_last_imported_target_b_parentchain_head: None,
 		}
 	}
 
@@ -270,11 +272,18 @@ mod tests {
 		let slot: Slot = 1000.into();
 
 		let slot_end_time = slot_ends_at(slot, SLOT_DURATION);
-		let slot_one: SlotInfo<ParentchainBlock> =
-			SlotInfo::new(slot, timestamp, SLOT_DURATION, slot_end_time, pc_header.clone());
+		let slot_one: SlotInfo<ParentchainBlock> = SlotInfo::new(
+			slot,
+			timestamp,
+			SLOT_DURATION,
+			slot_end_time,
+			pc_header.clone(),
+			None,
+			None,
+		);
 		thread::sleep(Duration::from_millis(200));
 		let slot_two: SlotInfo<ParentchainBlock> =
-			SlotInfo::new(slot, timestamp, SLOT_DURATION, slot_end_time, pc_header);
+			SlotInfo::new(slot, timestamp, SLOT_DURATION, slot_end_time, pc_header, None, None);
 
 		let difference_of_ends_at =
 			(slot_one.ends_at.as_millis()).abs_diff(slot_two.ends_at.as_millis());
@@ -294,7 +303,9 @@ mod tests {
 			timestamp: duration_now() - Duration::from_secs(5),
 			duration: SLOT_DURATION,
 			ends_at: duration_now() + SLOT_DURATION - Duration::from_secs(5),
-			last_imported_parentchain_head: ParentchainHeaderBuilder::default().build(),
+			last_imported_integritee_parentchain_head: ParentchainHeaderBuilder::default().build(),
+			maybe_last_imported_target_a_parentchain_head: None,
+			maybe_last_imported_target_b_parentchain_head: None,
 		};
 		assert!(slot.duration_remaining().is_none());
 	}
@@ -306,7 +317,9 @@ mod tests {
 			timestamp: duration_now() - Duration::from_secs(5),
 			duration: SLOT_DURATION,
 			ends_at: duration_now() + Duration::from_secs(60),
-			last_imported_parentchain_head: ParentchainHeaderBuilder::default().build(),
+			last_imported_integritee_parentchain_head: ParentchainHeaderBuilder::default().build(),
+			maybe_last_imported_target_a_parentchain_head: None,
+			maybe_last_imported_target_b_parentchain_head: None,
 		};
 		let maybe_duration_remaining = slot.duration_remaining();
 		assert!(maybe_duration_remaining.is_some());
@@ -322,7 +335,7 @@ mod tests {
 
 		thread::sleep(SLOT_DURATION * 2);
 		let slot: SlotInfo<ParentchainBlock> =
-			SlotInfo::new(slot, timestamp, SLOT_DURATION, slot_end_time, pc_header);
+			SlotInfo::new(slot, timestamp, SLOT_DURATION, slot_end_time, pc_header, None, None);
 
 		assert!(slot.ends_at < duration_now());
 	}
@@ -366,6 +379,8 @@ mod tests {
 			duration_now(),
 			SLOT_DURATION,
 			ParentchainHeaderBuilder::default().build(),
+			None,
+			None,
 			&mut LastSlot,
 		)
 		.unwrap()
@@ -380,6 +395,8 @@ mod tests {
 			duration_now() + SLOT_DURATION,
 			SLOT_DURATION,
 			ParentchainHeaderBuilder::default().build(),
+			None,
+			None,
 			&mut LastSlot
 		)
 		.unwrap()
@@ -393,6 +410,8 @@ mod tests {
 				duration_now(),
 				Default::default(),
 				ParentchainHeaderBuilder::default().build(),
+				None,
+				None,
 				&mut LastSlot,
 			),
 			"Tried to yield next slot with 0 duration",