Skip to content
This repository was archived by the owner on Nov 6, 2020. It is now read-only.

[ethcore]: cleanup dependencies #11043

Merged
dvdplm merged 1 commit into from
Sep 12, 2019
Merged

[ethcore]: cleanup dependencies #11043

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
4 changes: 0 additions & 4 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.

10 changes: 2 additions & 8 deletions ethcore/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ version = "1.12.0"
authors = ["Parity Technologies <admin@parity.io>"]

[dependencies]
account-db = { path = "account-db", optional = true }
account-state = { path = "account-state" }
ansi_term = "0.11"
basic-authority = { path = "./engines/basic-authority", optional = true} # used by test-helpers feature
Expand Down Expand Up @@ -50,10 +49,8 @@ pod = { path = "pod", optional = true }
trie-db = "0.15.0"
patricia-trie-ethereum = { path = "../util/patricia-trie-ethereum" }
rand = "0.6"
rand_xorshift = "0.1.1"
rayon = "1.1"
rlp = "0.4.0"
rlp_derive = { path = "../util/rlp-derive" }
rustc-hex = "2"
serde = "1.0"
serde_derive = "1.0"
Expand All @@ -73,23 +70,21 @@ vm = { path = "vm" }
[dev-dependencies]
account-db = { path = "account-db" }
blooms-db = { path = "../util/blooms-db" }
ethcore-builtin = { path = "./builtin" }
criterion = "0.3"
engine = { path = "./engine", features = ["test-helpers"] }
env_logger = "0.5"
ethash = { path = "../ethash" }
ethcore-accounts = { path = "../accounts" }
ethcore-builtin = { path = "./builtin" }
ethjson = { path = "../json", features = ["test-helpers"] }
ethkey = { path = "../accounts/ethkey" }
fetch = { path = "../util/fetch" }
kvdb-memorydb = "0.1"
kvdb-rocksdb = "0.1.3"
lazy_static = { version = "1.3" }
lazy_static = "1.3"
machine = { path = "./machine", features = ["test-helpers"] }
macros = { path = "../util/macros" }
null-engine = { path = "./engines/null-engine" }
parity-runtime = { path = "../util/runtime" }
rlp_compress = { path = "../util/rlp-compress" }
serde_json = "1.0"
stats = { path = "../util/stats" }
pod = { path = "pod" }
Expand Down Expand Up @@ -126,7 +121,6 @@ test-heavy = []
# Compile test helpers
# note[dvdplm]: "basic-authority/test-helpers" is needed so that `generate_dummy_client_with_spec` works
test-helpers = [
"account-db",
"blooms-db",
"ethash",
"ethjson",
Expand Down
55 changes: 9 additions & 46 deletions ethcore/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,41 +17,6 @@
#![warn(missing_docs, unused_extern_crates)]

//! Ethcore library
//!
//! ### Rust version:
//! - nightly
Copy link
Copy Markdown
Collaborator Author

@niklasad1 niklasad1 Sep 12, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed these docs because those are outdated

//!
//! ### Supported platforms:
//! - OSX
//! - Linux
//!
//! ### Building:
//!
//! - Ubuntu 14.04 and later:
//!
//! ```bash
//!
//! # install rustup
//! curl https://sh.rustup.rs -sSf | sh
//!
//! # download and build parity
//! git clone https://github.com/paritytech/parity-ethereum
//! cd parity
//! cargo build --release
//! ```
//!
//! - OSX:
//!
//! ```bash
//! # install rocksdb && rustup
//! brew update
//! curl https://sh.rustup.rs -sSf | sh
//!
//! # download and build parity
//! git clone https://github.com/paritytech/parity-ethereum
//! cd parity
//! cargo build --release
//! ```

extern crate account_state;
extern crate ansi_term;
Expand Down Expand Up @@ -95,16 +60,18 @@ extern crate verification;
extern crate vm;

#[cfg(test)]
extern crate rand_xorshift;
extern crate account_db;
#[cfg(test)]
extern crate ethcore_accounts as accounts;
#[cfg(test)]
extern crate stats;

#[cfg(feature = "stratum")]
extern crate ethcore_stratum;
#[cfg(any(test, feature = "stratum"))]

#[cfg(feature = "stratum")]
extern crate ethash;

#[cfg(any(test, feature = "test-helpers"))]
extern crate account_db;
#[cfg(any(test, feature = "test-helpers"))]
extern crate ethkey;
#[cfg(any(test, feature = "test-helpers"))]
Expand All @@ -113,19 +80,17 @@ extern crate ethjson;
extern crate kvdb_memorydb;
#[cfg(any(test, feature = "kvdb-rocksdb"))]
extern crate kvdb_rocksdb;
#[cfg(any(test, feature = "json-tests"))]
#[cfg(feature = "json-tests")]
#[macro_use]
extern crate lazy_static;
#[cfg(any(test, feature = "test-helpers"))]
#[cfg(any(test, feature = "json-tests"))]
#[macro_use]
extern crate macros;
#[cfg(test)]
extern crate null_engine;
#[cfg(any(test, feature = "test-helpers"))]
extern crate pod;
#[cfg(any(test, feature = "blooms-db"))]
extern crate blooms_db;
#[cfg(any(test, feature = "env_logger"))]
#[cfg(feature = "env_logger")]
extern crate env_logger;
#[cfg(test)]
extern crate serde_json;
Expand All @@ -137,8 +102,6 @@ extern crate ethabi_contract;
#[macro_use]
extern crate log;
#[macro_use]
extern crate rlp_derive;
#[macro_use]
extern crate trace_time;

#[cfg_attr(test, macro_use)]
Expand Down
1 change: 1 addition & 0 deletions ethcore/src/tests/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ use client_traits::{
ImportExportBlocks, Tick, ImportBlock
};
use spec;
use stats;
use machine::executive::{Executive, TransactOptions};
use miner::{Miner, PendingOrdering, MinerService};
use account_state::{State, CleanupMode, backend};
Expand Down