Bump crossbeam. (#10048)

openethereum · Dec 13, 2018 · ed1db0c · ed1db0c
1 parent 02a44a1
commit ed1db0c
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ethcore/Cargo.toml b/ethcore/Cargo.toml
@@ -12,7 +12,7 @@ blooms-db = { path = "../util/blooms-db" }
 bn = { git = "https://github.com/paritytech/bn", default-features = false }
 byteorder = "1.0"
 common-types = { path = "types" }
-crossbeam = "0.3"
+crossbeam = "0.4"
 ethash = { path = "../ethash" }
 ethcore-bloom-journal = { path = "../util/bloom" }
 parity-bytes = "0.1"

diff --git a/ethcore/src/executive.rs b/ethcore/src/executive.rs
@@ -380,7 +380,7 @@ impl<'a, B: 'a + StateBackend> Executive<'a, B> {
 				let mut ext = self.as_externalities(origin_info, unconfirmed_substate, output_policy, tracer, vm_tracer, static_call);
 				vm.exec(&mut ext).finalize(ext)
 			}).expect("Sub-thread creation cannot fail; the host might run out of resources; qed")
-		}).join()
+		}).join().expect("Sub-thread never panics; qed")
 	}
 
 	/// Calls contract function with given contract params.

diff --git a/ethcore/src/snapshot/mod.rs b/ethcore/src/snapshot/mod.rs
@@ -192,11 +192,11 @@ pub fn take_snapshot<W: SnapshotWriter + Send>(
 			state_guards.push(state_guard);
 		}
 
-		let block_hashes = block_guard.join()?;
+		let block_hashes = block_guard.join().expect("Sub-thread never panics; qed")?;
 		let mut state_hashes = Vec::new();
 
 		for guard in state_guards {
-			let part_state_hashes = guard.join()?;
+			let part_state_hashes = guard.join().expect("Sub-thread never panics; qed")?;
 			state_hashes.extend(part_state_hashes);
 		}