Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove unnecessary mod #115

Merged
merged 1 commit into from
Nov 26, 2019
Merged

remove unnecessary mod #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 16 additions & 63 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 1 addition & 4 deletions core/sr-eth-primitives/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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",
Expand Down
1 change: 0 additions & 1 deletion core/sr-eth-primitives/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion core/sr-eth-primitives/src/pow.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions core/sr-eth-primitives/src/receipt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down Expand Up @@ -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;
Expand Down
Loading