Clean-up and parallelize.

ethcore/Cargo.toml

@@ -42,7 +42,7 @@ num = "0.1"
 num_cpus = "1.2"
 parity-machine = { path = "../machine" }
 parking_lot = "0.5"
-rayon = "0.8"
+rayon = "1.0"
 rand = "0.4"
 rlp = { path = "../util/rlp" }
 rlp_compress = { path = "../util/rlp_compress" }
@@ -60,7 +60,6 @@ rustc-hex = "1.0"
 stats = { path = "../util/stats" }
 time = "0.1"
 using_queue = { path = "../util/using_queue" }
-table = { path = "../util/table" }
 vm = { path = "vm" }
 wasm = { path = "wasm" }
 keccak-hash = { path = "../util/hash" }

ethcore/src/lib.rs

@@ -109,7 +109,6 @@ extern crate stats;
 extern crate stop_guard;
 extern crate time;
 extern crate using_queue;
-extern crate table;
 extern crate vm;
 extern crate wasm;
 extern crate memory_cache;

ethcore/src/miner/blockchain_client.rs

@@ -106,7 +106,7 @@ impl<'a> pool::client::Client for BlockChainClient<'a> {
 	fn transaction_type(&self, tx: &SignedTransaction) -> pool::client::TransactionType {
 		match self.service_transaction_checker {
 			None => pool::client::TransactionType::Regular,
-			Some(ref checker) => match checker.check(self, &tx.sender()) {
+			Some(ref checker) => match checker.check(self, &tx.sender(), &tx.hash()) {
 				Ok(true) => pool::client::TransactionType::Service,
 				Ok(false) => pool::client::TransactionType::Regular,
 				Err(e) => {

ethcore/src/miner/miner.rs

@@ -19,14 +19,15 @@ use std::collections::{BTreeMap, HashSet};
 use std::sync::Arc;
 
 use ansi_term::Colour;
-use ethereum_types::{H256, U256, Address};
-use parking_lot::{Mutex, RwLock};
 use bytes::Bytes;
 use engines::{EthEngine, Seal};
 use error::{Error, ExecutionError};
+use ethcore_miner::gas_pricer::GasPricer;
 use ethcore_miner::pool::{self, TransactionQueue, VerifiedTransaction, QueueStatus};
 use ethcore_miner::work_notify::{WorkPoster, NotifyWork};
-use ethcore_miner::gas_pricer::GasPricer;
+use ethereum_types::{H256, U256, Address};
+use parking_lot::{Mutex, RwLock};
+use rayon::prelude::*;
 use timer::PerfTimer;
 use transaction::{
 	self,
@@ -1012,19 +1013,20 @@ impl MinerService for Miner {
 		// Then import all transactions...
 		let client = self.client(chain);
 		{
-			// TODO [ToDr] Parallelize
-			for hash in retracted {
-				let block = chain.block(BlockId::Hash(*hash))
-					.expect("Client is sending message after commit to db and inserting to chain; the block is available; qed");
-				let txs = block.transactions()
-					.into_iter()
-					.map(pool::verifier::Transaction::Retracted)
-					.collect();
-				let _ = self.transaction_queue.import(
-					client.clone(),
-					txs,
-				);
-			}
+			retracted
+				.par_iter()
+				.for_each(|hash| {
+					let block = chain.block(BlockId::Hash(*hash))
+						.expect("Client is sending message after commit to db and inserting to chain; the block is available; qed");
+					let txs = block.transactions()
+						.into_iter()
+						.map(pool::verifier::Transaction::Retracted)
+						.collect();
+					let _ = self.transaction_queue.import(
+						client.clone(),
+						txs,
+					);
+				});
 		}
 
 		// ...and at the end remove the old ones

miner/Cargo.toml

@@ -18,15 +18,16 @@ ethabi-derive = "5.0"
 ethash = { path = "../ethash" }
 ethcore-transaction = { path = "../ethcore/transaction" }
 ethereum-types = "0.2"
-ethkey = { path = "../ethkey" }
 futures = "0.1"
 heapsize = "0.4"
 keccak-hash = { path = "../util/hash" }
 linked-hash-map = "0.5"
 log = "0.3"
 parking_lot = "0.5"
 price-info = { path = "../price-info" }
-rustc-hex = "1.0"
-table = { path = "../util/table" }
+rayon = "1.0"
 transaction-pool = { path = "../transaction-pool" }
-transient-hashmap = "0.4"
+
+[dev-dependencies]
+ethkey = { path = "../ethkey" }
+rustc-hex = "1.0"