All tests compile. Most tests work.

substrate/Cargo.lock

@@ -1090,6 +1090,7 @@ name = "polkadot-validator"
 version = "0.1.0"
 dependencies = [
  "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "polkadot-primitives 0.1.0",
  "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
  "substrate-primitives 0.1.0",
  "substrate-serializer 0.1.0",
@@ -1431,6 +1432,7 @@ dependencies = [
  "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "native-runtime 0.1.0",
  "parity-wasm 0.15.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "polkadot-primitives 0.1.0",
  "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",

substrate/client/src/genesis.rs

@@ -17,7 +17,7 @@
 //! Tool for creating the genesis block.
 
 use std::collections::HashMap;
-use primitives::{Block, Header};
+use polkadot_primitives::{Block, Header};
 use triehash::trie_root;
 
 /// Create a genesis block, given the initial storage.

substrate/executor/Cargo.toml

@@ -10,7 +10,6 @@ substrate-runtime-io = { path = "../runtime-io" }
 substrate-primitives = { path = "../primitives" }
 substrate-serializer = { path = "../serializer" }
 substrate-state-machine = { path = "../state-machine"  }
-native-runtime = { path = "../native-runtime" }
 ed25519 = { path = "../ed25519" }
 serde = "1.0"
 serde_derive = "1.0"
@@ -20,6 +19,9 @@ rustc-hex = "1.0.0"
 triehash = "0.1.0"
 hex-literal = "0.1.0"
 log = "0.3"
+# TODO: Remove these and split out tests and a concrete executor.
+native-runtime = { path = "../native-runtime" }
+polkadot-primitives = { path = "../polkadot-primitives" }
 
 [dev-dependencies]
 assert_matches = "1.1"

substrate/executor/src/lib.rs

@@ -38,10 +38,13 @@ extern crate serde;
 extern crate parity_wasm;
 extern crate byteorder;
 extern crate rustc_hex;
-extern crate native_runtime;
 extern crate triehash;
 #[macro_use] extern crate log;
 
+// TODO: Remove and split out into polkadot-specific crate.
+extern crate native_runtime;
+extern crate polkadot_primitives;
+
 #[cfg(test)]
 #[macro_use]
 extern crate hex_literal;

substrate/network/src/blocks.rs

@@ -190,7 +190,7 @@ impl BlockCollection {
 mod test {
 	use super::{BlockCollection, BlockData};
 	use message;
-	use primitives::HeaderHash;
+	use primitives::block::HeaderHash;
 
 	fn is_empty(bc: &BlockCollection) -> bool {
 		bc.blocks.is_empty() &&

substrate/validator/Cargo.toml

@@ -6,5 +6,6 @@ authors = ["Parity Technologies <admin@parity.io>"]
 [dependencies]
 error-chain = "0.11"
 substrate-primitives = { path = "../primitives" }
+polkadot-primitives = { path = "../polkadot-primitives" }
 substrate-serializer = { path = "../serializer" }
 serde = "1.0"

substrate/validator/src/lib.rs

@@ -20,6 +20,7 @@
 
 extern crate substrate_primitives as primitives;
 extern crate substrate_serializer as serializer;
+extern crate polkadot_primitives;
 extern crate serde;
 
 #[macro_use]

substrate/validator/src/parachains.rs

@@ -16,7 +16,7 @@
 
 use std::fmt;
 
-use primitives::validator;
+use polkadot_primitives::validator;
 use serde::de::DeserializeOwned;
 
 use error::Result;

substrate/validator/src/validator.rs

@@ -16,7 +16,7 @@
 
 use std::fmt;
 
-use primitives::{validator, parachain};
+use polkadot_primitives::{validator, parachain};
 use serde::de::DeserializeOwned;
 use serializer;
 
@@ -99,4 +99,3 @@ impl<M, B, T, R> Code for T where
 		Ok(self.check(messages, downloads, block_data, head_data)?.into())
 	}
 }
-