Merge pull request #115 from hammeWang/develop

remove unnecessary mod
darwinia-network · Nov 26, 2019 · c5adb0c · c5adb0c
2 parents 63f5f34 + 7334a8f
commit c5adb0c
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 329 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/core/sr-eth-primitives/Cargo.toml b/core/sr-eth-primitives/Cargo.toml
@@ -20,11 +20,10 @@ rlp_derive = { git = "https://github.com/paritytech/parity-ethereum.git", defaul
 primitive-types = { version = "0.6.0", default-feature = false, features = ["codec", "rlp"] }
 ethereum-types = { version = "0.8.0", default-feature = false, features = ["serialize"] }
 keccak-hash = "0.4.0"
-ethbloom = { version = "0.8", default-features = false, features = ["serialize"] }
 impl-codec = { version = "0.4", default-features = false, optional = true }
 fixed-hash = { version = "0.4", default-features = false}
 impl-rlp = { version = "0.2", default-features = false, optional = true }
-hbloom = { package = 'ethbloom', git ="https://github.com/paritytech/parity-common.git", default-features = false}
+hbloom = { package = 'ethbloom', git ="https://github.com/hammeWang/ethbloom.git", default-features = false, features = ["serialize"]}
 crunchy = { version = "0.2.2", default-features = false, features = ["limit_256"] }
 
 [dev-dependencies]
@@ -51,8 +50,6 @@ std = [
     "primitive-types/rustc-hex",
     "primitive-types/libc",
     "parity-crypto/publickey",
-    "ethbloom/std",
-    "ethbloom/serialize",
     "ethereum-types/std",
     "impl-codec/std",
     "fixed-hash/std",

diff --git a/core/sr-eth-primitives/src/lib.rs b/core/sr-eth-primitives/src/lib.rs
@@ -17,7 +17,6 @@ pub mod keccak;
 pub mod pow;
 pub mod receipt;
 pub mod transaction;
-pub mod types;
 
 pub use codec::{Decode, Encode};
 pub use ethereum_types::BigEndianHash;

diff --git a/core/sr-eth-primitives/src/pow.rs b/core/sr-eth-primitives/src/pow.rs
@@ -4,12 +4,12 @@ use crate::keccak::{keccak_256, keccak_512, H256 as BH256};
 use core::cmp;
 use core::convert::{From, Into, TryFrom};
 use error::{BlockError, Mismatch, OutOfBounds};
+use hbloom::Bloom;
 use keccak_hash::KECCAK_EMPTY_LIST_RLP;
 use rstd::collections::btree_map::BTreeMap;
 use rstd::mem;
 use rstd::result;
 use sr_primitives::traits::Saturating;
-use types::Bloom;
 
 pub const MINIMUM_DIFFICULTY: u128 = 131072;
 // TODO: please keep an eye on this.

diff --git a/core/sr-eth-primitives/src/receipt.rs b/core/sr-eth-primitives/src/receipt.rs
@@ -1,10 +1,10 @@
 use super::*;
 //pub use ethereum_types::{Address, Bloom, BloomInput, H160, H256, U128, U256};
+use hbloom::{Bloom, Input as BloomInput};
 use rlp::{self, Decodable, DecoderError, Encodable, Rlp, RlpStream};
 use rstd::ops::Deref;
 use rstd::prelude::*;
 use substrate_primitives::RuntimeDebug;
-use types::{Bloom, Input as BloomInput};
 
 #[derive(PartialEq, Eq, Clone, RuntimeDebug, Encode, Decode)]
 pub enum TransactionOutcome {
@@ -117,7 +117,7 @@ impl Decodable for Receipt {
 #[cfg(test)]
 mod tests {
 	use super::{Address, LogEntry, Receipt, TransactionOutcome, H256, U128, U256};
-	use ethbloom::Bloom;
+	use hbloom::Bloom;
 	use hex_literal::*;
 	use rustc_hex::FromHex;
 	use std::str::FromStr;