Test and documentation fixes

paritytech · paritytech-processbot · Oct 22, 2022 · Oct 13, 2022 · Oct 13, 2022 · Oct 13, 2022
commit f127cb4397dfc4f088e73ecaf9d12b5c0f17e2ad
diff --git a/node/network/statement-distribution/src/tests.rs b/node/network/statement-distribution/src/tests.rs
@@ -85,7 +85,7 @@ fn active_head_accepts_only_2_seconded_per_validator() {
 	};
 
 	let mut head_data = ActiveHeadData::new(
-		Validators::from(validators),
+		IndexedVec::<ValidatorIndex, ValidatorId>::from(validators),
 		session_index,
 		PerLeafSpan::new(Arc::new(jaeger::Span::Disabled), "test"),
 	);
@@ -431,7 +431,7 @@ fn peer_view_update_sends_messages() {
 
 	let new_head_data = {
 		let mut data = ActiveHeadData::new(
-			Validators::from(validators),
+			IndexedVec::<ValidatorIndex, ValidatorId>::from(validators),
 			session_index,
 			PerLeafSpan::new(Arc::new(jaeger::Span::Disabled), "test"),
 		);

diff --git a/primitives/src/v2/mod.rs b/primitives/src/v2/mod.rs
@@ -1621,7 +1621,7 @@ impl<K, V> IndexedVec<K, V>
 where
 	V: Clone,
 {
-	/// Returns a reference to an element indexed using `ValidatorIndex`.
+	/// Returns a reference to an element indexed using `K`.
 	pub fn get(&self, index: K) -> Option<&V>
 	where
 		K: Into<u32>,

diff --git a/runtime/parachains/src/builder.rs b/runtime/parachains/src/builder.rs
@@ -25,9 +25,9 @@ use primitives::v2::{
 	collator_signature_payload, AvailabilityBitfield, BackedCandidate, CandidateCommitments,
 	CandidateDescriptor, CandidateHash, CollatorId, CollatorSignature, CommittedCandidateReceipt,
 	CompactStatement, CoreIndex, CoreOccupied, DisputeStatement, DisputeStatementSet, GroupIndex,
-	HeadData, Id as ParaId, InherentData as ParachainsInherentData, InvalidDisputeStatementKind,
-	PersistedValidationData, SessionIndex, SigningContext, UncheckedSigned,
-	ValidDisputeStatementKind, ValidationCode, ValidatorId, ValidatorIndex, Validators,
+	HeadData, Id as ParaId, IndexedVec, InherentData as ParachainsInherentData,
+	InvalidDisputeStatementKind, PersistedValidationData, SessionIndex, SigningContext,
+	UncheckedSigned, ValidDisputeStatementKind, ValidationCode, ValidatorId, ValidatorIndex,
 	ValidityAttestation,
 };
 use sp_core::{sr25519, H256};
@@ -66,7 +66,7 @@ fn byte32_slice_from(n: u32) -> [u8; 32] {
 /// Paras inherent `enter` benchmark scenario builder.
 pub(crate) struct BenchBuilder<T: paras_inherent::Config> {
 	/// Active validators. Validators should be declared prior to all other setup.
-	validators: Option<Validators>,
+	validators: Option<IndexedVec<ValidatorIndex, ValidatorId>>,
 	/// Starting block number; we expect it to get incremented on session setup.
 	block_number: T::BlockNumber,
 	/// Starting session; we expect it to get incremented on session setup.