trigger ci

* 'master' of https://github.com/paritytech/parity: ethcore: fix ancient block error msg handling (openethereum#8832)
ordian · Jun 7, 2018 · 7db1a88 · 7db1a88
2 parents 3dbe8b9 + c8877d4
commit 7db1a88
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs
@@ -2073,15 +2073,16 @@ impl IoClient for Client {
 				let first = queued.write().1.pop_front();
 				if let Some((header, block_bytes, receipts_bytes)) = first {
 					let hash = header.hash();
-					client.importer.import_old_block(
+					let result = client.importer.import_old_block(
 						&header,
 						&block_bytes,
 						&receipts_bytes,
 						&**client.db.read(),
-						&*client.chain.read()
-					).ok().map_or((), |e| {
+						&*client.chain.read(),
+					);
+					if let Err(e) = result {
 						error!(target: "client", "Error importing ancient block: {}", e);
-					});
+					}
 					// remove from pending
 					queued.write().0.remove(&hash);
 				} else {