Make the tests pass

cumulus/consensus/Cargo.toml

@@ -13,9 +13,9 @@ substrate-primitives = { git = "https://github.com/paritytech/substrate", branch
 sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "bkchr-validate_block" }
 
 # polkadot deps
-polkadot-service = { git = "https://github.com/paritytech/polkadot" }
-polkadot-primitives = { git = "https://github.com/paritytech/polkadot" }
-polkadot-runtime = { git = "https://github.com/paritytech/polkadot" }
+polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-validate_block" }
+polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-validate_block" }
+polkadot-runtime = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-validate_block" }
 
 # other deps
 futures = "0.1.21"

cumulus/consensus/src/lib.rs

@@ -169,8 +169,8 @@ impl<B, E, RA> PolkadotClient for Arc<Client<B, E, PBlock, RA>> where
 {
 	type Error = ClientError;
 
-	type HeadUpdates = Box<Stream<Item=HeadUpdate,Error=Self::Error> + Send>;
-	type Finalized = Box<Stream<Item=Vec<u8>,Error=Self::Error> + Send>;
+	type HeadUpdates = Box<Stream<Item=HeadUpdate, Error=Self::Error> + Send>;
+	type Finalized = Box<Stream<Item=Vec<u8>, Error=Self::Error> + Send>;
 
 	fn head_updates(&self, para_id: ParaId) -> Self::HeadUpdates {
 		let parachain_key = parachain_key(para_id);

cumulus/runtime/src/validate_block/mod.rs

@@ -39,7 +39,7 @@ mod tests;
 ///     struct Block;
 ///     struct BlockExecutor;
 ///
-///     srml_parachain::register_validate_block!(Block, BlockExecutor);
+///     cumulus_runtime::register_validate_block!(Block, BlockExecutor);
 ///
 /// # fn main() {}
 /// ```