Merge branch 'master' into fo-6418-dont-export-bigint

# Conflicts:
#	dapps/src/tests/helpers/registrar.rs
#	ethcore/evm/src/interpreter/shared_cache.rs
#	ethcore/light/src/client/header_chain.rs
#	ethcore/light/src/client/mod.rs
#	ethcore/light/src/net/mod.rs
#	ethcore/light/src/on_demand/request.rs
#	ethcore/light/src/on_demand/tests.rs
#	ethcore/light/src/provider.rs
#	ethcore/node_filter/src/lib.rs
#	ethcore/src/block.rs
#	ethcore/src/blockchain/blockchain.rs
#	ethcore/src/client/test_client.rs
#	ethcore/src/engines/authority_round/mod.rs
#	ethcore/src/engines/basic_authority.rs
#	ethcore/src/engines/mod.rs
#	ethcore/src/engines/tendermint/mod.rs
#	ethcore/src/engines/validator_set/contract.rs
#	ethcore/src/engines/validator_set/multi.rs
#	ethcore/src/engines/validator_set/safe_contract.rs
#	ethcore/src/engines/vote_collector.rs
#	ethcore/src/miner/external.rs
#	ethcore/src/miner/miner.rs
#	ethcore/src/miner/service_transaction_checker.rs
#	ethcore/src/miner/work_notify.rs
#	ethcore/src/pod_account.rs
#	ethcore/src/pod_state.rs
#	ethcore/src/snapshot/block.rs
#	ethcore/src/snapshot/consensus/work.rs
#	ethcore/src/snapshot/mod.rs
#	ethcore/src/snapshot/service.rs
#	ethcore/src/spec/spec.rs
#	ethcore/src/state/backend.rs
#	ethcore/src/trace/db.rs
#	ethcore/src/verification/queue/mod.rs
#	ethcore/src/verification/verification.rs
#	parity/informant.rs
#	rpc/src/v1/helpers/dispatch.rs
#	rpc/src/v1/helpers/light_fetch.rs
#	rpc/src/v1/helpers/signing_queue.rs
#	rpc/src/v1/impls/eth.rs
#	rpc/src/v1/impls/eth_filter.rs
#	rpc/src/v1/impls/eth_pubsub.rs
#	rpc/src/v1/impls/light/eth.rs
#	rpc/src/v1/impls/signing.rs
#	rpc/src/v1/tests/helpers/miner_service.rs
#	rpc/src/v1/tests/helpers/snapshot_service.rs
#	rpc/src/v1/tests/helpers/sync_provider.rs
#	rpc/src/v1/tests/mocked/eth.rs
#	stratum/src/lib.rs
#	sync/src/blocks.rs
#	sync/src/chain.rs
#	sync/src/light_sync/mod.rs
#	sync/src/tests/helpers.rs
#	sync/src/tests/snapshot.rs
#	updater/src/updater.rs
#	util/src/lib.rs
#	util/triehash/src/lib.rs

rpc/Cargo.toml

@@ -8,12 +8,14 @@ authors = ["Parity Technologies <admin@parity.io>"]
 [lib]
 
 [dependencies]
+ansi_term = "0.9"
 cid = "0.2"
 futures = "0.1"
 futures-cpupool = "0.1"
 log = "0.3"
 multihash ="0.6"
 order-stat = "0.1"
+parking_lot = "0.4"
 rand = "0.3"
 rust-crypto = "0.2"
 rustc-hex = "1.0"

rpc/src/lib.rs

@@ -20,6 +20,7 @@
 #![cfg_attr(feature="dev", feature(plugin))]
 #![cfg_attr(feature="dev", plugin(clippy))]
 
+extern crate ansi_term;
 extern crate cid;
 extern crate crypto as rust_crypto;
 extern crate futures;
@@ -27,6 +28,7 @@ extern crate futures_cpupool;
 extern crate itertools;
 extern crate multihash;
 extern crate order_stat;
+extern crate parking_lot;
 extern crate rand;
 extern crate rustc_hex;
 extern crate semver;

rpc/src/v1/helpers/dispatch.rs

@@ -29,7 +29,8 @@ use rlp;
 use hash::keccak;
 use bigint::prelude::U256;
 use bigint::hash::{H256, H520};
-use util::{Address, Bytes, Mutex, RwLock};
+use util::{Address, Bytes};
+use parking_lot::{Mutex, RwLock};
 use stats::Corpus;
 
 use ethkey::Signature;

rpc/src/v1/helpers/light_fetch.rs

@@ -38,7 +38,8 @@ use light::request::Field;
 
 use ethsync::LightSync;
 use bigint::prelude::U256;
-use util::{Address, Mutex};
+use util::Address;
+use parking_lot::Mutex;
 
 use v1::helpers::{CallRequest as CallRequestHelper, errors, dispatch};
 use v1::types::{BlockNumber, CallRequest, Log};

rpc/src/v1/helpers/signer.rs

@@ -17,7 +17,7 @@
 use std::sync::Arc;
 use std::ops::Deref;
 use http::Origin;
-use util::Mutex;
+use parking_lot::Mutex;
 use transient_hashmap::TransientHashMap;
 
 use ethstore::random_string;

rpc/src/v1/helpers/signing_queue.rs

@@ -20,7 +20,8 @@ use std::sync::Arc;
 use std::collections::BTreeMap;
 use jsonrpc_core;
 use bigint::prelude::U256;
-use util::{Mutex, RwLock, Address};
+use util::Address;
+use parking_lot::{Mutex, RwLock};
 use ethcore::account_provider::DappId;
 use v1::helpers::{ConfirmationRequest, ConfirmationPayload};
 use v1::types::{ConfirmationResponse, H160 as RpcH160, Origin, DappId as RpcDappId};
@@ -299,7 +300,8 @@ mod test {
 	use std::thread;
 	use std::sync::{mpsc, Arc};
 	use bigint::prelude::U256;
-	use util::{Address, Mutex};
+	use util::Address;
+	use parking_lot::Mutex;
 	use v1::helpers::{SigningQueue, ConfirmationsQueue, QueueEvent, FilledTransactionRequest, ConfirmationPayload};
 	use v1::types::ConfirmationResponse;
 

rpc/src/v1/helpers/subscription_manager.rs

@@ -18,7 +18,7 @@
 
 use std::sync::Arc;
 use std::sync::atomic::{self, AtomicBool};
-use util::Mutex;
+use parking_lot::Mutex;
 
 use jsonrpc_core::futures::future::{self, Either};
 use jsonrpc_core::futures::sync::mpsc;

rpc/src/v1/impls/eth.rs

@@ -26,7 +26,7 @@ use time::get_time;
 use bigint::prelude::U256;
 use bigint::hash::{H64, H160, H256};
 use util::Address;
-use util::Mutex;
+use parking_lot::Mutex;
 
 use ethash::SeedHashCompute;
 use ethcore::account_provider::{AccountProvider, DappId};

rpc/src/v1/impls/eth_filter.rs

@@ -24,7 +24,7 @@ use ethcore::miner::MinerService;
 use ethcore::filter::Filter as EthcoreFilter;
 use ethcore::client::{BlockChainClient, BlockId};
 use bigint::hash::H256;
-use util::Mutex;
+use parking_lot::Mutex;
 
 use futures::{future, Future, BoxFuture};
 

rpc/src/v1/impls/eth_pubsub.rs

@@ -40,7 +40,8 @@ use light::on_demand::OnDemand;
 use light::client::{LightChainClient, LightChainNotify};
 use parity_reactor::Remote;
 use bigint::hash::H256;
-use util::{RwLock, Mutex, Bytes};
+use util::Bytes;
+use parking_lot::{RwLock, Mutex};
 
 type Client = Sink<pubsub::Result>;
 

rpc/src/v1/impls/light/eth.rs

@@ -40,7 +40,7 @@ use ethsync::LightSync;
 use rlp::UntrustedRlp;
 use hash::{KECCAK_NULL_RLP, KECCAK_EMPTY_LIST_RLP};
 use bigint::prelude::U256;
-use util::{RwLock, Mutex};
+use parking_lot::{RwLock, Mutex};
 
 use futures::{future, Future, BoxFuture, IntoFuture};
 use futures::sync::oneshot;

rpc/src/v1/impls/pubsub.rs

@@ -18,7 +18,7 @@
 
 use std::sync::Arc;
 use std::time::Duration;
-use util::RwLock;
+use parking_lot::RwLock;
 
 use futures::{self, BoxFuture, Future, Stream, Sink};
 use jsonrpc_core::{self as core, Error, MetaIoHandler};

rpc/src/v1/impls/signer.rs

@@ -24,7 +24,7 @@ use ethkey;
 use futures::{future, BoxFuture, Future, IntoFuture};
 use parity_reactor::Remote;
 use rlp::UntrustedRlp;
-use util::Mutex;
+use parking_lot::Mutex;
 
 use jsonrpc_core::{futures, Error};
 use jsonrpc_pubsub::SubscriptionId;

rpc/src/v1/impls/signing.rs

@@ -19,7 +19,7 @@
 use std::sync::Arc;
 use transient_hashmap::TransientHashMap;
 use bigint::prelude::U256;
-use util::Mutex;
+use parking_lot::Mutex;
 
 use ethcore::account_provider::AccountProvider;
 

rpc/src/v1/informant.rs

@@ -24,7 +24,7 @@ use futures::Future;
 use futures_cpupool as pool;
 use jsonrpc_core as rpc;
 use order_stat;
-use util::RwLock;
+use parking_lot::RwLock;
 
 pub use self::pool::CpuPool;
 

rpc/src/v1/tests/helpers/miner_service.rs

@@ -20,7 +20,8 @@ use std::collections::{BTreeMap, HashMap};
 use std::collections::hash_map::Entry;
 use bigint::prelude::U256;
 use bigint::hash::H256;
-use util::{Address, Bytes, RwLock, Mutex};
+use util::{Address, Bytes};
+use parking_lot::{RwLock, Mutex};
 use ethcore::error::Error;
 use ethcore::client::MiningBlockChainClient;
 use ethcore::block::ClosedBlock;

rpc/src/v1/tests/helpers/snapshot_service.rs

@@ -16,8 +16,9 @@
 
 use ethcore::snapshot::{ManifestData, RestorationStatus, SnapshotService};
 
-use util::{Bytes, Mutex};
+use util::Bytes;
 use bigint::hash::H256;
+use parking_lot::Mutex;
 
 /// Mocked snapshot service (used for sync info extensions).
 pub struct TestSnapshotService {

rpc/src/v1/tests/helpers/sync_provider.rs

@@ -18,7 +18,7 @@
 
 use std::collections::BTreeMap;
 use bigint::hash::H256;
-use util::RwLock;
+use parking_lot::RwLock;
 use ethsync::{SyncProvider, EthProtocolInfo, SyncStatus, SyncState, PeerInfo, TransactionStats};
 
 /// TestSyncProvider config.

rpc/src/v1/tests/mocked/eth.rs

@@ -24,7 +24,8 @@ use rlp;
 
 use bigint::prelude::U256;
 use bigint::hash::H256;
-use util::{Address, Mutex};
+use util::Address;
+use parking_lot::Mutex;
 use ethkey::Secret;
 use ethcore::account_provider::AccountProvider;
 use ethcore::client::{TestBlockChainClient, EachBlockWith, Executed, TransactionId};

rpc/src/v1/types/confirmations.rs

@@ -18,7 +18,7 @@
 
 use std::fmt;
 use serde::{Serialize, Serializer};
-use util::Colour;
+use ansi_term::Colour;
 use util::bytes::ToPretty;
 
 use v1::types::{U256, TransactionRequest, RichRawTransaction, H160, H256, H520, Bytes, TransactionCondition, Origin};

rpc/src/v1/types/transaction_request.rs

@@ -18,7 +18,7 @@
 
 use v1::types::{Bytes, H160, U256, TransactionCondition};
 use v1::helpers;
-use util::Colour;
+use ansi_term::Colour;
 
 use std::fmt;