Merge branch 'master' into ethminer_crate

Conflicts: Cargo.toml rpc/Cargo.toml sync/Cargo.toml
2016-03-12 09:48:17 +01:00 · 2016-03-12 09:48:17 +01:00 · aebc91d96f
commit aebc91d96f
parent 05ff8a0b94 1031ce641d
28 changed files with 197 additions and 58 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -2,7 +2,7 @@
 name = "parity"
 version = "0.9.99"
 dependencies = [
- "clippy 0.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clippy 0.0.49 (registry+https://github.com/rust-lang/crates.io-index)",
 "ctrlc 1.1.1 (git+https://github.com/tomusdrw/rust-ctrlc.git)",
 "daemonize 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "docopt 0.6.78 (registry+https://github.com/rust-lang/crates.io-index)",
@ -95,7 +95,7 @@ dependencies = [

 [[package]]
 name = "clippy"
-version = "0.0.44"
+version = "0.0.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "regex-syntax 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -208,7 +208,7 @@ dependencies = [
 name = "ethcore"
 version = "0.9.99"
 dependencies = [
- "clippy 0.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clippy 0.0.49 (registry+https://github.com/rust-lang/crates.io-index)",
 "crossbeam 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "env_logger 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "ethash 0.9.99",
@ -234,7 +234,7 @@ dependencies = [
 name = "ethcore-rpc"
 version = "0.9.99"
 dependencies = [
- "clippy 0.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clippy 0.0.49 (registry+https://github.com/rust-lang/crates.io-index)",
 "ethash 0.9.99",
 "ethcore 0.9.99",
 "ethcore-util 0.9.99",
@ -258,7 +258,7 @@ dependencies = [
 "arrayvec 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
 "bigint 0.1.0",
 "chrono 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "clippy 0.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clippy 0.0.49 (registry+https://github.com/rust-lang/crates.io-index)",
 "crossbeam 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "elastic-array 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "env_logger 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -273,7 +273,7 @@ dependencies = [
 "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "mio 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "rocksdb 0.4.1 (git+https://github.com/arkpar/rust-rocksdb.git)",
+ "rocksdb 0.4.2 (git+https://github.com/arkpar/rust-rocksdb.git)",
 "rust-crypto 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustc-serialize 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
@ -290,7 +290,7 @@ dependencies = [
 name = "ethminer"
 version = "0.9.99"
 dependencies = [
- "clippy 0.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clippy 0.0.49 (registry+https://github.com/rust-lang/crates.io-index)",
 "env_logger 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "ethcore 0.9.99",
 "ethcore-util 0.9.99",
@ -304,7 +304,7 @@ dependencies = [
 name = "ethsync"
 version = "0.9.99"
 dependencies = [
- "clippy 0.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clippy 0.0.49 (registry+https://github.com/rust-lang/crates.io-index)",
 "env_logger 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "ethcore 0.9.99",
 "ethcore-util 0.9.99",
@ -481,11 +481,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "librocksdb-sys"
-version = "0.2.1"
-source = "git+https://github.com/arkpar/rust-rocksdb.git#2156621f583bda95c1c07e89e79e4019f75158ee"
+version = "0.2.2"
+source = "git+https://github.com/arkpar/rust-rocksdb.git#a4f89fea20ee3ae92b692df65d56426a5c0b6fd5"
 dependencies = [
 "libc 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -609,11 +608,6 @@ name = "odds"
 version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"

-[[package]]
-name = "pkg-config"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "primal"
 version = "0.2.3"
@ -709,11 +703,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "rocksdb"
-version = "0.4.1"
-source = "git+https://github.com/arkpar/rust-rocksdb.git#2156621f583bda95c1c07e89e79e4019f75158ee"
+version = "0.4.2"
+source = "git+https://github.com/arkpar/rust-rocksdb.git#a4f89fea20ee3ae92b692df65d56426a5c0b6fd5"
 dependencies = [
 "libc 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "librocksdb-sys 0.2.1 (git+https://github.com/arkpar/rust-rocksdb.git)",
+ "librocksdb-sys 0.2.2 (git+https://github.com/arkpar/rust-rocksdb.git)",
 ]

 [[package]]
--- a/Cargo.toml
+++ b/Cargo.toml
@ -26,7 +26,7 @@ ethsync = { path = "sync" }
 ethminer = { path = "miner" }
 ethcore-devtools = { path = "devtools" }
 ethcore-rpc = { path = "rpc", optional = true }
-clippy = { version = "0.0.44", optional = true }
+clippy = { version = "0.0.49", optional = true }

 [features]
 default = ["rpc"]
--- a/ethcore/Cargo.toml
+++ b/ethcore/Cargo.toml
@ -17,7 +17,7 @@ ethcore-util = { path = "../util" }
 evmjit = { path = "../evmjit", optional = true }
 ethash = { path = "../ethash" }
 num_cpus = "0.2"
-clippy = { version = "0.0.44", optional = true }
+clippy = { version = "0.0.49", optional = true }
 crossbeam = "0.1.5"
 lazy_static = "0.1"
 ethcore-devtools = { path = "../devtools" }
--- a/ethcore/src/extras.rs
+++ b/ethcore/src/extras.rs
@ -35,13 +35,13 @@ pub enum ExtrasIndex {
 	BlocksBlooms = 4,
 	/// Block receipts index
 	BlockReceipts = 5,
-} 
+}

 /// trait used to write Extras data to db
 pub trait ExtrasWritable {
 	/// Write extra data to db
 	fn put_extras<K, T>(&self, hash: &K, value: &T) where
-		T: ExtrasIndexable + Encodable, 
+		T: ExtrasIndexable + Encodable,
 		K: ExtrasSliceConvertable;
 }

@ -60,9 +60,9 @@ pub trait ExtrasReadable {

 impl ExtrasWritable for DBTransaction {
 	fn put_extras<K, T>(&self, hash: &K, value: &T) where
-		T: ExtrasIndexable + Encodable, 
+		T: ExtrasIndexable + Encodable,
 		K: ExtrasSliceConvertable {
-		
+
 		self.put(&hash.to_extras_slice(T::extras_index()), &encode(value)).unwrap()
 	}
 }
@ -215,6 +215,12 @@ pub struct BlocksBlooms {
 	pub blooms: [H2048; 16],
 }

+impl Default for BlocksBlooms {
+	fn default() -> Self {
+		BlocksBlooms::new()
+	}
+}
+
 impl BlocksBlooms {
 	pub fn new() -> Self {
 		BlocksBlooms { blooms: unsafe { ::std::mem::zeroed() }}
--- a/ethcore/src/lib.rs
+++ b/ethcore/src/lib.rs
@ -25,6 +25,8 @@
 #![cfg_attr(feature="dev", allow(match_bool))]
 // Keeps consistency (all lines with `.clone()`) and helpful when changing ref to non-ref.
 #![cfg_attr(feature="dev", allow(clone_on_copy))]
+// In most cases it expresses function flow better
+#![cfg_attr(feature="dev", allow(if_not_else))]

 //! Ethcore library
 //!
--- a/ethcore/src/substate.rs
+++ b/ethcore/src/substate.rs
@ -31,6 +31,12 @@ pub struct Substate {
 	pub contracts_created: Vec<Address>
 }

+impl Default for Substate {
+	fn default() -> Self {
+		Substate::new()
+	}
+}
+
 impl Substate {
 	/// Creates new substate.
 	pub fn new() -> Self {
@ -67,8 +73,8 @@ mod tests {
 		let mut sub_state = Substate::new();
 		sub_state.contracts_created.push(address_from_u64(1u64));
 		sub_state.logs.push(LogEntry {
-			address: address_from_u64(1u64), 
-			topics: vec![], 
+			address: address_from_u64(1u64),
+			topics: vec![],
 			data: vec![]
 		});
 		sub_state.sstore_clears_count = x!(5);
@ -77,8 +83,8 @@ mod tests {
 		let mut sub_state_2 = Substate::new();
 		sub_state_2.contracts_created.push(address_from_u64(2u64));
 		sub_state_2.logs.push(LogEntry {
-			address: address_from_u64(1u64), 
-			topics: vec![], 
+			address: address_from_u64(1u64),
+			topics: vec![],
 			data: vec![]
 		});
 		sub_state_2.sstore_clears_count = x!(7);
--- a/miner/Cargo.toml
+++ b/miner/Cargo.toml
@ -17,7 +17,7 @@ log = "0.3"
 env_logger = "0.3"
 rustc-serialize = "0.3"
 rayon = "0.3.1"
-clippy = { version = "0.0.44", optional = true }
+clippy = { version = "0.0.49", optional = true }

 [features]
 default = []
--- a/miner/src/transaction_queue.rs
+++ b/miner/src/transaction_queue.rs
@ -79,6 +79,7 @@
 //!		- When it's removed from `current` - all transactions from this sender (`current` & `future`) are recalculated.
 //!

+use std::default::Default;
 use std::cmp::{Ordering};
 use std::collections::{HashMap, BTreeSet};
 use util::numbers::{Uint, U256};
@ -102,6 +103,7 @@ struct TransactionOrder {
 	hash: H256,
 }

+
 impl TransactionOrder {
 	fn for_transaction(tx: &VerifiedTransaction, base_nonce: U256) -> Self {
 		TransactionOrder {
@ -255,6 +257,12 @@ pub struct TransactionQueue {
 	last_nonces: HashMap<Address, U256>,
 }

+impl Default for TransactionQueue {
+	fn default() -> Self {
+		TransactionQueue::new()
+	}
+}
+
 impl TransactionQueue {
 	/// Creates new instance of this Queue
 	pub fn new() -> Self {
--- a/parity/main.rs
+++ b/parity/main.rs
@ -106,7 +106,8 @@ API and Console Options:
  --jsonrpc-port PORT      Specify the port portion of the JSONRPC API server [default: 8545].
  --jsonrpc-cors URL       Specify CORS header for JSON-RPC API responses [default: null].
  --jsonrpc-apis APIS      Specify the APIs available through the JSONRPC interface. APIS is a comma-delimited
-                           list of API name. Possible names are web3, eth and net. [default: web3,eth,net].
+                           list of API name. Possible name are web3, eth and net. [default: web3,eth,net,personal].
+
  --rpc                    Equivalent to --jsonrpc (geth-compatible).
  --rpcaddr HOST           Equivalent to --jsonrpc-addr HOST (geth-compatible).
  --rpcport PORT           Equivalent to --jsonrpc-port PORT (geth-compatible).
@ -237,6 +238,7 @@ fn setup_rpc_server(
 				server.add_delegate(EthClient::new(&client, &sync, &secret_store, &miner).to_delegate());
 				server.add_delegate(EthFilterClient::new(&client, &miner).to_delegate());
 			}
+			"personal" => server.add_delegate(PersonalClient::new(&secret_store).to_delegate()),
 			_ => {
 				die!("{}: Invalid API name to be enabled.", api);
 			}
--- a/rpc/Cargo.toml
+++ b/rpc/Cargo.toml
@ -19,10 +19,10 @@ ethcore = { path = "../ethcore" }
 ethash = { path = "../ethash" }
 ethsync = { path = "../sync" }
 ethminer = { path = "../miner" }
-clippy = { version = "0.0.44", optional = true }
 rustc-serialize = "0.3"
 transient-hashmap = "0.1"
 serde_macros = { version = "0.7.0", optional = true }
+clippy = { version = "0.0.49", optional = true }

 [build-dependencies]
 serde_codegen = { version = "0.7.0", optional = true }
--- a/rpc/src/v1/impls/personal.rs
+++ b/rpc/src/v1/impls/personal.rs
@ -22,20 +22,20 @@ use util::keys::store::*;
 use util::Address;

 /// Account management (personal) rpc implementation.
-pub struct PersonalClient {
-	accounts: Weak<AccountProvider>,
+pub struct PersonalClient<A> where A: AccountProvider {
+	accounts: Weak<A>,
 }

-impl PersonalClient {
+impl<A> PersonalClient<A> where A: AccountProvider {
 	/// Creates new PersonalClient
-	pub fn new(store: &Arc<AccountProvider>) -> Self {
+	pub fn new(store: &Arc<A>) -> Self {
 		PersonalClient {
 			accounts: Arc::downgrade(store),
 		}
 	}
 }

-impl Personal for PersonalClient {
+impl<A> Personal for PersonalClient<A> where A: AccountProvider + 'static {
 	fn accounts(&self, _: Params) -> Result<Value, Error> {
 		let store = take_weak!(self.accounts);
 		match store.accounts() {
--- a/rpc/src/v1/tests/mod.rs
+++ b/rpc/src/v1/tests/mod.rs
@ -17,4 +17,5 @@
 //!TODO: load custom blockchain state and test

 mod net;
+mod web3;
 mod helpers;
--- a/rpc/src/v1/tests/net.rs
+++ b/rpc/src/v1/tests/net.rs
@ -36,7 +36,7 @@ fn rpc_net_version() {
 	let request = r#"{"jsonrpc": "2.0", "method": "net_version", "params": [], "id": 1}"#;
 	let response = r#"{"jsonrpc":"2.0","result":"65","id":1}"#;

-	assert_eq!(io.handle_request(request), Some(response.to_string()));
+	assert_eq!(io.handle_request(request), Some(response.to_owned()));
 }

 #[test]
@ -49,7 +49,7 @@ fn rpc_net_peer_count() {
 	let request = r#"{"jsonrpc": "2.0", "method": "net_peerCount", "params": [], "id": 1}"#;
 	let response = r#"{"jsonrpc":"2.0","result":"0x78","id":1}"#;

-	assert_eq!(io.handle_request(request), Some(response.to_string()));
+	assert_eq!(io.handle_request(request), Some(response.to_owned()));
 }

 #[test]
@ -62,5 +62,5 @@ fn rpc_net_listening() {
 	let request = r#"{"jsonrpc": "2.0", "method": "net_listening", "params": [], "id": 1}"#;
 	let response = r#"{"jsonrpc":"2.0","result":true,"id":1}"#;

-	assert_eq!(io.handle_request(request), Some(response.to_string()));
+	assert_eq!(io.handle_request(request), Some(response.to_owned()));
 }
--- a/rpc/src/v1/tests/web3.rs
+++ b/rpc/src/v1/tests/web3.rs
@ -0,0 +1,33 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use jsonrpc_core::IoHandler;
+use util::version;
+use v1::{Web3, Web3Client};
+
+#[test]
+fn rpc_web3_version() {
+	let web3 = Web3Client::new().to_delegate();
+	let io = IoHandler::new();
+	io.add_delegate(web3);
+
+	let v = version().to_owned().replace("Parity/", "Parity//");
+
+	let request = r#"{"jsonrpc": "2.0", "method": "web3_clientVersion", "params": [], "id": 1}"#;
+	let response = r#"{"jsonrpc":"2.0","result":"VER","id":1}"#.to_owned().replace("VER", v.as_ref());
+
+	assert_eq!(io.handle_request(request), Some(response));
+}
--- a/sync/Cargo.toml
+++ b/sync/Cargo.toml
@ -16,7 +16,7 @@ env_logger = "0.3"
 time = "0.1.34"
 rand = "0.3.13"
 heapsize = "0.3"
-clippy = { version = "0.0.44", optional = true }
+clippy = { version = "0.0.49", optional = true }

 [features]
 default = []
--- a/sync/src/lib.rs
+++ b/sync/src/lib.rs
@ -17,9 +17,10 @@
 #![warn(missing_docs)]
 #![cfg_attr(feature="dev", feature(plugin))]
 #![cfg_attr(feature="dev", plugin(clippy))]
-
 // Keeps consistency (all lines with `.clone()`) and helpful when changing ref to non-ref.
 #![cfg_attr(feature="dev", allow(clone_on_copy))]
+// In most cases it expresses function flow better
+#![cfg_attr(feature="dev", allow(if_not_else))]

 //! Blockchain sync module
 //! Implements ethereum protocol version 63 as specified here:
@ -163,6 +164,7 @@ impl NetworkProtocolHandler<SyncMessage> for EthSync {
 		self.sync.write().unwrap().maintain_sync(&mut NetSyncIo::new(io, self.chain.deref()));
 	}

+	#[allow(single_match)]
 	fn message(&self, io: &NetworkContext<SyncMessage>, message: &SyncMessage) {
 		match *message {
 			SyncMessage::NewChainBlocks { ref good, ref bad, ref retracted} => {
--- a/util/Cargo.toml
+++ b/util/Cargo.toml
@ -27,7 +27,7 @@ crossbeam = "0.2"
 slab = "0.1"
 sha3 = { path = "sha3" }
 serde = "0.7.0"
-clippy = { version = "0.0.44", optional = true }
+clippy = { version = "0.0.49", optional = true }
 json-tests = { path = "json-tests" }
 rustc_version = "0.1.0"
 igd = "0.4.2"
--- a/util/bigint/Cargo.toml
+++ b/util/bigint/Cargo.toml
@ -15,7 +15,6 @@ rustc-serialize = "0.3"
 arrayvec = "0.3"
 rand = "0.3.12"
 serde = "0.7.0"
-clippy = { version = "0.0.44", optional = true }
 heapsize = "0.3"

 [features]
--- a/util/src/keys/store.rs
+++ b/util/src/keys/store.rs
@ -131,9 +131,15 @@ impl AccountService {
 	}
 }

+impl Default for SecretStore {
+	fn default() -> Self {
+		SecretStore::new()
+	}
+}
+
 impl SecretStore {
 	/// new instance of Secret Store in default home directory
-	pub fn new() -> SecretStore {
+	pub fn new() -> Self {
 		let mut path = ::std::env::home_dir().expect("Failed to get home dir");
 		path.push(".parity");
 		path.push("keys");
@ -142,7 +148,7 @@ impl SecretStore {
 	}

 	/// new instance of Secret Store in specific directory
-	pub fn new_in(path: &Path) -> SecretStore {
+	pub fn new_in(path: &Path) -> Self {
 		SecretStore {
 			directory: KeyDirectory::new(path),
 			unlocks: RwLock::new(HashMap::new()),
@ -214,12 +220,12 @@ impl SecretStore {

 	/// Creates new account
 	pub fn new_account(&mut self, pass: &str) -> Result<Address, ::std::io::Error> {
-		let secret = H256::random();
+		let key_pair = crypto::KeyPair::create().expect("Error creating key-pair. Something wrong with crypto libraries?");
+		let address = Address::from(key_pair.public().sha3());
 		let key_id = H128::random();
-		self.insert(key_id.clone(), secret, pass);
+		self.insert(key_id.clone(), key_pair.secret().clone(), pass);

 		let mut key_file = self.directory.get(&key_id).expect("the key was just inserted");
-		let address = Address::random();
 		key_file.account = Some(address);
 		try!(self.directory.save(key_file));
 		Ok(address)
@ -381,6 +387,7 @@ mod tests {
 	use super::*;
 	use devtools::*;
 	use common::*;
+	use crypto::KeyPair;

 	#[test]
 	fn can_insert() {
@ -555,4 +562,15 @@ mod tests {
 		let accounts = sstore.accounts().unwrap();
 		assert_eq!(30, accounts.len());
 	}
+
+	#[test]
+	fn validate_generated_addresses() {
+		let temp = RandomTempPath::create_dir();
+		let mut sstore = SecretStore::new_test(&temp);
+		let addr = sstore.new_account("test").unwrap();
+		let _ok = sstore.unlock_account(&addr, "test").unwrap();
+		let secret = sstore.account_secret(&addr).unwrap();
+		let kp = KeyPair::from_secret(secret).unwrap();
+		assert_eq!(Address::from(kp.public().sha3()), addr);
+	}
 }
--- a/util/src/kvdb.rs
+++ b/util/src/kvdb.rs
@ -16,6 +16,7 @@

 //! Key-Value store abstraction with RocksDB backend.

+use std::default::Default;
 use rocksdb::{DB, Writable, WriteBatch, IteratorMode, DBVector, DBIterator,
 	IndexType, Options, DBCompactionStyle, BlockBasedOptions, Direction};

@ -24,6 +25,12 @@ pub struct DBTransaction {
 	batch: WriteBatch,
 }

+impl Default for DBTransaction {
+	fn default() -> Self {
+		DBTransaction::new()
+	}
+}
+
 impl DBTransaction {
 	/// Create new transaction.
 	pub fn new() -> DBTransaction {
--- a/util/src/lib.rs
+++ b/util/src/lib.rs
@ -27,6 +27,8 @@
 #![cfg_attr(feature="dev", allow(match_same_arms))]
 // Keeps consistency (all lines with `.clone()`) and helpful when changing ref to non-ref.
 #![cfg_attr(feature="dev", allow(clone_on_copy))]
+// In most cases it expresses function flow better
+#![cfg_attr(feature="dev", allow(if_not_else))]

 //! Ethcore-util library
 //!
--- a/util/src/memorydb.rs
+++ b/util/src/memorydb.rs
@ -24,6 +24,7 @@ use hashdb::*;
 use heapsize::*;
 use std::mem;
 use std::collections::HashMap;
+use std::default::Default;

 #[derive(Debug,Clone)]
 /// Reference-counted memory-based HashDB implementation.
@ -32,7 +33,7 @@ use std::collections::HashMap;
 /// with `kill()`, check for existance with `exists()` and lookup a hash to derive
 /// the data with `lookup()`. Clear with `clear()` and purge the portions of the data
 /// that have no references with `purge()`.
-/// 
+///
 /// # Example
 /// ```rust
 /// extern crate ethcore_util;
@ -74,6 +75,12 @@ pub struct MemoryDB {
 	static_null_rlp: (Bytes, i32),
 }

+impl Default for MemoryDB {
+	fn default() -> Self {
+		MemoryDB::new()
+	}
+}
+
 impl MemoryDB {
 	/// Create a new instance of the memory DB.
 	pub fn new() -> MemoryDB {
@ -133,7 +140,7 @@ impl MemoryDB {

 	/// Denote than an existing value has the given key. Used when a key gets removed without
 	/// a prior insert and thus has a negative reference with no value.
-	/// 
+	///
 	/// May safely be called even if the key's value is known, in which case it will be a no-op.
 	pub fn denote(&self, key: &H256, value: Bytes) -> &(Bytes, i32) {
 		if self.raw(key) == None {
--- a/util/src/network/discovery.rs
+++ b/util/src/network/discovery.rs
@ -19,6 +19,7 @@ use std::net::SocketAddr;
 use std::collections::{HashSet, HashMap, BTreeMap, VecDeque};
 use std::mem;
 use std::cmp;
+use std::default::Default;
 use mio::*;
 use mio::udp::*;
 use sha3::*;
@ -62,8 +63,14 @@ struct NodeBucket {
 	nodes: VecDeque<BucketEntry>, //sorted by last active
 }

+impl Default for NodeBucket {
+	fn default() -> Self {
+		NodeBucket::new()
+	}
+}
+
 impl NodeBucket {
-	fn new() -> NodeBucket {
+	fn new() -> Self {
 		NodeBucket {
 			nodes: VecDeque::new()
 		}
--- a/util/src/network/host.rs
+++ b/util/src/network/host.rs
@ -23,6 +23,7 @@ use std::ops::*;
 use std::cmp::min;
 use std::path::{Path, PathBuf};
 use std::io::{Read, Write};
+use std::default::Default;
 use std::fs;
 use mio::*;
 use mio::tcp::*;
@ -75,9 +76,15 @@ pub struct NetworkConfiguration {
 	pub ideal_peers: u32,
 }

+impl Default for NetworkConfiguration {
+	fn default() -> Self {
+		NetworkConfiguration::new()
+	}
+}
+
 impl NetworkConfiguration {
 	/// Create a new instance of default settings.
-	pub fn new() -> NetworkConfiguration {
+	pub fn new() -> Self {
 		NetworkConfiguration {
 			config_path: None,
 			listen_address: None,
--- a/util/src/panics.rs
+++ b/util/src/panics.rs
@ -19,6 +19,7 @@
 use std::thread;
 use std::ops::DerefMut;
 use std::sync::{Arc, Mutex};
+use std::default::Default;

 /// Thread-safe closure for handling possible panics
 pub trait OnPanicListener: Send + Sync + 'static {
@ -56,14 +57,20 @@ pub struct PanicHandler {
 	listeners: Mutex<Vec<Box<OnPanicListener>>>
 }

+impl Default for PanicHandler {
+	fn default() -> Self {
+		PanicHandler::new()
+	}
+}
+
 impl PanicHandler {
 	/// Creates new `PanicHandler` wrapped in `Arc`
-	pub fn new_in_arc() -> Arc<PanicHandler> {
+	pub fn new_in_arc() -> Arc<Self> {
 		Arc::new(Self::new())
 	}

 	/// Creates new `PanicHandler`
-	pub fn new() -> PanicHandler {
+	pub fn new() -> Self {
 		PanicHandler {
 			listeners: Mutex::new(vec![])
 		}
--- a/util/src/rlp/rlpstream.rs
+++ b/util/src/rlp/rlpstream.rs
@ -15,6 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 use std::ops::Deref;
+use std::default::Default;
 use elastic_array::*;
 use rlp::bytes::{ToBytes, VecLike};
 use rlp::{Stream, Encoder, Encodable};
@ -44,6 +45,12 @@ pub struct RlpStream {
 	finished_list: bool,
 }

+impl Default  for RlpStream {
+	fn default() -> Self {
+		RlpStream::new()
+	}
+}
+
 impl Stream for RlpStream {
 	fn new() -> Self {
 		RlpStream {
@ -190,8 +197,14 @@ struct BasicEncoder {
 	bytes: ElasticArray1024<u8>,
 }

+impl Default for BasicEncoder {
+	fn default() -> Self {
+		BasicEncoder::new()
+	}
+}
+
 impl BasicEncoder {
-	fn new() -> BasicEncoder {
+	fn new() -> Self {
 		BasicEncoder { bytes: ElasticArray1024::new() }
 	}

@ -222,7 +235,7 @@ impl Encoder for BasicEncoder {
 			// just 0
 			0 => self.bytes.push(0x80u8),
 			// byte is its own encoding if < 0x80
-			1 => { 
+			1 => {
 				value.to_bytes(&mut self.bytes);
 				let len = self.bytes.len();
 				let last_byte = self.bytes[len - 1];
--- a/util/src/table.rs
+++ b/util/src/table.rs
@ -16,6 +16,7 @@

 //! A collection associating pair of keys (row and column) with a single value.

+use std::default::Default;
 use std::hash::Hash;
 use std::collections::HashMap;

@ -30,11 +31,21 @@ pub struct Table<Row, Col, Val>
 	map: HashMap<Row, HashMap<Col, Val>>,
 }

+impl<Row, Col, Val> Default for Table<Row, Col, Val>
+	where Row: Eq + Hash + Clone,
+		  Col: Eq + Hash {
+	fn default() -> Self {
+		Table::new()
+	}
+}
+
+// There is default but clippy does not detect it?
+#[allow(new_without_default)]
 impl<Row, Col, Val> Table<Row, Col, Val>
 	where Row: Eq + Hash + Clone,
 		  Col: Eq + Hash {
 	/// Creates new Table
-	pub fn new() -> Table<Row, Col, Val> {
+	pub fn new() -> Self {
 		Table {
 			map: HashMap::new(),
 		}
--- a/util/src/trie/journal.rs
+++ b/util/src/trie/journal.rs
@ -14,6 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.

+use std::default::Default;
 use sha3::*;
 use hash::H256;
 use bytes::*;
@ -39,6 +40,12 @@ pub struct Score {
 #[derive(Debug)]
 pub struct Journal (Vec<Operation>);

+impl Default for Journal {
+	fn default() -> Self {
+		Journal::new()
+	}
+}
+
 impl Journal {
 	/// Create a new, empty, object.
 	pub fn new() -> Journal { Journal(vec![]) }