Strip out old XCMP primitives (#823)

* WIP

* WIp

* Mostly get tests to compile

* Fix adder collator

* Remove more stuff

* Revert some changes to av store

* Fix av store tests

* Nitpicks

* Restore some things

* Small changes

* Remvoe unused error variants

polkadot/availability-store/src/worker.rs

@@ -35,7 +35,7 @@ use consensus_common::{
 use polkadot_primitives::{Block, BlockId, Hash};
 use polkadot_primitives::parachain::{
 	CandidateReceipt, ParachainHost, ValidatorId,
-	ValidatorPair, AvailableMessages, BlockData, ErasureChunk,
+	ValidatorPair, ErasureChunk, PoVBlock,
 };
 use futures::{prelude::*, future::select, channel::{mpsc, oneshot}, task::{Spawn, SpawnExt}};
 use keystore::KeyStorePtr;
@@ -90,7 +90,7 @@ pub(crate) struct ParachainBlocks {
 	/// The relay parent of the block these parachain blocks belong to.
 	pub relay_parent: Hash,
 	/// The blocks themselves.
-	pub blocks: Vec<(CandidateReceipt, Option<(BlockData, AvailableMessages)>)>,
+	pub blocks: Vec<(CandidateReceipt, Option<PoVBlock>)>,
 	/// A sender to signal the result asynchronously.
 	pub result: oneshot::Sender<Result<(), Error>>,
 }
@@ -367,7 +367,7 @@ where
 		runtime_handle: &Handle,
 		sender: &mut mpsc::UnboundedSender<WorkerMsg>,
 		relay_parent: Hash,
-		blocks: Vec<(CandidateReceipt, Option<(BlockData, AvailableMessages)>)>,
+		blocks: Vec<(CandidateReceipt, Option<PoVBlock>)>,
 	) -> Result<(), Error> {
 		let hashes: Vec<_> = blocks.iter().map(|(c, _)| c.hash()).collect();
 
@@ -375,7 +375,7 @@ where
 		for (candidate, block) in blocks.into_iter() {
 			let _ = self.availability_store.add_candidate(&candidate);
 
-			if let Some((_block, _msgs)) = block {
+			if let Some(_block) = block {
 				// Should we be breaking block into chunks here and gossiping it and so on?
 			}