Skip to content

Commit

Permalink
chore(deps): clean up new crate deps (#6174)
Browse files Browse the repository at this point in the history
  • Loading branch information
mattsse authored and shekhirin committed Jan 25, 2024
1 parent 20928b0 commit 07d00b5
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 127 deletions.
70 changes: 3 additions & 67 deletions Cargo.lock

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

15 changes: 4 additions & 11 deletions bin/reth/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ reth-network-api.workspace = true
reth-downloaders.workspace = true
reth-tracing.workspace = true
reth-tasks.workspace = true
reth-net-nat.workspace = true
reth-optimism-payload-builder = { path = "../../crates/payload/optimism", optional = true }
reth-ethereum-payload-builder.workspace = true
reth-payload-builder.workspace = true
Expand Down Expand Up @@ -71,8 +70,6 @@ tracing.workspace = true
fdlimit = "0.3.0"
serde.workspace = true
serde_json.workspace = true
shellexpand = "3.0.0"
dirs-next = "2.0.0"
confy.workspace = true
toml = { workspace = true, features = ["display"] }

Expand Down Expand Up @@ -108,18 +105,10 @@ eyre.workspace = true
clap = { workspace = true, features = ["derive"] }
tempfile.workspace = true
backon = "0.4"
thiserror.workspace = true
pretty_assertions = "1.3.0"
humantime = "2.1.0"
const-str = "0.5.6"
boyer-moore-magiclen = "0.2.16"
itertools.workspace = true
rayon.workspace = true
futures-util.workspace = true

[dev-dependencies]
jsonrpsee.workspace = true
assert_matches = "1.5.0"

[target.'cfg(not(windows))'.dependencies]
jemallocator = { version = "0.5.0", optional = true }
Expand All @@ -128,6 +117,10 @@ jemalloc-ctl = { version = "0.5.0", optional = true }
[target.'cfg(target_os = "linux")'.dependencies]
procfs = { version = "0.16.0" }

[dev-dependencies]
jsonrpsee.workspace = true
assert_matches = "1.5.0"

[features]
default = ["jemalloc"]

Expand Down
1 change: 1 addition & 0 deletions bin/reth/src/builder/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -986,6 +986,7 @@ impl Default for NodeConfig {
/// [NodeHandle].
///
/// This also contains a path to a data dir that cannot be changed.
#[derive(Debug)]
pub struct NodeBuilderWithDatabase<DB> {
/// The node config
pub config: NodeConfig,
Expand Down
2 changes: 0 additions & 2 deletions bin/reth/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
html_favicon_url = "https://avatars0.githubusercontent.com/u/97369466?s=256",
issue_tracker_base_url = "https://github.com/paradigmxyz/reth/issues/"
)]
#![allow(missing_debug_implementations)]
#![allow(dead_code)]
#![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]

pub mod builder;
Expand Down
1 change: 1 addition & 0 deletions bin/reth/src/runner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ impl AsyncCliRunner {
}

/// Additional context provided by the [CliRunner] when executing commands
#[derive(Debug)]
pub struct CliContext {
/// Used to execute/spawn tasks
pub task_executor: TaskExecutor,
Expand Down
48 changes: 4 additions & 44 deletions crates/node-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,80 +35,42 @@ reth-node-api.workspace = true
reth-tasks.workspace = true
reth-payload-builder.workspace = true
reth-basic-payload-builder.workspace = true
reth-optimism-payload-builder = { path = "../../crates/payload/optimism", optional = true }
reth-ethereum-payload-builder.workspace = true
reth-consensus-common.workspace = true





# misc
boyer-moore-magiclen = "0.2.16"
eyre.workspace = true
clap = { workspace = true, features = ["derive"] }
humantime = "2.1.0"
thiserror.workspace = true
tempfile.workspace = true
const-str = "0.5.6"
rayon.workspace = true
itertools.workspace = true
backon = "0.4"
pretty_assertions = "1.3.0"


# http/rpc
hyper = "0.14.25"


# test vectors generation
proptest.workspace = true
rand.workspace = true


# io
dirs-next = "2.0.0"
shellexpand = "3.0.0"
serde.workspace = true
serde_json.workspace = true
fdlimit = "0.3.0"
confy.workspace = true
toml = { workspace = true, features = ["display"] }

# tracing
tracing.workspace = true

# tui
comfy-table = "7.0"
crossterm = "0.27.0"
tui = "0.19.0"
human_bytes = "0.4.1"


# crypto
alloy-rlp.workspace = true
alloy-chains.workspace = true
secp256k1 = { workspace = true, features = ["global-context", "rand-std", "recovery"] }
revm-inspectors.workspace = true


# async
tokio = { workspace = true, features = ["sync", "macros", "time", "rt-multi-thread"] }
futures.workspace = true
pin-project.workspace = true

# metrics
metrics-exporter-prometheus = "0.12.1"
metrics-util = "0.15.0"
metrics-process = "=1.0.14"
reth-metrics.workspace = true
metrics.workspace = true
once_cell.workspace = true
[dev-dependencies]
# test vectors generation
proptest.workspace = true


[features]
optimism = [
"reth-primitives/optimism",
"reth-optimism-payload-builder/optimism",
"reth-interfaces/optimism",
"reth-rpc/optimism",
"reth-rpc-engine-api/optimism",
Expand All @@ -117,8 +79,6 @@ optimism = [
"reth-network/optimism",
"reth-network-api/optimism",
"reth-payload-builder/optimism",
"reth-optimism-payload-builder/optimism",
"reth-ethereum-payload-builder/optimism",
"reth-node-api/optimism",
]

Expand Down
2 changes: 2 additions & 0 deletions crates/node-core/src/cli/mod.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
//! Types for the CLI.
pub mod components;
pub mod config;
pub mod ext;
10 changes: 7 additions & 3 deletions crates/node-core/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
//! The core of the Ethereum node. Collection of utilities and libraries that are used by the node.
#![allow(missing_docs)]
#![allow(missing_debug_implementations)]
#![allow(dead_code)]
#![doc(
html_logo_url = "https://raw.githubusercontent.com/paradigmxyz/reth/main/assets/reth-docs.png",
html_favicon_url = "https://avatars0.githubusercontent.com/u/97369466?s=256",
issue_tracker_base_url = "https://github.com/paradigmxyz/reth/issues/"
)]
#![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
#![warn(unused_crate_dependencies)]

pub mod args;
pub mod cli;
Expand Down
1 change: 1 addition & 0 deletions crates/node-core/src/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ where
}

/// Wrapper over DB that implements many useful DB queries.
#[derive(Debug)]
pub struct DbTool<'a, DB: Database> {
/// The database that the db tool will use.
pub db: &'a DB,
Expand Down

0 comments on commit 07d00b5

Please sign in to comment.