revert removing blooms (#8066)

* Revert "fix traces, removed bloomchain crate, closes #7228, closes #7167" This reverts commit 1bf6203. * Revert "fixed broken logs (#7934)" This reverts commit f8a2e53. * fixed broken logs * bring back old lock order * remove migration v13 * revert CURRENT_VERSION to 12 in migration.rs
openethereum · Mar 16, 2018 · b450e15 · b450e15
1 parent 206d53b
commit b450e15
Show file tree

Hide file tree

Showing 45 changed files with 2,239 additions and 98 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ethcore/Cargo.toml b/ethcore/Cargo.toml
@@ -8,6 +8,7 @@ authors = ["Parity Technologies <[email protected]>"]
 
 [dependencies]
 ansi_term = "0.9"
+bloomchain = { path = "../util/bloomchain" }
 bn = { git = "https://github.com/paritytech/bn" }
 byteorder = "1.0"
 common-types = { path = "types" }

diff --git a/ethcore/src/blockchain/block_info.rs b/ethcore/src/blockchain/block_info.rs
@@ -32,7 +32,7 @@ pub struct BlockInfo {
 }
 
 /// Describes location of newly inserted block.
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq)]
 pub enum BlockLocation {
 	/// It's part of the canon chain.
 	CanonChain,
@@ -44,7 +44,7 @@ pub enum BlockLocation {
 	BranchBecomingCanonChain(BranchBecomingCanonChainData),
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq)]
 pub struct BranchBecomingCanonChainData {
 	/// Hash of the newest common ancestor with old canon chain.
 	pub ancestor: H256,