remove Default from CandidateDescriptor

Cargo.toml

@@ -27,6 +27,7 @@ members = [
 	"core-primitives",
 	"erasure-coding",
 	"primitives",
+	"primitives/test-helpers",
 	"runtime/common",
 	"runtime/common/slot_range_helper",
 	"runtime/parachains",

erasure-coding/fuzzer/src/round_trip.rs

@@ -13,7 +13,7 @@ fn main() {
 
 			let available_data = AvailableData {
 				pov: Arc::new(pov_block),
-				validation_data: Default::default(),
+				validation_data: PersistedValidationData::default(),
 			};
 			let chunks = obtain_chunks_v1(
 				10,

erasure-coding/src/lib.rs

@@ -370,7 +370,7 @@ impl<'a, I: Iterator<Item = &'a [u8]>> parity_scale_codec::Input for ShardInput<
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use polkadot_primitives::v0::{AvailableData, BlockData, PoVBlock};
+	use polkadot_primitives::v0::{AvailableData, BlockData, OmittedValidationData, PoVBlock};
 
 	// In order to adequately compute the number of entries in the Merkle
 	// trie, we must account for the fixed 16-ary trie structure.
@@ -385,7 +385,8 @@ mod tests {
 	fn round_trip_works() {
 		let pov_block = PoVBlock { block_data: BlockData((0..255).collect()) };
 
-		let available_data = AvailableData { pov_block, omitted_validation: Default::default() };
+		let available_data =
+			AvailableData { pov_block, omitted_validation: OmittedValidationData::default() };
 		let chunks = obtain_chunks(10, &available_data).unwrap();
 
 		assert_eq!(chunks.len(), 10);
@@ -413,7 +414,8 @@ mod tests {
 		let pov_block =
 			PoVBlock { block_data: BlockData(vec![2; n_validators / KEY_INDEX_NIBBLE_SIZE]) };
 
-		let available_data = AvailableData { pov_block, omitted_validation: Default::default() };
+		let available_data =
+			AvailableData { pov_block, omitted_validation: OmittedValidationData::default() };
 
 		let chunks = obtain_chunks(magnitude as usize, &available_data).unwrap();
 

node/collation-generation/Cargo.toml

@@ -19,3 +19,4 @@ parity-scale-codec = { version = "2.3.1", default-features = false, features = [
 
 [dev-dependencies]
 polkadot-node-subsystem-test-helpers = { path = "../subsystem-test-helpers" }
+test-helpers = { package = "polkadot-primitives-test-helpers", path = "../../primitives/test-helpers" }

node/collation-generation/src/tests.rs

@@ -16,6 +16,7 @@
 
 mod handle_new_activations {
 	use super::super::*;
+	use ::test_helpers::{dummy_hash, dummy_head_data, dummy_validator};
 	use futures::{
 		lock::Mutex,
 		task::{Context as FuturesContext, Poll},
@@ -33,13 +34,13 @@ mod handle_new_activations {
 
 	fn test_collation() -> Collation {
 		Collation {
-			upward_messages: Default::default(),
-			horizontal_messages: Default::default(),
-			new_validation_code: Default::default(),
-			head_data: Default::default(),
+			upward_messages: vec![],
+			horizontal_messages: vec![],
+			new_validation_code: None,
+			head_data: dummy_head_data(),
 			proof_of_validity: PoV { block_data: BlockData(Vec::new()) },
-			processed_downward_messages: Default::default(),
-			hrmp_watermark: Default::default(),
+			processed_downward_messages: 0_u32,
+			hrmp_watermark: 0_u32.into(),
 		}
 	}
 
@@ -59,7 +60,7 @@ mod handle_new_activations {
 	}
 
 	fn test_validation_data() -> PersistedValidationData {
-		let mut persisted_validation_data: PersistedValidationData = Default::default();
+		let mut persisted_validation_data = PersistedValidationData::default();
 		persisted_validation_data.max_pov_size = 1024;
 		persisted_validation_data
 	}
@@ -106,7 +107,7 @@ mod handle_new_activations {
 						tx.send(Ok(vec![])).unwrap();
 					}
 					Some(AllMessages::RuntimeApi(RuntimeApiMessage::Request(_hash, RuntimeApiRequest::Validators(tx)))) => {
-						tx.send(Ok(vec![Default::default(); 3])).unwrap();
+						tx.send(Ok(vec![dummy_validator(); 3])).unwrap();
 					}
 					Some(msg) => panic!("didn't expect any other overseer requests given no availability cores; got {:?}", msg),
 				}
@@ -177,13 +178,13 @@ mod handle_new_activations {
 						),
 					))) => {
 						overseer_requested_validation_data.lock().await.push(hash);
-						tx.send(Ok(Default::default())).unwrap();
+						tx.send(Ok(None)).unwrap();
 					},
 					Some(AllMessages::RuntimeApi(RuntimeApiMessage::Request(
 						_hash,
 						RuntimeApiRequest::Validators(tx),
 					))) => {
-						tx.send(Ok(vec![Default::default(); 3])).unwrap();
+						tx.send(Ok(vec![dummy_validator(); 3])).unwrap();
 					},
 					Some(msg) => {
 						panic!("didn't expect any other overseer requests; got {:?}", msg)
@@ -254,7 +255,7 @@ mod handle_new_activations {
 						_hash,
 						RuntimeApiRequest::Validators(tx),
 					))) => {
-						tx.send(Ok(vec![Default::default(); 3])).unwrap();
+						tx.send(Ok(vec![dummy_validator(); 3])).unwrap();
 					},
 					Some(AllMessages::RuntimeApi(RuntimeApiMessage::Request(
 						_hash,
@@ -323,7 +324,7 @@ mod handle_new_activations {
 			collator: config.key.public(),
 			persisted_validation_data_hash: expect_validation_data_hash,
 			pov_hash: expect_pov_hash,
-			erasure_root: Default::default(), // this isn't something we're checking right now
+			erasure_root: dummy_hash(), // this isn't something we're checking right now
 			para_head: test_collation().head_data.hash(),
 			validation_code_hash: expect_validation_code_hash,
 		};

node/core/approval-voting/Cargo.toml

@@ -39,3 +39,4 @@ sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch =
 polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
 assert_matches = "1.4.0"
 kvdb-memorydb = "0.10.0"
+test-helpers = { package = "polkadot-primitives-test-helpers", path = "../../../primitives/test-helpers" }

node/core/approval-voting/src/approval_checking.rs

@@ -457,25 +457,24 @@ pub fn tranches_to_approve(
 #[cfg(test)]
 mod tests {
 	use super::*;
-
-	use bitvec::{bitvec, order::Lsb0 as BitOrderLsb0};
+	use crate::{approval_db, BTreeMap};
+	use ::test_helpers::{dummy_candidate_receipt, dummy_hash};
+	use bitvec::{bitvec, order::Lsb0 as BitOrderLsb0, vec::BitVec};
 	use polkadot_primitives::v1::GroupIndex;
 
-	use crate::approval_db;
-
 	#[test]
 	fn pending_is_not_approved() {
 		let candidate = approval_db::v1::CandidateEntry {
-			candidate: Default::default(),
+			candidate: dummy_candidate_receipt(dummy_hash()),
 			session: 0,
-			block_assignments: Default::default(),
-			approvals: Default::default(),
+			block_assignments: BTreeMap::default(),
+			approvals: BitVec::default(),
 		}
 		.into();
 
 		let approval_entry = approval_db::v1::ApprovalEntry {
 			tranches: Vec::new(),
-			assignments: Default::default(),
+			assignments: BitVec::default(),
 			our_assignment: None,
 			our_approval_sig: None,
 			backing_group: GroupIndex(0),
@@ -499,9 +498,9 @@ mod tests {
 	#[test]
 	fn exact_takes_only_assignments_up_to() {
 		let mut candidate: CandidateEntry = approval_db::v1::CandidateEntry {
-			candidate: Default::default(),
+			candidate: dummy_candidate_receipt(dummy_hash()),
 			session: 0,
-			block_assignments: Default::default(),
+			block_assignments: BTreeMap::default(),
 			approvals: bitvec![BitOrderLsb0, u8; 0; 10],
 		}
 		.into();
@@ -571,9 +570,9 @@ mod tests {
 	#[test]
 	fn one_honest_node_always_approves() {
 		let mut candidate: CandidateEntry = approval_db::v1::CandidateEntry {
-			candidate: Default::default(),
+			candidate: dummy_candidate_receipt(dummy_hash()),
 			session: 0,
-			block_assignments: Default::default(),
+			block_assignments: BTreeMap::default(),
 			approvals: bitvec![BitOrderLsb0, u8; 0; 10],
 		}
 		.into();
@@ -1031,9 +1030,9 @@ mod tests {
 		let needed_approvals = 3;
 
 		let mut candidate: CandidateEntry = approval_db::v1::CandidateEntry {
-			candidate: Default::default(),
+			candidate: dummy_candidate_receipt(dummy_hash()),
 			session: 0,
-			block_assignments: Default::default(),
+			block_assignments: BTreeMap::default(),
 			approvals: bitvec![BitOrderLsb0, u8; 0; 3],
 		}
 		.into();