Re-export current primitives in crate root (#6487)

* Re-export current primitives in crate root

* Add missing exports

* restart CI

polkadot/parachain/test-parachains/undying/collator/src/lib.rs

@@ -23,7 +23,7 @@ use polkadot_node_primitives::{
 	maybe_compress_pov, Collation, CollationResult, CollationSecondedSignal, CollatorFn,
 	MaybeCompressedPoV, PoV, Statement,
 };
-use polkadot_primitives::v2::{CollatorId, CollatorPair, Hash};
+use polkadot_primitives::{CollatorId, CollatorPair, Hash};
 use sp_core::Pair;
 use std::{
 	collections::HashMap,
@@ -330,7 +330,7 @@ mod tests {
 	use super::*;
 	use futures::executor::block_on;
 	use polkadot_parachain::primitives::{ValidationParams, ValidationResult};
-	use polkadot_primitives::v2::{Hash, PersistedValidationData};
+	use polkadot_primitives::{Hash, PersistedValidationData};
 
 	#[test]
 	fn collator_works() {

polkadot/parachain/test-parachains/undying/collator/src/main.rs

@@ -19,7 +19,7 @@
 use polkadot_cli::{Error, Result};
 use polkadot_node_primitives::CollationGenerationConfig;
 use polkadot_node_subsystem::messages::{CollationGenerationMessage, CollatorProtocolMessage};
-use polkadot_primitives::v2::Id as ParaId;
+use polkadot_primitives::Id as ParaId;
 use sc_cli::{Error as SubstrateCliError, SubstrateCli};
 use sp_core::hexdisplay::HexDisplay;
 use test_parachain_undying_collator::Collator;

polkadot/parachain/test-parachains/undying/collator/tests/integration.rs

@@ -22,7 +22,7 @@ const PUPPET_EXE: &str = env!("CARGO_BIN_EXE_undying_collator_puppet_worker");
 // If this test is failing, make sure to run all tests with the `real-overseer` feature being enabled.
 #[substrate_test_utils::test(flavor = "multi_thread")]
 async fn collating_using_undying_collator() {
-	use polkadot_primitives::v2::Id as ParaId;
+	use polkadot_primitives::Id as ParaId;
 	use sp_keyring::AccountKeyring::*;
 
 	let mut builder = sc_cli::LoggerBuilder::new("");