From 356aca2db56da299d993a96455379a91ea28268f Mon Sep 17 00:00:00 2001
From: Gav Wood <gavin@ethcore.io>
Date: Sun, 4 Dec 2016 09:13:23 -0800
Subject: [PATCH] Fix build.

---
 ethcore/src/client/test_client.rs | 4 ++--
 ethcore/src/client/traits.rs      | 4 ++--
 ethcore/src/client/updater.rs     | 4 ++--
 parity/blockchain.rs              | 2 +-
 parity/configuration.rs           | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ethcore/src/client/test_client.rs b/ethcore/src/client/test_client.rs
index 44e56f540..eb4e9547d 100644
--- a/ethcore/src/client/test_client.rs
+++ b/ethcore/src/client/test_client.rs
@@ -385,7 +385,7 @@ impl BlockChainClient for TestBlockChainClient {
 		}
 	}
 
-	fn storage_root(&self, _address: &Address, _id: BlockID) -> Option<H256> {
+	fn storage_root(&self, _address: &Address, _id: BlockId) -> Option<H256> {
 		None
 	}
 
@@ -424,7 +424,7 @@ impl BlockChainClient for TestBlockChainClient {
 		None
 	}
 
-	fn list_storage(&self, _id: BlockID, _account: &Address, _after: Option<&H256>, _count: u64) -> Option<Vec<H256>> {
+	fn list_storage(&self, _id: BlockId, _account: &Address, _after: Option<&H256>, _count: u64) -> Option<Vec<H256>> {
 		None
 	}
 	fn transaction(&self, _id: TransactionId) -> Option<LocalizedTransaction> {
diff --git a/ethcore/src/client/traits.rs b/ethcore/src/client/traits.rs
index 7bffda6bc..a7e8041ef 100644
--- a/ethcore/src/client/traits.rs
+++ b/ethcore/src/client/traits.rs
@@ -69,8 +69,8 @@ pub trait BlockChainClient : Sync + Send {
 	fn nonce(&self, address: &Address, id: BlockId) -> Option<U256>;
 
 	/// Attempt to get address storage root at given block.
-	/// May not fail on BlockID::Latest.
-	fn storage_root(&self, address: &Address, id: BlockID) -> Option<H256>;
+	/// May not fail on BlockId::Latest.
+	fn storage_root(&self, address: &Address, id: BlockId) -> Option<H256>;
 
 	/// Get address nonce at the latest block's state.
 	fn latest_nonce(&self, address: &Address) -> U256 {
diff --git a/ethcore/src/client/updater.rs b/ethcore/src/client/updater.rs
index 9417df7bf..ada6749f0 100644
--- a/ethcore/src/client/updater.rs
+++ b/ethcore/src/client/updater.rs
@@ -17,9 +17,9 @@
 use std::sync::{Weak, Arc};
 use std::path::PathBuf;
 use util::misc::{VersionInfo, ReleaseTrack, platform};
-use util::{Bytes, Address, H160, H256, FixedHash, Mutex};
+use util::{Address, H160, H256, FixedHash, Mutex};
 use client::operations::Operations;
-use client::{Client, BlockChainClient, UpdatePolicy, BlockId};
+use client::{Client, UpdatePolicy, BlockId};
 use fetch::HashFetch;
 use fetch;
 
diff --git a/parity/blockchain.rs b/parity/blockchain.rs
index 26c6fec52..84996b5a5 100644
--- a/parity/blockchain.rs
+++ b/parity/blockchain.rs
@@ -117,7 +117,7 @@ pub struct ExportState {
 	pub wal: bool,
 	pub fat_db: Switch,
 	pub tracing: Switch,
-	pub at: BlockID,
+	pub at: BlockId,
 	pub storage: bool,
 	pub code: bool,
 	pub min_balance: Option<U256>,
diff --git a/parity/configuration.rs b/parity/configuration.rs
index 5d50d2617..4031c7164 100644
--- a/parity/configuration.rs
+++ b/parity/configuration.rs
@@ -855,7 +855,7 @@ mod tests {
 			wal: true,
 			tracing: Default::default(),
 			fat_db: Default::default(),
-			at: BlockID::Latest,
+			at: BlockId::Latest,
 			storage: true,
 			code: true,
 			min_balance: None,