From 0f7b66f5573a2fbd99fb1ad33470a687ca5f0326 Mon Sep 17 00:00:00 2001
From: NikVolf <nikvolf@gmail.com>
Date: Fri, 1 Jul 2016 22:40:54 +0300
Subject: [PATCH] fixed compilation & warnings

---
 parity/main.rs    |  6 +++---
 sync/src/chain.rs | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/parity/main.rs b/parity/main.rs
index d466987ef..8d46d28e5 100644
--- a/parity/main.rs
+++ b/parity/main.rs
@@ -82,8 +82,8 @@ use rustc_serialize::hex::FromHex;
 use ctrlc::CtrlC;
 use util::{H256, ToPretty, NetworkConfiguration, PayloadInfo, Bytes, UtilError, paint, Colour, version};
 use util::panics::{MayPanic, ForwardPanic, PanicHandler};
-use ethcore::client::{BlockID, BlockChainClient, ClientConfig, get_db_path};
-use ethcore::error::{Error, ImportError};
+use ethcore::client::{BlockID, BlockChainClient, ClientConfig, get_db_path, BlockImportError};
+use ethcore::error::{ImportError};
 use ethcore::service::ClientService;
 use ethcore::spec::Spec;
 use ethsync::EthSync;
@@ -465,7 +465,7 @@ fn execute_import(conf: Configuration) {
 		while client.queue_info().is_full() { sleep(Duration::from_secs(1)); }
 		match client.import_block(bytes) {
 			Ok(_) => {}
-			Err(Error::Import(ImportError::AlreadyInChain)) => { trace!("Skipping block already in chain."); }
+			Err(BlockImportError::Import(ImportError::AlreadyInChain)) => { trace!("Skipping block already in chain."); }
 			Err(e) => die!("Cannot import block: {:?}", e)
 		}
 		informant.tick(client.deref(), None);
diff --git a/sync/src/chain.rs b/sync/src/chain.rs
index 1897b02f4..6845c32e3 100644
--- a/sync/src/chain.rs
+++ b/sync/src/chain.rs
@@ -93,7 +93,7 @@ use util::*;
 use std::mem::{replace};
 use ethcore::views::{HeaderView, BlockView};
 use ethcore::header::{BlockNumber, Header as BlockHeader};
-use ethcore::client::{BlockChainClient, BlockStatus, BlockID, BlockChainInfo};
+use ethcore::client::{BlockChainClient, BlockStatus, BlockID, BlockChainInfo, BlockImportError};
 use ethcore::error::*;
 use ethcore::block::Block;
 use io::SyncIo;
@@ -544,10 +544,10 @@ impl ChainSync {
 			peer.latest_number = Some(header.number());
 		}
 		match io.chain().import_block(block_rlp.as_raw().to_vec()) {
-			Err(Error::Import(ImportError::AlreadyInChain)) => {
+			Err(BlockImportError::Import(ImportError::AlreadyInChain)) => {
 				trace!(target: "sync", "New block already in chain {:?}", h);
 			},
-			Err(Error::Import(ImportError::AlreadyQueued)) => {
+			Err(BlockImportError::Import(ImportError::AlreadyQueued)) => {
 				trace!(target: "sync", "New block already queued {:?}", h);
 			},
 			Ok(_) => {
@@ -557,7 +557,7 @@ impl ChainSync {
 				}
 				trace!(target: "sync", "New block queued {:?} ({})", h, header.number);
 			},
-			Err(Error::Block(BlockError::UnknownParent(p))) => {
+			Err(BlockImportError::Block(BlockError::UnknownParent(p))) => {
 				unknown = true;
 				trace!(target: "sync", "New block with unknown parent ({:?}) {:?}", p, h);
 			},
@@ -841,11 +841,11 @@ impl ChainSync {
 			}
 
 			match io.chain().import_block(block) {
-				Err(Error::Import(ImportError::AlreadyInChain)) => {
+				Err(BlockImportError::Import(ImportError::AlreadyInChain)) => {
 					trace!(target: "sync", "Block already in chain {:?}", h);
 					self.block_imported(&h, number, &parent);
 				},
-				Err(Error::Import(ImportError::AlreadyQueued)) => {
+				Err(BlockImportError::Import(ImportError::AlreadyQueued)) => {
 					trace!(target: "sync", "Block already queued {:?}", h);
 					self.block_imported(&h, number, &parent);
 				},
@@ -854,7 +854,7 @@ impl ChainSync {
 					imported.insert(h.clone());
 					self.block_imported(&h, number, &parent);
 				},
-				Err(Error::Block(BlockError::UnknownParent(_))) if self.state == SyncState::NewBlocks => {
+				Err(BlockImportError::Block(BlockError::UnknownParent(_))) if self.state == SyncState::NewBlocks => {
 					trace!(target: "sync", "Unknown new block parent, restarting sync");
 					break;
 				},