move released primitives and APIs out of staging

cumulus/client/consensus/aura/src/collators/lookahead.rs

@@ -44,7 +44,7 @@ use polkadot_node_primitives::SubmitCollationParams;
 use polkadot_node_subsystem::messages::CollationGenerationMessage;
 use polkadot_overseer::Handle as OverseerHandle;
 use polkadot_primitives::{
-	vstaging::DEFAULT_CLAIM_QUEUE_OFFSET, CollatorPair, Id as ParaId, OccupiedCoreAssumption,
+	CollatorPair, Id as ParaId, OccupiedCoreAssumption, DEFAULT_CLAIM_QUEUE_OFFSET,
 };
 
 use crate::{collator as collator_util, export_pov_to_path};

cumulus/client/consensus/aura/src/collators/slot_based/block_builder_task.rs

@@ -523,7 +523,7 @@ mod tests {
 	use async_trait::async_trait;
 	use cumulus_relay_chain_interface::*;
 	use futures::Stream;
-	use polkadot_primitives::vstaging::{CandidateEvent, CommittedCandidateReceiptV2};
+	use polkadot_primitives::{CandidateEvent, CommittedCandidateReceiptV2};
 	use sp_version::RuntimeVersion;
 	use std::{
 		collections::{BTreeMap, HashMap, VecDeque},

cumulus/client/consensus/aura/src/collators/slot_based/mod.rs

@@ -80,8 +80,8 @@ use cumulus_primitives_core::{
 use cumulus_relay_chain_interface::RelayChainInterface;
 use futures::FutureExt;
 use polkadot_primitives::{
-	vstaging::DEFAULT_CLAIM_QUEUE_OFFSET, CollatorPair, CoreIndex, Hash as RelayHash, Id as ParaId,
-	ValidationCodeHash,
+	CollatorPair, CoreIndex, Hash as RelayHash, Id as ParaId, ValidationCodeHash,
+	DEFAULT_CLAIM_QUEUE_OFFSET,
 };
 use sc_client_api::{backend::AuxStore, BlockBackend, BlockOf, UsageProvider};
 use sc_consensus::BlockImport;

cumulus/client/consensus/common/src/tests.rs

@@ -21,7 +21,7 @@ use async_trait::async_trait;
 use codec::Encode;
 use cumulus_client_pov_recovery::RecoveryKind;
 use cumulus_primitives_core::{
-	relay_chain::{vstaging::CoreState, BlockId, BlockNumber},
+	relay_chain::{BlockId, BlockNumber, CoreState},
 	CumulusDigestItem, InboundDownwardMessage, InboundHrmpMessage,
 };
 use cumulus_relay_chain_interface::{
@@ -35,7 +35,7 @@ use cumulus_test_client::{
 use cumulus_test_relay_sproof_builder::RelayStateSproofBuilder;
 use futures::{channel::mpsc, executor::block_on, select, FutureExt, Stream, StreamExt};
 use futures_timer::Delay;
-use polkadot_primitives::{vstaging::CandidateEvent, HeadData};
+use polkadot_primitives::{CandidateEvent, HeadData};
 use sc_client_api::{Backend as _, UsageProvider};
 use sc_consensus::{BlockImport, BlockImportParams, ForkChoiceStrategy};
 use sp_blockchain::Backend as BlockchainBackend;

cumulus/client/network/Cargo.toml

@@ -35,6 +35,7 @@ polkadot-node-primitives = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-parachain-primitives = { workspace = true, default-features = true }
 polkadot-primitives = { workspace = true, default-features = true }
+polkadot-primitives-test-helpers = { workspace = true, default-features = true }
 
 # Cumulus
 cumulus-relay-chain-interface = { workspace = true, default-features = true }

cumulus/client/network/src/lib.rs

@@ -33,8 +33,8 @@ use polkadot_node_primitives::{CollationSecondedSignal, Statement};
 use polkadot_node_subsystem::messages::RuntimeApiRequest;
 use polkadot_parachain_primitives::primitives::HeadData;
 use polkadot_primitives::{
-	vstaging::CandidateReceiptV2 as CandidateReceipt, CompactStatement, Hash as PHash,
-	Id as ParaId, OccupiedCoreAssumption, SigningContext, UncheckedSigned,
+	CandidateReceiptV2 as CandidateReceipt, CompactStatement, Hash as PHash, Id as ParaId,
+	OccupiedCoreAssumption, SigningContext, UncheckedSigned,
 };
 
 use codec::{Decode, DecodeAll, Encode};

cumulus/client/network/src/tests.rs

@@ -27,12 +27,12 @@ use futures::{executor::block_on, poll, task::Poll, FutureExt, Stream, StreamExt
 use parking_lot::Mutex;
 use polkadot_node_primitives::{SignedFullStatement, Statement};
 use polkadot_primitives::{
-	vstaging::{CandidateEvent, CommittedCandidateReceiptV2, CoreState},
-	BlockNumber, CandidateCommitments, CandidateDescriptor, CollatorPair,
-	CommittedCandidateReceipt, Hash as PHash, HeadData, InboundDownwardMessage, InboundHrmpMessage,
-	OccupiedCoreAssumption, PersistedValidationData, SessionIndex, SigningContext,
-	ValidationCodeHash, ValidatorId,
+	BlockNumber, CandidateCommitments, CandidateDescriptorV2, CandidateEvent, CollatorPair,
+	CommittedCandidateReceiptV2, CoreState, Hash as PHash, HeadData, InboundDownwardMessage,
+	InboundHrmpMessage, OccupiedCoreAssumption, PersistedValidationData, SessionIndex,
+	SigningContext, ValidationCodeHash, ValidatorId,
 };
+use polkadot_primitives_test_helpers::{CandidateDescriptor, CommittedCandidateReceipt};
 use polkadot_test_client::{
 	Client as PClient, ClientBlockImportExt, DefaultTestClientBuilderExt, FullBackend as PBackend,
 	InitPolkadotBlockBuilder, TestClientBuilder, TestClientBuilderExt,
@@ -62,22 +62,19 @@ fn check_error(error: crate::BoxedError, check_error: impl Fn(&BlockAnnounceErro
 	}
 }
 
-fn dummy_candidate() -> CommittedCandidateReceipt {
-	CommittedCandidateReceipt {
-		descriptor: CandidateDescriptor {
-			para_head: polkadot_parachain_primitives::primitives::HeadData(
-				default_header().encode(),
-			)
-			.hash(),
-			para_id: 0u32.into(),
-			relay_parent: PHash::random(),
-			collator: CollatorPair::generate().0.public(),
-			persisted_validation_data_hash: PHash::random(),
-			pov_hash: PHash::random(),
-			erasure_root: PHash::random(),
-			signature: sp_core::sr25519::Signature::default().into(),
-			validation_code_hash: ValidationCodeHash::from(PHash::random()),
-		},
+fn dummy_candidate() -> CommittedCandidateReceiptV2 {
+	CommittedCandidateReceiptV2 {
+		descriptor: CandidateDescriptorV2::new(
+			0u32.into(),
+			PHash::random(),
+			0.into(),
+			1,
+			PHash::random(),
+			PHash::random(),
+			PHash::random(),
+			polkadot_parachain_primitives::primitives::HeadData(default_header().encode()).hash(),
+			ValidationCodeHash::from(PHash::random()),
+		),
 		commitments: CandidateCommitments {
 			upward_messages: Default::default(),
 			horizontal_messages: Default::default(),
@@ -176,7 +173,7 @@ impl RelayChainInterface for DummyRelayChainInterface {
 		}
 
 		if self.data.lock().has_pending_availability {
-			Ok(Some(dummy_candidate().into()))
+			Ok(Some(dummy_candidate()))
 		} else {
 			Ok(None)
 		}
@@ -194,7 +191,7 @@ impl RelayChainInterface for DummyRelayChainInterface {
 		}
 
 		if self.data.lock().has_pending_availability {
-			Ok(vec![dummy_candidate().into()])
+			Ok(vec![dummy_candidate()])
 		} else {
 			Ok(vec![])
 		}

cumulus/client/pov-recovery/src/lib.rs

@@ -56,11 +56,8 @@ use polkadot_node_primitives::{PoV, POV_BOMB_LIMIT};
 use polkadot_node_subsystem::messages::AvailabilityRecoveryMessage;
 use polkadot_overseer::Handle as OverseerHandle;
 use polkadot_primitives::{
-	vstaging::{
-		CandidateReceiptV2 as CandidateReceipt,
-		CommittedCandidateReceiptV2 as CommittedCandidateReceipt,
-	},
-	Id as ParaId, SessionIndex,
+	CandidateReceiptV2 as CandidateReceipt,
+	CommittedCandidateReceiptV2 as CommittedCandidateReceipt, Id as ParaId, SessionIndex,
 };
 
 use cumulus_primitives_core::ParachainBlockData;

cumulus/client/pov-recovery/src/tests.rs

@@ -19,23 +19,20 @@ use super::*;
 use assert_matches::assert_matches;
 use codec::{Decode, Encode};
 use cumulus_primitives_core::relay_chain::{
-	vstaging::CoreState, BlockId, CandidateCommitments, CandidateDescriptor, CoreIndex,
+	BlockId, CandidateCommitments, CandidateDescriptorV2, CoreIndex, CoreState,
 };
 use cumulus_relay_chain_interface::{
 	InboundDownwardMessage, InboundHrmpMessage, OccupiedCoreAssumption, PHash, PHeader,
 	PersistedValidationData, RelayChainResult, StorageValue, ValidationCodeHash, ValidatorId,
 };
-use cumulus_test_client::{
-	runtime::{Block, Header},
-	Sr25519Keyring,
-};
+use cumulus_test_client::runtime::{Block, Header};
 use futures::{channel::mpsc, SinkExt, Stream};
 use polkadot_node_primitives::AvailableData;
 use polkadot_node_subsystem::{
 	messages::{AvailabilityRecoveryMessage, RuntimeApiRequest},
 	RecoveryError, TimeoutExt,
 };
-use polkadot_primitives::vstaging::CandidateEvent;
+use polkadot_primitives::CandidateEvent;
 use rstest::rstest;
 use sc_client_api::{
 	BlockImportNotification, ClientInfo, CompactProof, FinalityNotification, FinalityNotifications,
@@ -520,7 +517,6 @@ impl RelayChainInterface for Relaychain {
 }
 
 fn make_candidate_chain(candidate_number_range: Range<u32>) -> Vec<CommittedCandidateReceipt> {
-	let collator = Sr25519Keyring::Ferdie;
 	let mut latest_parent_hash = GENESIS_HASH;
 	let mut candidates = vec![];
 
@@ -536,18 +532,17 @@ fn make_candidate_chain(candidate_number_range: Range<u32>) -> Vec<CommittedCand
 		latest_parent_hash = head_data.hash();
 
 		candidates.push(CommittedCandidateReceipt {
-			descriptor: CandidateDescriptor {
-				para_id: ParaId::from(1000),
-				relay_parent: PHash::zero(),
-				collator: collator.public().into(),
-				persisted_validation_data_hash: PHash::zero(),
-				pov_hash: PHash::zero(),
-				erasure_root: PHash::zero(),
-				signature: collator.sign(&[0u8; 132]).into(),
-				para_head: PHash::zero(),
-				validation_code_hash: PHash::zero().into(),
-			}
-			.into(),
+			descriptor: CandidateDescriptorV2::new(
+				ParaId::from(1000),
+				PHash::zero(),
+				CoreIndex(0),
+				0,
+				PHash::zero(),
+				PHash::zero(),
+				PHash::zero(),
+				PHash::zero(),
+				PHash::zero().into(),
+			),
 			commitments: CandidateCommitments {
 				head_data: head_data.encode().into(),
 				upward_messages: vec![].try_into().expect("empty vec fits within bounds"),

cumulus/client/relay-chain-inprocess-interface/src/lib.rs

@@ -26,16 +26,16 @@ use async_trait::async_trait;
 use cumulus_client_bootnodes::bootnode_request_response_config;
 use cumulus_primitives_core::{
 	relay_chain::{
-		runtime_api::ParachainHost,
-		vstaging::{CommittedCandidateReceiptV2 as CommittedCandidateReceipt, CoreState},
-		Block as PBlock, BlockId, BlockNumber, CoreIndex, Hash as PHash, Header as PHeader,
-		InboundHrmpMessage, OccupiedCoreAssumption, SessionIndex, ValidationCodeHash, ValidatorId,
+		runtime_api::ParachainHost, Block as PBlock, BlockId, BlockNumber,
+		CommittedCandidateReceiptV2 as CommittedCandidateReceipt, CoreIndex, CoreState,
+		Hash as PHash, Header as PHeader, InboundHrmpMessage, OccupiedCoreAssumption, SessionIndex,
+		ValidationCodeHash, ValidatorId,
 	},
 	InboundDownwardMessage, ParaId, PersistedValidationData,
 };
 use cumulus_relay_chain_interface::{RelayChainError, RelayChainInterface, RelayChainResult};
 use futures::{FutureExt, Stream, StreamExt};
-use polkadot_primitives::vstaging::CandidateEvent;
+use polkadot_primitives::CandidateEvent;
 use polkadot_service::{
 	builder::PolkadotServiceBuilder, CollatorOverseerGen, CollatorPair, Configuration, FullBackend,
 	FullClient, Handle, NewFull, NewFullParams, TaskManager,

cumulus/client/relay-chain-interface/src/lib.rs

@@ -31,12 +31,12 @@ use codec::{Decode, Encode, Error as CodecError};
 use jsonrpsee_core::ClientError as JsonRpcError;
 use sp_api::ApiError;
 
-use cumulus_primitives_core::relay_chain::{vstaging::CandidateEvent, BlockId, Hash as RelayHash};
+use cumulus_primitives_core::relay_chain::{BlockId, CandidateEvent, Hash as RelayHash};
 pub use cumulus_primitives_core::{
 	relay_chain::{
-		vstaging::{CommittedCandidateReceiptV2 as CommittedCandidateReceipt, CoreState},
-		BlockNumber, CoreIndex, Hash as PHash, Header as PHeader, InboundHrmpMessage,
-		OccupiedCoreAssumption, SessionIndex, ValidationCodeHash, ValidatorId,
+		BlockNumber, CommittedCandidateReceiptV2 as CommittedCandidateReceipt, CoreIndex,
+		CoreState, Hash as PHash, Header as PHeader, InboundHrmpMessage, OccupiedCoreAssumption,
+		SessionIndex, ValidationCodeHash, ValidatorId,
 	},
 	InboundDownwardMessage, ParaId, PersistedValidationData,
 };

cumulus/client/relay-chain-minimal-node/src/blockchain_rpc_client.rs

@@ -27,10 +27,8 @@ use futures::{Stream, StreamExt};
 use polkadot_core_primitives::{Block, BlockNumber, Hash, Header};
 use polkadot_overseer::{ChainApiBackend, RuntimeApiSubsystemClient};
 use polkadot_primitives::{
-	async_backing::AsyncBackingParams,
-	slashing,
-	vstaging::async_backing::{BackingState, Constraints},
-	ApprovalVotingParams, CoreIndex, NodeFeatures,
+	async_backing::{AsyncBackingParams, BackingState, Constraints},
+	slashing, ApprovalVotingParams, CoreIndex, NodeFeatures,
 };
 use sc_authority_discovery::{AuthorityDiscovery, Error as AuthorityDiscoveryError};
 use sc_client_api::AuxStore;
@@ -147,7 +145,7 @@ impl RuntimeApiSubsystemClient for BlockChainRpcClient {
 		&self,
 		at: Hash,
 	) -> Result<
-		Vec<polkadot_primitives::vstaging::CoreState<Hash, polkadot_core_primitives::BlockNumber>>,
+		Vec<polkadot_primitives::CoreState<Hash, polkadot_core_primitives::BlockNumber>>,
 		sp_api::ApiError,
 	> {
 		Ok(self.rpc_client.parachain_host_availability_cores(at).await?)
@@ -219,10 +217,7 @@ impl RuntimeApiSubsystemClient for BlockChainRpcClient {
 		&self,
 		at: Hash,
 		para_id: cumulus_primitives_core::ParaId,
-	) -> Result<
-		Option<polkadot_primitives::vstaging::CommittedCandidateReceiptV2<Hash>>,
-		sp_api::ApiError,
-	> {
+	) -> Result<Option<polkadot_primitives::CommittedCandidateReceiptV2<Hash>>, sp_api::ApiError> {
 		Ok(self
 			.rpc_client
 			.parachain_host_candidate_pending_availability(at, para_id)
@@ -232,7 +227,7 @@ impl RuntimeApiSubsystemClient for BlockChainRpcClient {
 	async fn candidate_events(
 		&self,
 		at: Hash,
-	) -> Result<Vec<polkadot_primitives::vstaging::CandidateEvent<Hash>>, sp_api::ApiError> {
+	) -> Result<Vec<polkadot_primitives::CandidateEvent<Hash>>, sp_api::ApiError> {
 		Ok(self.rpc_client.parachain_host_candidate_events(at).await?)
 	}
 
@@ -275,8 +270,7 @@ impl RuntimeApiSubsystemClient for BlockChainRpcClient {
 	async fn on_chain_votes(
 		&self,
 		at: Hash,
-	) -> Result<Option<polkadot_primitives::vstaging::ScrapedOnChainVotes<Hash>>, sp_api::ApiError>
-	{
+	) -> Result<Option<polkadot_primitives::ScrapedOnChainVotes<Hash>>, sp_api::ApiError> {
 		Ok(self.rpc_client.parachain_host_on_chain_votes(at).await?)
 	}
 
@@ -448,10 +442,7 @@ impl RuntimeApiSubsystemClient for BlockChainRpcClient {
 		&self,
 		at: Hash,
 		para_id: cumulus_primitives_core::ParaId,
-	) -> Result<
-		Vec<polkadot_primitives::vstaging::CommittedCandidateReceiptV2<Hash>>,
-		sp_api::ApiError,
-	> {
+	) -> Result<Vec<polkadot_primitives::CommittedCandidateReceiptV2<Hash>>, sp_api::ApiError> {
 		Ok(self
 			.rpc_client
 			.parachain_host_candidates_pending_availability(at, para_id)

cumulus/client/relay-chain-rpc-interface/src/lib.rs

@@ -19,7 +19,7 @@ use async_trait::async_trait;
 use core::time::Duration;
 use cumulus_primitives_core::{
 	relay_chain::{
-		vstaging::{CandidateEvent, CommittedCandidateReceiptV2 as CommittedCandidateReceipt},
+		CandidateEvent, CommittedCandidateReceiptV2 as CommittedCandidateReceipt,
 		Hash as RelayHash, Header as RelayHeader, InboundHrmpMessage, OccupiedCoreAssumption,
 		SessionIndex, ValidationCodeHash, ValidatorId,
 	},

cumulus/client/relay-chain-rpc-interface/src/rpc_client.rs

@@ -33,18 +33,13 @@ use codec::{Decode, Encode};
 
 use cumulus_primitives_core::{
 	relay_chain::{
-		async_backing::AsyncBackingParams,
-		slashing,
-		vstaging::{
-			async_backing::{BackingState, Constraints},
-			CandidateEvent, CommittedCandidateReceiptV2 as CommittedCandidateReceipt, CoreState,
-			ScrapedOnChainVotes,
-		},
-		ApprovalVotingParams, BlockNumber, CandidateCommitments, CandidateHash, CoreIndex,
-		DisputeState, ExecutorParams, GroupRotationInfo, Hash as RelayHash, Header as RelayHeader,
-		InboundHrmpMessage, NodeFeatures, OccupiedCoreAssumption, PvfCheckStatement, SessionIndex,
-		SessionInfo, ValidationCode, ValidationCodeHash, ValidatorId, ValidatorIndex,
-		ValidatorSignature,
+		async_backing::{AsyncBackingParams, BackingState, Constraints},
+		slashing, ApprovalVotingParams, BlockNumber, CandidateCommitments, CandidateEvent,
+		CandidateHash, CommittedCandidateReceiptV2 as CommittedCandidateReceipt, CoreIndex,
+		CoreState, DisputeState, ExecutorParams, GroupRotationInfo, Hash as RelayHash,
+		Header as RelayHeader, InboundHrmpMessage, NodeFeatures, OccupiedCoreAssumption,
+		PvfCheckStatement, ScrapedOnChainVotes, SessionIndex, SessionInfo, ValidationCode,
+		ValidationCodeHash, ValidatorId, ValidatorIndex, ValidatorSignature,
 	},
 	InboundDownwardMessage, ParaId, PersistedValidationData,
 };

cumulus/client/relay-chain-streams/src/lib.rs

@@ -23,8 +23,8 @@ use cumulus_relay_chain_interface::{RelayChainInterface, RelayChainResult};
 use futures::{Stream, StreamExt};
 use polkadot_node_subsystem::messages::RuntimeApiRequest;
 use polkadot_primitives::{
-	vstaging::CommittedCandidateReceiptV2 as CommittedCandidateReceipt, Hash as PHash,
-	Id as ParaId, OccupiedCoreAssumption, SessionIndex,
+	CommittedCandidateReceiptV2 as CommittedCandidateReceipt, Hash as PHash, Id as ParaId,
+	OccupiedCoreAssumption, SessionIndex,
 };
 use sp_api::RuntimeApiInfo;
 use sp_consensus::SyncOracle;