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

ethcore/Cargo.toml

@@ -8,6 +8,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 ansi_term = "0.10"
+bloomchain = { path = "../util/bloomchain" }
 bn = { git = "https://github.com/paritytech/bn" }
 byteorder = "1.0"
 common-types = { path = "types" }

ethcore/migrations/src/lib.rs

@@ -18,7 +18,7 @@
 
 extern crate migration;
 
-use migration::{ChangeColumns, SimpleMigration};
+use migration::ChangeColumns;
 
 /// The migration from v10 to v11.
 /// Adds a column for node info.
@@ -35,30 +35,3 @@ pub const TO_V12: ChangeColumns = ChangeColumns {
 	post_columns: Some(8),
 	version: 12,
 };
-
-#[derive(Default)]
-pub struct ToV13;
-
-impl SimpleMigration for ToV13 {
-	fn columns(&self) -> Option<u32> {
-		Some(8)
-	}
-
-	fn version(&self) -> u32 {
-		13
-	}
-
-	fn migrated_column_index(&self) -> Option<u32> {
-		// extras!
-		Some(3)
-	}
-
-	fn simple_migrate(&mut self, key: Vec<u8>, value: Vec<u8>) -> Option<(Vec<u8>, Vec<u8>)> {
-		// remove all bloom groups
-		if key[0] == 3 {
-			None
-		} else {
-			Some((key, value))
-		}
-	}
-}

ethcore/src/blockchain/block_info.rs

@@ -31,7 +31,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,
@@ -43,7 +43,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,