Skip to content

Commit

Permalink
ethereum-types: make ethbloom optional (#625)
Browse files Browse the repository at this point in the history
* ethereum-types: make ethbloom optional

* Apply suggestions from code review

Co-authored-by: Andronik <write@reusable.software>
  • Loading branch information
vorot93 and ordian authored Sep 2, 2022
1 parent 9642a0e commit 7a9cc3b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
8 changes: 4 additions & 4 deletions ethereum-types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ license = "MIT OR Apache-2.0"
homepage = "https://github.com/paritytech/parity-common"
description = "Ethereum types"
edition = "2021"
rust-version = "1.56.1"
rust-version = "1.60.0"

[dependencies]
ethbloom = { path = "../ethbloom", version = "0.12", default-features = false }
ethbloom = { path = "../ethbloom", version = "0.12", optional = true, default-features = false }
fixed-hash = { path = "../fixed-hash", version = "0.7", default-features = false, features = ["byteorder", "rustc-hex"] }
uint-crate = { path = "../uint", package = "uint", version = "0.9", default-features = false }
primitive-types = { path = "../primitive-types", version = "0.11", features = ["byteorder", "rustc-hex"], default-features = false }
Expand All @@ -22,8 +22,8 @@ scale-info = { version = ">=1.0, <3", features = ["derive"], default-features =
serde_json = "1.0.41"

[features]
default = ["std", "rlp", "serialize"]
std = ["uint-crate/std", "fixed-hash/std", "ethbloom/std", "primitive-types/std"]
default = ["std", "ethbloom", "rlp", "serialize"]
std = ["uint-crate/std", "fixed-hash/std", "ethbloom?/std", "primitive-types/std"]
serialize = ["impl-serde", "primitive-types/serde_no_std", "ethbloom/serialize"]
arbitrary = ["ethbloom/arbitrary", "fixed-hash/arbitrary", "uint-crate/arbitrary"]
rlp = ["impl-rlp", "ethbloom/rlp", "primitive-types/rlp"]
Expand Down
1 change: 1 addition & 0 deletions ethereum-types/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
mod hash;
mod uint;

#[cfg(feature = "ethbloom")]
pub use ethbloom::{Bloom, BloomRef, Input as BloomInput};
pub use hash::{BigEndianHash, H128, H160, H256, H264, H32, H512, H520, H64};
pub use uint::{FromDecStrErr, FromStrRadixErr, FromStrRadixErrKind, U128, U256, U512, U64};
Expand Down

0 comments on commit 7a9cc3b

Please sign in to comment.