Merge branch 'js' into js-gitlab-testing

.gitlab-ci.yml

@@ -51,6 +51,7 @@ linux-beta:
     paths:
     - x86_64-unknown-linux-gnu/beta/parity
     name: "beta-x86_64-unknown-linux-gnu_parity"
+  allow_failure: true
 linux-nightly:
   stage: build
   image: ethcore/rust:nightly

Cargo.toml

@@ -25,6 +25,7 @@ ansi_term = "0.7"
 lazy_static = "0.2"
 regex = "0.1"
 isatty = "0.1"
+toml = "0.2"
 ctrlc = { git = "https://github.com/ethcore/rust-ctrlc.git" }
 fdlimit = { path = "util/fdlimit" }
 ethcore = { path = "ethcore" }
@@ -41,7 +42,7 @@ ethcore-logger = { path = "logger" }
 rlp = { path = "util/rlp" }
 json-ipc-server = { git = "https://github.com/ethcore/json-ipc-server.git" }
 ethcore-dapps = { path = "dapps", optional = true }
-clippy = { version = "0.0.85", optional = true}
+clippy = { version = "0.0.90", optional = true}
 ethcore-stratum = { path = "stratum" }
 
 [target.'cfg(windows)'.dependencies]

dapps/Cargo.toml

@@ -33,7 +33,7 @@ parity-dapps-status = { git = "https://github.com/ethcore/parity-ui.git", versio
 parity-dapps-home = { git = "https://github.com/ethcore/parity-ui.git", version = "1.4" }
 parity-dapps-wallet = { git = "https://github.com/ethcore/parity-ui.git", version = "1.4", optional = true }
 mime_guess = { version = "1.6.1" }
-clippy = { version = "0.0.85", optional = true}
+clippy = { version = "0.0.90", optional = true}
 
 [build-dependencies]
 serde_codegen = { version = "0.8", optional = true }

db/Cargo.toml

@@ -11,7 +11,7 @@ build = "build.rs"
 ethcore-ipc-codegen = { path = "../ipc/codegen" }
 
 [dependencies]
-clippy = { version = "0.0.85", optional = true}
+clippy = { version = "0.0.90", optional = true}
 ethcore-devtools = { path = "../devtools" }
 ethcore-ipc = { path = "../ipc/rpc" }
 rocksdb = { git = "https://github.com/ethcore/rust-rocksdb" }

ethash/src/compute.rs

@@ -91,7 +91,7 @@ pub struct Light {
 	seed_compute: Mutex<SeedHashCompute>,
 }
 
-/// Light cache structur
+/// Light cache structure
 impl Light {
 	/// Create a new light cache for a given block number
 	pub fn new(block_number: u64) -> Light {
@@ -134,16 +134,27 @@ impl Light {
 		})
 	}
 
-	pub fn to_file(&self) -> io::Result<()> {
+	pub fn to_file(&self) -> io::Result<PathBuf> {
 		let seed_compute = self.seed_compute.lock();
 		let path = Light::file_path(seed_compute.get_seedhash(self.block_number));
+
+		if self.block_number >= ETHASH_EPOCH_LENGTH * 2 {
+			let deprecated = Light::file_path(
+				seed_compute.get_seedhash(self.block_number - ETHASH_EPOCH_LENGTH * 2));
+
+			if deprecated.exists() {
+				debug!(target: "ethash", "removing: {:?}", &deprecated);
+				try!(fs::remove_file(deprecated));
+			}
+		}
+
 		try!(fs::create_dir_all(path.parent().unwrap()));
-		let mut file = try!(File::create(path));
+		let mut file = try!(File::create(&path));
 
 		let cache_size = self.cache.len() * NODE_BYTES;
 		let buf = unsafe { slice::from_raw_parts(self.cache.as_ptr() as *const u8, cache_size) };
 		try!(file.write(buf));
-		Ok(())
+		Ok(path)
 	}
 }
 
@@ -455,3 +466,18 @@ fn test_seed_compute_after_newer() {
 	let hash = [241, 175, 44, 134, 39, 121, 245, 239, 228, 236, 43, 160, 195, 152, 46, 7, 199, 5, 253, 147, 241, 206, 98, 43, 3, 104, 17, 40, 192, 79, 106, 162];
 	assert_eq!(seed_compute.get_seedhash(486382), hash);
 }
+
+#[test]
+fn test_drop_old_data() {
+	let first = Light::new(0).to_file().unwrap();
+
+	let second = Light::new(ETHASH_EPOCH_LENGTH).to_file().unwrap();
+	assert!(fs::metadata(&first).is_ok());
+
+	let _ = Light::new(ETHASH_EPOCH_LENGTH * 2).to_file();
+	assert!(fs::metadata(&first).is_err());
+	assert!(fs::metadata(&second).is_ok());
+
+	let _ = Light::new(ETHASH_EPOCH_LENGTH * 3).to_file();
+	assert!(fs::metadata(&second).is_err());
+}

ethcore/Cargo.toml

@@ -20,12 +20,12 @@ num_cpus = "0.2"
 crossbeam = "0.2.9"
 lazy_static = "0.2"
 bloomchain = "0.1"
-rayon = "0.3.1"
+rayon = "0.4.2"
 semver = "0.2"
 bit-set = "0.4"
 time = "0.1"
 evmjit = { path = "../evmjit", optional = true }
-clippy = { version = "0.0.85", optional = true}
+clippy = { version = "0.0.90", optional = true}
 ethash = { path = "../ethash" }
 ethcore-util = { path = "../util" }
 ethcore-io = { path = "../util/io" }

ethcore/src/block.rs

@@ -417,7 +417,7 @@ impl ClosedBlock {
 	}
 
 	/// Given an engine reference, reopen the `ClosedBlock` into an `OpenBlock`.
-	pub fn reopen<'a>(self, engine: &'a Engine) -> OpenBlock<'a> {
+	pub fn reopen(self, engine: &Engine) -> OpenBlock {
 		// revert rewards (i.e. set state back at last transaction's state).
 		let mut block = self.block;
 		block.state = self.unclosed_state;