combine relay chain primitives into one module

substrate/client/src/backend.rs

@@ -18,7 +18,7 @@
 
 use state_machine;
 use error;
-use primitives::block;
+use primitives::relay::block;
 use blockchain::{self, BlockId};
 
 /// Block insertion transction. Keeps hold if the inseted block state and data.

substrate/client/src/blockchain.rs

@@ -17,7 +17,7 @@
 //! Polkadot blockchain trait
 
 use std::fmt::{Display, Formatter, Error as FmtError};
-use primitives::block;
+use primitives::relay::block;
 use error::Result;
 
 /// Block indentification.

substrate/client/src/genesis.rs

@@ -17,7 +17,7 @@
 //! Tool for creating the genesis block.
 
 use std::collections::HashMap;
-use primitives::block::{Block, Header};
+use primitives::relay::{Block, Header};
 use triehash::trie_root;
 
 /// Create a genesis block, given the initial storage.
@@ -47,8 +47,7 @@ mod tests {
 	use state_machine::backend::InMemory;
 	use polkadot_executor::executor;
 	use primitives::{AccountId, Hash};
-	use primitives::block::{Number as BlockNumber, Header, Digest};
-	use primitives::transaction::{UncheckedTransaction, Transaction, Function};
+	use primitives::relay::{BlockNumber, Header, Digest, UncheckedTransaction, Transaction, Function};
 	use primitives::contract::CallData;
 	use ed25519::Pair;
 

substrate/client/src/in_mem.rs

@@ -23,10 +23,10 @@ use error;
 use backend;
 use primitives;
 use ser;
-use primitives::block::{self, HeaderHash};
+use primitives::relay::block::{self, HeaderHash};
 use blockchain::{self, BlockId, BlockStatus};
 
-fn header_hash(header: &primitives::block::Header) -> primitives::block::HeaderHash {
+fn header_hash(header: &block::Header) -> block::HeaderHash {
 	primitives::hashing::blake2_256(&ser::to_vec(header)).into()
 }
 

substrate/client/src/lib.rs

@@ -47,7 +47,7 @@ pub use genesis::construct_genesis_block;
 pub use blockchain::Info as ChainInfo;
 pub use blockchain::BlockId;
 
-use primitives::{block};
+use primitives::relay::block;
 use primitives::contract::{CallData, StorageKey, StorageData};
 
 use blockchain::Backend as BlockchainBackend;