Fix test build. (#192)

ethash/src/lib.rs

@@ -34,20 +34,16 @@ extern crate serde_json;
 #[cfg(test)]
 extern crate tempdir;
 
-#[cfg(feature = "bench")]
+// TODO: This should be private; only needed for benches.
 pub mod compute;
-#[cfg(not(feature = "bench"))]
-mod compute;
 
 mod seed_compute;
 mod cache;
 mod keccak;
 mod shared;
 
-#[cfg(feature = "bench")]
+// TODO: This should be private; only needed for benches.
 pub mod progpow;
-#[cfg(not(feature = "bench"))]
-mod progpow;
 
 pub use cache::{NodeCacheBuilder, OptimizeFor};
 pub use compute::{ProofOfWork, quick_get_difficulty, slow_hash_block_number};

ethcore/private-tx/src/key_server_keys.rs

@@ -22,6 +22,7 @@ use ethereum_types::{H256, Address};
 use call_contract::{CallContract, RegistryInfo};
 use ethcore::client::BlockId;
 use ethabi::FunctionOutputDecoder;
+use types::header::Header;
 
 const ACL_CHECKER_CONTRACT_REGISTRY_NAME: &'static str = "secretstore_acl_checker";
 

ethcore/src/block.rs

@@ -271,7 +271,7 @@ impl<'x> OpenBlock<'x> {
 			let took = start.elapsed();
 			let took_ms = took.as_secs() * 1000 + took.subsec_nanos() as u64 / 1000000;
 			if took > time::Duration::from_millis(slow_tx) {
-				warn!("Heavy ({} ms) transaction in block {:?}: {:?}", took_ms, self.block.header().number(), hash);
+				warn!("Heavy ({} ms) transaction in block {:?}: {:?}", took_ms, self.block.header.number(), hash);
 			}
 			debug!(target: "tx", "Transaction {:?} took: {} ms", hash, took_ms);
 		}

ethcore/src/engines/authority_round/mod.rs

@@ -1060,7 +1060,6 @@ impl Engine<EthereumMachine> for AuthorityRound {
 		header_expected_seal_fields(header, self.empty_steps_transition)
 	}
 
-	#[cfg(test)]
 	fn step(&self) {
 		self.step.inner.increment();
 		self.step.can_propose.store(true, AtomicOrdering::SeqCst);

ipfs/src/lib.rs

@@ -22,7 +22,7 @@ extern crate rlp;
 extern crate ethcore;
 extern crate parity_bytes as bytes;
 extern crate ethereum_types;
-extern crate jsonrpc_core as core;
+extern crate jsonrpc_core;
 extern crate jsonrpc_http_server as http;
 
 pub mod error;
@@ -32,8 +32,8 @@ use std::thread;
 use std::sync::{mpsc, Arc};
 use std::net::{SocketAddr, IpAddr};
 
-use core::futures::future::{self, FutureResult};
-use core::futures::{self, Future};
+use jsonrpc_core::futures::future::{self, FutureResult};
+use jsonrpc_core::futures::{self, Future};
 use ethcore::client::BlockChainClient;
 use http::hyper::{self, server, Method, StatusCode, Body,
 	header::{self, HeaderValue},

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

@@ -130,9 +130,8 @@ impl MinerService for TestMinerService {
 		}
 	}
 
-	fn clear_author(&self) -> Result<(), AccountError> {
+	fn clear_author(&self) {
 		*self.authoring_params.write() = Default::default();
-		Ok(())
 	}
 
 	fn set_extra_data(&self, extra_data: Bytes) {