From a9a671dfc0054a65603f030c61087a059f21ab7e Mon Sep 17 00:00:00 2001
From: NikVolf <nikvolf@gmail.com>
Date: Tue, 5 Jul 2016 11:45:31 +0300
Subject: [PATCH] ethcore compilation

---
 ethcore/src/client/client.rs.in   | 15 ++++++++-------
 ethcore/src/client/test_client.rs |  6 ++----
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/ethcore/src/client/client.rs.in b/ethcore/src/client/client.rs.in
index bb6421520..a83d59d11 100644
--- a/ethcore/src/client/client.rs.in
+++ b/ethcore/src/client/client.rs.in
@@ -62,23 +62,24 @@ use block_queue::{BlockQueue, BlockQueueInfo};
 use blockchain::{BlockChain, BlockProvider, TreeRoute, ImportRoute};
 use client::{BlockID, TransactionID, UncleID, TraceId, ClientConfig,
 	DatabaseCompactionProfile, BlockChainClient, MiningBlockChainClient,
-	TraceFilter, CallAnalytics, BlockImportError};
+	TraceFilter, CallAnalytics, BlockImportError, TransactionImportError, TransactionImportResult};
 use client::Error as ClientError;
 use env_info::EnvInfo;
 use executive::{Executive, Executed, TransactOptions, contract_address};
 use receipt::LocalizedReceipt;
-pub use blockchain::CacheSize as BlockChainCacheSize;
 use trace::{TraceDB, ImportRequest as TraceImportRequest, LocalizedTrace, Database as TraceDatabase};
 use trace;
-pub use types::blockchain_info::BlockChainInfo;
-pub use types::block_status::BlockStatus;
 use evm::Factory as EvmFactory;
-use miner::{Miner, MinerService, TransactionImportResult, AccountDetails};
-use basic_types::*;
-
+use miner::{Miner, MinerService, AccountDetails};
+use util::TrieFactory;
 use ipc::IpcConfig;
 use ipc::binary::{BinaryConvertable, BinaryConvertError};
 
+// re-export
+pub use types::blockchain_info::BlockChainInfo;
+pub use types::block_status::BlockStatus;
+pub use blockchain::CacheSize as BlockChainCacheSize;
+
 const MAX_TX_QUEUE_SIZE: usize = 4096;
 
 impl fmt::Display for BlockChainInfo {
diff --git a/ethcore/src/client/test_client.rs b/ethcore/src/client/test_client.rs
index 1ac47bbec..fc11f6e97 100644
--- a/ethcore/src/client/test_client.rs
+++ b/ethcore/src/client/test_client.rs
@@ -459,8 +459,7 @@ impl BlockChainClient for TestBlockChainClient {
 		}
 	}
 
-	fn clear_queue(&self) -> bool {
-		true
+	fn clear_queue(&self) {
 	}
 
 	fn chain_info(&self) -> BlockChainInfo {
@@ -503,11 +502,10 @@ impl BlockChainClient for TestBlockChainClient {
 			.collect()
 	}
 
-	fn queue_transactions(&self, transactions: Vec<Bytes>) -> bool {
+	fn queue_transactions(&self, transactions: Vec<Bytes>) {
 		// import right here
 		let tx = transactions.into_iter().filter_map(|bytes| UntrustedRlp::new(&bytes).as_val().ok()).collect();
 		self.import_transactions(tx);
-		true
 	}
 
 	fn pending_transactions(&self) -> Vec<SignedTransaction> {