Move HeadData to primitives

collator/src/lib.rs

@@ -20,7 +20,7 @@ use cumulus_network::{
 	DelayedBlockAnnounceValidator, JustifiedBlockAnnounceValidator, WaitToAnnounce,
 };
 use cumulus_primitives::{
-	inherents::VALIDATION_FUNCTION_PARAMS_IDENTIFIER as VFP_IDENT,
+	HeadData, inherents::VALIDATION_FUNCTION_PARAMS_IDENTIFIER as VFP_IDENT,
 	validation_function_params::ValidationFunctionParams,
 };
 use cumulus_runtime::ParachainBlockData;
@@ -56,12 +56,6 @@ use std::{fmt::Debug, marker::PhantomData, sync::Arc, time::Duration, pin::Pin};
 
 use parking_lot::Mutex;
 
-/// The head data of the parachain, stored in the relay chain.
-#[derive(Decode, Encode, Debug)]
-struct HeadData<Block: BlockT> {
-	header: Block::Header,
-}
-
 /// The implementation of the Cumulus `Collator`.
 pub struct Collator<Block: BlockT, PF, BI> {
 	proposer_factory: Arc<Mutex<PF>>,

network/Cargo.toml

@@ -19,6 +19,9 @@ polkadot-statement-table = { git = "https://github.com/paritytech/polkadot", bra
 polkadot-validation = { git = "https://github.com/paritytech/polkadot", branch = "cumulus-branch" }
 polkadot-network = { git = "https://github.com/paritytech/polkadot", branch = "cumulus-branch" }
 
+# cumulus deps
+cumulus-primitives = { path = "../primitives" }
+
 # other deps
 codec = { package = "parity-scale-codec", version = "1.3.0", features = [ "derive" ] }
 futures = { version = "0.3.1", features = ["compat"] }

network/src/lib.rs

@@ -35,6 +35,8 @@ use polkadot_primitives::{
 use polkadot_statement_table::{SignedStatement, Statement};
 use polkadot_validation::check_statement;
 
+use cumulus_primitives::HeadData;
+
 use codec::{Decode, Encode};
 use futures::{pin_mut, select, StreamExt};
 use futures::channel::oneshot;
@@ -45,12 +47,6 @@ use log::{error, trace};
 use std::{marker::PhantomData, sync::Arc};
 use parking_lot::Mutex;
 
-/// The head data of the parachain, stored in the relay chain.
-#[derive(Decode, Encode, Debug)]
-struct HeadData<Block: BlockT> {
-	header: Block::Header,
-}
-
 /// Validate that data is a valid justification from a relay-chain validator that the block is a
 /// valid parachain-block candidate.
 /// Data encoding is just `GossipMessage`, the relay-chain validator candidate statement message is

primitives/src/lib.rs

@@ -20,6 +20,9 @@
 
 pub mod validation_function_params;
 
+use codec::{Decode, Encode};
+use sp_runtime::traits::{Block as BlockT};
+
 /// Identifiers and types related to Cumulus Inherents
 pub mod inherents {
 	use sp_inherents::InherentIdentifier;
@@ -64,3 +67,9 @@ pub trait UpwardMessageSender {
 	/// Returns an error if sending failed.
 	fn send_upward_message(msg: &()) -> Result<(), ()>;
 }
+
+/// The head data of the parachain, stored in the relay chain.
+#[derive(Decode, Encode, Debug)]
+pub struct HeadData<Block: BlockT> {
+	header: Block::Header,
+}