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

ethcore/src/engines/authority_round/mod.rs

@@ -44,6 +44,8 @@ use itertools::{self, Itertools};
 use rlp::{UntrustedRlp, encode};
 use bigint::prelude::{U256, U128};
 use bigint::hash::{H256, H520};
+use semantic_version::SemanticVersion;
+use parking_lot::{Mutex, RwLock};
 use util::*;
 
 mod finality;

ethcore/src/engines/basic_authority.rs

@@ -21,6 +21,7 @@ use std::collections::BTreeMap;
 use std::cmp;
 use bigint::prelude::U256;
 use bigint::hash::{H256, H520};
+use parking_lot::RwLock;
 use util::*;
 use ethkey::{recover, public_to_address, Signature};
 use account_provider::AccountProvider;
@@ -33,6 +34,7 @@ use evm::Schedule;
 use ethjson;
 use header::{Header, BlockNumber};
 use client::Client;
+use semantic_version::SemanticVersion;
 use super::signer::EngineSigner;
 use super::validator_set::{ValidatorSet, SimpleList, new_validator_set};
 

ethcore/src/engines/mod.rs

@@ -56,6 +56,7 @@ use transaction::{UnverifiedTransaction, SignedTransaction};
 use ethkey::Signature;
 use bigint::prelude::U256;
 use bigint::hash::H256;
+use semantic_version::SemanticVersion;
 use util::*;
 
 /// Default EIP-210 contrat code.

ethcore/src/engines/tendermint/mod.rs

@@ -32,6 +32,7 @@ use hash::keccak;
 use std::cmp;
 use bigint::prelude::{U128, U256};
 use bigint::hash::{H256, H520};
+use parking_lot::RwLock;
 use util::*;
 use client::{Client, EngineClient};
 use error::{Error, BlockError};
@@ -50,6 +51,7 @@ use super::transition::TransitionHandler;
 use super::vote_collector::VoteCollector;
 use self::message::*;
 use self::params::TendermintParams;
+use semantic_version::SemanticVersion;
 
 #[derive(Debug, PartialEq, Eq, Clone, Copy, Hash)]
 pub enum Step {

ethcore/src/engines/validator_set/contract.rs

@@ -19,6 +19,7 @@
 
 use std::sync::Weak;
 use bigint::hash::H256;
+use parking_lot::RwLock;
 use util::*;
 
 use futures::Future;

ethcore/src/engines/validator_set/multi.rs

@@ -20,7 +20,8 @@ use std::collections::BTreeMap;
 use std::sync::Weak;
 use engines::{Call, Engine};
 use bigint::hash::H256;
-use util::{Bytes, Address, RwLock};
+use parking_lot::RwLock;
+use util::{Bytes, Address};
 use ids::BlockId;
 use header::{BlockNumber, Header};
 use client::{Client, BlockChainClient};

ethcore/src/engines/validator_set/safe_contract.rs

@@ -23,6 +23,7 @@ use hash::keccak;
 
 use bigint::prelude::U256;
 use bigint::hash::{H160, H256};
+use parking_lot::RwLock;
 use util::*;
 use util::cache::MemoryLruCache;
 use rlp::{UntrustedRlp, RlpStream};
@@ -354,7 +355,7 @@ impl ValidatorSet for ValidatorSafeContract {
 
 			// ensure receipts match header.
 			// TODO: optimize? these were just decoded.
-			let found_root = ::util::triehash::ordered_trie_root(
+			let found_root = ::triehash::ordered_trie_root(
 				receipts.iter().map(::rlp::encode).map(|x| x.to_vec())
 			);
 			if found_root != *old_header.receipts_root() {

ethcore/src/engines/vote_collector.rs

@@ -20,6 +20,7 @@ use std::fmt::Debug;
 use std::collections::{BTreeMap, HashSet, HashMap};
 use std::hash::Hash;
 use bigint::hash::{H256, H520};
+use parking_lot:: RwLock;
 use util::*;
 use rlp::{Encodable, RlpStream};