combine relay chain primitives into one module

substrate/network/src/blocks.rs

@@ -20,7 +20,7 @@ use std::ops::Range;
 use std::collections::{HashMap, BTreeMap};
 use std::collections::hash_map::Entry;
 use network::PeerId;
-use primitives::block::{Number as BlockNumber};
+use primitives::relay::BlockNumber;
 use message;
 
 const MAX_PARALLEL_DOWNLOADS: u32 = 1;
@@ -190,7 +190,7 @@ impl BlockCollection {
 mod test {
 	use super::{BlockCollection, BlockData};
 	use message;
-	use primitives::block::{HeaderHash};
+	use primitives::relay::{HeaderHash};
 
 	fn is_empty(bc: &BlockCollection) -> bool {
 		bc.blocks.is_empty() &&

substrate/network/src/chain.rs

@@ -19,7 +19,7 @@
 use client::{self, Client as PolkadotClient, ImportResult, ClientInfo, BlockStatus};
 use client::error::Error;
 use state_machine;
-use primitives::block;
+use primitives::relay::block;
 
 pub trait Client : Send + Sync {
 	/// Given a hash return a header

substrate/network/src/lib.rs

@@ -56,7 +56,7 @@ pub use protocol::{ProtocolStatus};
 pub use network::{NonReservedPeerMode, ConnectionFilter, ConnectionDirection, NetworkConfiguration};
 
 // TODO: move it elsewhere
-fn header_hash(header: &primitives::block::Header) -> primitives::block::HeaderHash {
+fn header_hash(header: &primitives::relay::Header) -> primitives::relay::HeaderHash {
 	primitives::hashing::blake2_256(&ser::to_vec(header)).into()
 }
 

substrate/network/src/message.rs

@@ -19,7 +19,7 @@
 use std::borrow::Borrow;
 use primitives::parachain::Id as ParachainId;
 use primitives::AccountId;
-use primitives::block::{Number as BlockNumber, HeaderHash, Header, Body};
+use primitives::relay::{BlockNumber, HeaderHash, Header, Body};
 use service::Role as RoleFlags;
 
 pub type RequestId = u64;

substrate/network/src/protocol.rs

@@ -20,7 +20,7 @@ use std::sync::Arc;
 use parking_lot::RwLock;
 use serde_json;
 use std::time;
-use primitives::block::{HeaderHash, TransactionHash, Number as BlockNumber, Header};
+use primitives::relay::{HeaderHash, TransactionHash, BlockNumber, Header};
 use network::{PeerId, NodeId};
 
 use message::{self, Message};

substrate/network/src/service.rs

@@ -19,7 +19,7 @@ use std::collections::{BTreeMap};
 use std::io;
 use network::{NetworkProtocolHandler, NetworkService, NetworkContext, HostInfo, PeerId, ProtocolId,
 NetworkConfiguration , NonReservedPeerMode, ErrorKind};
-use primitives::block::{TransactionHash, Header};
+use primitives::relay::{TransactionHash, Header};
 use core_io::{TimerToken};
 use io::NetSyncIo;
 use protocol::{Protocol, ProtocolStatus, PeerInfo as ProtocolPeerInfo, TransactionStats};

substrate/network/src/sync.rs

@@ -19,7 +19,7 @@ use io::SyncIo;
 use protocol::Protocol;
 use network::PeerId;
 use client::{ImportResult, BlockStatus, ClientInfo};
-use primitives::block::{HeaderHash, Number as BlockNumber, Header};
+use primitives::relay::{HeaderHash, BlockNumber, Header};
 use blocks::{self, BlockCollection};
 use message::{self, Message};
 use super::header_hash;