companion for polkadot#4545 (session-info v2)

client/consensus/aura/src/lib.rs

@@ -27,7 +27,10 @@ use cumulus_client_consensus_common::{
 	ParachainBlockImport, ParachainCandidate, ParachainConsensus,
 };
 use cumulus_primitives_core::{
-	relay_chain::v1::{Block as PBlock, Hash as PHash, ParachainHost},
+	relay_chain::{
+		v1::{Block as PBlock, Hash as PHash},
+		v2::ParachainHost,
+	},
 	PersistedValidationData,
 };
 use futures::lock::Mutex;

client/consensus/common/src/parachain_consensus.rs

@@ -26,8 +26,9 @@ use sp_runtime::{
 	traits::{Block as BlockT, Header as HeaderT},
 };
 
-use polkadot_primitives::v1::{
-	Block as PBlock, Id as ParaId, OccupiedCoreAssumption, ParachainHost,
+use polkadot_primitives::{
+	v1::{Block as PBlock, Id as ParaId, OccupiedCoreAssumption},
+	v2::ParachainHost,
 };
 
 use codec::Decode;

client/consensus/relay-chain/src/lib.rs

@@ -37,7 +37,10 @@ use cumulus_client_consensus_common::{
 	ParachainBlockImport, ParachainCandidate, ParachainConsensus,
 };
 use cumulus_primitives_core::{
-	relay_chain::v1::{Block as PBlock, Hash as PHash, ParachainHost},
+	relay_chain::{
+		v1::{Block as PBlock, Hash as PHash},
+		v2::ParachainHost,
+	},
 	ParaId, PersistedValidationData,
 };
 use parking_lot::Mutex;

client/network/src/lib.rs

@@ -36,9 +36,12 @@ use sp_runtime::{
 use polkadot_client::ClientHandle;
 use polkadot_node_primitives::{CollationSecondedSignal, Statement};
 use polkadot_parachain::primitives::HeadData;
-use polkadot_primitives::v1::{
-	Block as PBlock, CandidateReceipt, CompactStatement, Hash as PHash, Id as ParaId,
-	OccupiedCoreAssumption, ParachainHost, SigningContext, UncheckedSigned,
+use polkadot_primitives::{
+	v1::{
+		Block as PBlock, CandidateReceipt, CompactStatement, Hash as PHash, Id as ParaId,
+		OccupiedCoreAssumption, SigningContext, UncheckedSigned,
+	},
+	v2::ParachainHost,
 };
 
 use codec::{Decode, DecodeAll, Encode};

client/network/src/tests.rs

@@ -19,13 +19,15 @@ use cumulus_test_service::runtime::{Block, Hash, Header};
 use futures::{executor::block_on, poll, task::Poll};
 use parking_lot::Mutex;
 use polkadot_node_primitives::{SignedFullStatement, Statement};
-use polkadot_primitives::v1::{
-	Block as PBlock, BlockNumber, CandidateCommitments, CandidateDescriptor, CandidateEvent,
-	CollatorPair, CommittedCandidateReceipt, CoreState, GroupRotationInfo, Hash as PHash, HeadData,
-	Id as ParaId, InboundDownwardMessage, InboundHrmpMessage, OccupiedCoreAssumption,
-	ParachainHost, PersistedValidationData, PvfCheckStatement, ScrapedOnChainVotes, SessionIndex,
-	SessionInfo, SigningContext, ValidationCode, ValidationCodeHash, ValidatorId, ValidatorIndex,
-	ValidatorSignature,
+use polkadot_primitives::{
+	v1::{
+		Block as PBlock, BlockNumber, CandidateCommitments, CandidateDescriptor, CandidateEvent,
+		CollatorPair, CommittedCandidateReceipt, CoreState, GroupRotationInfo, Hash as PHash,
+		HeadData, Id as ParaId, InboundDownwardMessage, InboundHrmpMessage, OccupiedCoreAssumption,
+		PersistedValidationData, ScrapedOnChainVotes, SessionIndex, SigningContext, ValidationCode,
+		ValidationCodeHash, ValidatorId, ValidatorIndex, ValidatorSignature,
+	},
+	v2::{ParachainHost, PvfCheckStatement, SessionInfo},
 };
 use polkadot_test_client::{
 	Client as PClient, ClientBlockImportExt, DefaultTestClientBuilderExt, FullBackend as PBackend,

client/pov-recovery/src/lib.rs

@@ -53,9 +53,11 @@ use sp_runtime::{
 
 use polkadot_node_primitives::{AvailableData, POV_BOMB_LIMIT};
 use polkadot_overseer::Handle as OverseerHandle;
-use polkadot_primitives::v1::{
-	Block as PBlock, CandidateReceipt, CommittedCandidateReceipt, Id as ParaId, ParachainHost,
-	SessionIndex,
+use polkadot_primitives::{
+	v1::{
+		Block as PBlock, CandidateReceipt, CommittedCandidateReceipt, Id as ParaId, SessionIndex,
+	},
+	v2::ParachainHost,
 };
 
 use cumulus_primitives_core::ParachainBlockData;

primitives/core/src/lib.rs

@@ -34,7 +34,7 @@ pub use polkadot_primitives::v1::{
 /// A module that re-exports relevant relay chain definitions.
 pub mod relay_chain {
 	pub use polkadot_core_primitives::*;
-	pub use polkadot_primitives::{v1, v1::well_known_keys};
+	pub use polkadot_primitives::{v1, v1::well_known_keys, v2};
 }
 
 /// An inbound HRMP message.

primitives/parachain-inherent/src/client_side.rs

@@ -19,11 +19,7 @@
 use crate::ParachainInherentData;
 use codec::Decode;
 use cumulus_primitives_core::{
-	relay_chain::{
-		self,
-		v1::{HrmpChannelId, ParachainHost},
-		Block as PBlock, Hash as PHash,
-	},
+	relay_chain::{self, v1::HrmpChannelId, v2::ParachainHost, Block as PBlock, Hash as PHash},
 	InboundDownwardMessage, InboundHrmpMessage, ParaId, PersistedValidationData,
 };
 use polkadot_client::{Client, ClientHandle, ExecuteWithClient};