Skip to content

Commit

Permalink
chore: simplify workspace = true usage (paradigmxyz#3930)
Browse files Browse the repository at this point in the history
  • Loading branch information
mattsse authored Jul 26, 2023
1 parent caa2683 commit 8cdb097
Show file tree
Hide file tree
Showing 39 changed files with 274 additions and 274 deletions.
24 changes: 12 additions & 12 deletions bin/reth/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,36 +18,36 @@ reth-revm = { path = "../../crates/revm" }
reth-revm-inspectors = { path = "../../crates/revm/revm-inspectors" }
reth-stages = { path = "../../crates/stages" }
reth-interfaces = { workspace = true, features = ["test-utils", "clap"] }
reth-transaction-pool = { workspace = true }
reth-transaction-pool.workspace = true
reth-beacon-consensus = { path = "../../crates/consensus/beacon" }
reth-auto-seal-consensus = { path = "../../crates/consensus/auto-seal" }
reth-blockchain-tree = { path = "../../crates/blockchain-tree" }
reth-rpc-engine-api = { path = "../../crates/rpc/rpc-engine-api" }
reth-rpc-builder = { path = "../../crates/rpc/rpc-builder" }
reth-rpc = { path = "../../crates/rpc/rpc" }
reth-rlp = { workspace = true }
reth-rlp.workspace = true
reth-network = { path = "../../crates/net/network", features = ["serde"] }
reth-network-api = { workspace = true }
reth-network-api.workspace = true
reth-downloaders = { path = "../../crates/net/downloaders", features = ["test-utils"] }
reth-tracing = { path = "../../crates/tracing" }
reth-tasks = { workspace = true }
reth-tasks.workspace = true
reth-net-nat = { path = "../../crates/net/nat" }
reth-payload-builder = { workspace = true }
reth-payload-builder.workspace = true
reth-basic-payload-builder = { path = "../../crates/payload/basic" }
reth-discv4 = { path = "../../crates/net/discv4" }
reth-metrics = { workspace = true }
reth-metrics.workspace = true
reth-prune = { path = "../../crates/prune" }

# crypto
secp256k1 = { workspace = true, features = ["global-context", "rand-std", "recovery"] }

# tracing
tracing = { workspace = true }
tracing.workspace = true

# io
fdlimit = "0.2.1"
serde = { workspace = true }
serde_json = { workspace = true }
serde.workspace = true
serde_json.workspace = true
shellexpand = "3.0.0"
dirs-next = "2.0.0"
confy = "0.5"
Expand All @@ -69,8 +69,8 @@ human_bytes = "0.4.1"

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

# http/rpc
hyper = "0.14.25"
Expand All @@ -81,7 +81,7 @@ clap = { version = "4", features = ["derive"] }
tempfile = { version = "3.3.0" }
backon = "0.4"
hex = "0.4"
thiserror = { workspace = true }
thiserror.workspace = true
pretty_assertions = "1.3.0"
humantime = "2.1.0"
const-str = "0.5.6"
Expand Down
8 changes: 4 additions & 4 deletions crates/blockchain-tree/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ normal = [

[dependencies]
# reth
reth-primitives = { workspace = true }
reth-interfaces = { workspace = true }
reth-primitives.workspace = true
reth-interfaces.workspace = true
reth-db = { path = "../storage/db" }
reth-metrics = { workspace = true, features = ["common"] }
reth-provider = { workspace = true }
reth-provider.workspace = true
reth-stages = { path = "../stages" }

# common
parking_lot = { version = "0.12" }
lru = "0.10"
tracing = { workspace = true }
tracing.workspace = true

# mics
aquamarine = "0.3.0"
Expand Down
4 changes: 2 additions & 2 deletions crates/config/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ reth-stages = { path = "../../crates/stages" }
reth-primitives = { path = "../primitives" }

# io
serde = { workspace = true }
serde_json = { workspace = true }
serde.workspace = true
serde_json.workspace = true

# crypto
secp256k1 = { workspace = true, features = ["global-context", "rand-std", "recovery"] }
Expand Down
14 changes: 7 additions & 7 deletions crates/consensus/auto-seal/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@ description = "A consensus impl for local testing purposes"
[dependencies]
# reth
reth-beacon-consensus = { path = "../beacon" }
reth-primitives = { workspace = true }
reth-interfaces = { workspace = true }
reth-provider = { workspace = true }
reth-primitives.workspace = true
reth-interfaces.workspace = true
reth-provider.workspace = true
reth-stages = { path = "../../stages" }
reth-revm = { path = "../../revm" }
reth-transaction-pool = { workspace = true }
reth-transaction-pool.workspace = true

# async
futures-util = { workspace = true }
futures-util.workspace = true
tokio = { workspace = true, features = ["sync", "time"] }
tokio-stream = { workspace = true }
tracing = { workspace = true }
tokio-stream.workspace = true
tracing.workspace = true

[dev-dependencies]
reth-interfaces = { workspace = true, features = ["test-utils"] }
22 changes: 11 additions & 11 deletions crates/consensus/beacon/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,25 @@ repository.workspace = true
[dependencies]
# reth
reth-consensus-common = { path = "../common" }
reth-primitives = { workspace = true }
reth-interfaces = { workspace = true }
reth-primitives.workspace = true
reth-interfaces.workspace = true
reth-stages = { path = "../../stages" }
reth-db = { path = "../../storage/db" }
reth-provider = { workspace = true }
reth-rpc-types = { workspace = true }
reth-tasks = { workspace = true }
reth-payload-builder = { workspace = true }
reth-metrics = { workspace = true }
reth-provider.workspace = true
reth-rpc-types.workspace = true
reth-tasks.workspace = true
reth-payload-builder.workspace = true
reth-metrics.workspace = true
reth-prune = { path = "../../prune" }

# async
tokio = { workspace = true, features = ["sync"] }
tokio-stream = { workspace = true }
futures = { workspace = true }
tokio-stream.workspace = true
futures.workspace = true

# misc
tracing = { workspace = true }
thiserror = { workspace = true }
tracing.workspace = true
thiserror.workspace = true
schnellru = "0.2"

[dev-dependencies]
Expand Down
6 changes: 3 additions & 3 deletions crates/consensus/common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ repository.workspace = true

[dependencies]
# reth
reth-primitives = { workspace = true }
reth-interfaces = { workspace = true }
reth-provider = { workspace = true }
reth-primitives.workspace = true
reth-interfaces.workspace = true
reth-provider.workspace = true

[dev-dependencies]
reth-interfaces = { workspace = true, features = ["test-utils"] }
Expand Down
20 changes: 10 additions & 10 deletions crates/interfaces/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,27 @@ repository.workspace = true

[dependencies]
reth-codecs = { path = "../storage/codecs" }
reth-primitives = { workspace = true }
reth-rpc-types = { workspace = true }
reth-network-api = { workspace = true }
reth-primitives.workspace = true
reth-rpc-types.workspace = true
reth-network-api.workspace = true
# TODO(onbjerg): We only need this for [BlockBody]
reth-eth-wire = { path = "../net/eth-wire" }

# eth
revm-primitives = { workspace = true }
revm-primitives.workspace = true
parity-scale-codec = { version = "3.2.1", features = ["bytes"] }

# async
async-trait = { workspace = true }
futures = { workspace = true }
async-trait.workspace = true
futures.workspace = true
tokio = { workspace = true, features = ["sync"] }
tokio-stream = { workspace = true }
tokio-stream.workspace = true

# misc
auto_impl = "1.0"
thiserror = { workspace = true }
tracing = { workspace = true }
rand = { workspace = true }
thiserror.workspace = true
tracing.workspace = true
rand.workspace = true
arbitrary = { version = "1.1.7", features = ["derive"], optional = true }
secp256k1 = { workspace = true, default-features = false, features = [
"alloc",
Expand Down
4 changes: 2 additions & 2 deletions crates/net/common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ Types shared across network code

[dependencies]
# reth
reth-primitives = { workspace = true }
reth-primitives.workspace = true

# async
pin-project = { workspace = true }
pin-project.workspace = true
tokio = { workspace = true, features = ["full"] }
12 changes: 6 additions & 6 deletions crates/net/discv4/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ Ethereum network discovery

[dependencies]
# reth
reth-primitives = { workspace = true }
reth-rlp = { workspace = true }
reth-primitives.workspace = true
reth-rlp.workspace = true
reth-rlp-derive = { path = "../../rlp/rlp-derive" }
reth-net-common = { path = "../common" }
reth-net-nat = { path = "../nat" }
Expand All @@ -25,18 +25,18 @@ enr = { version = "0.8.1", default-features = false, features = ["rust-secp256k1

# async/futures
tokio = { workspace = true, features = ["io-util", "net", "time"] }
tokio-stream = { workspace = true }
tokio-stream.workspace = true

# misc
tracing = { workspace = true }
thiserror = { workspace = true }
tracing.workspace = true
thiserror.workspace = true
hex = "0.4"
rand = { workspace = true, optional = true }
generic-array = "0.14"
serde = { workspace = true, optional = true }

[dev-dependencies]
rand = { workspace = true }
rand.workspace = true
tokio = { workspace = true, features = ["macros"] }
reth-tracing = { path = "../../tracing" }

Expand Down
12 changes: 6 additions & 6 deletions crates/net/dns/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,28 +10,28 @@ description = "Support for EIP-1459 Node Discovery via DNS"

[dependencies]
# reth
reth-primitives = { workspace = true }
reth-primitives.workspace = true
reth-net-common = { path = "../common" }
reth-rlp = { workspace = true }
reth-rlp.workspace = true

# ethereum
secp256k1 = { workspace = true, features = ["global-context", "rand-std", "recovery", "serde"] }
enr = { version = "0.8.1", default-features = false, features = ["rust-secp256k1"] }

# async/futures
tokio = { workspace = true, features = ["io-util", "net", "time"] }
tokio-stream = { workspace = true }
tokio-stream.workspace = true

# trust-dns
trust-dns-resolver = "0.22"

# misc
data-encoding = "2"
async-trait = { workspace = true }
async-trait.workspace = true
linked_hash_set = "0.1"
schnellru = "0.2"
thiserror = { workspace = true }
tracing = { workspace = true }
thiserror.workspace = true
tracing.workspace = true
parking_lot = "0.12"
serde = { workspace = true, optional = true }
serde_with = { version = "2.1.0", optional = true }
Expand Down
24 changes: 12 additions & 12 deletions crates/net/downloaders/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,24 @@ description = "Implementations of various block downloaders"

[dependencies]
# reth
reth-interfaces = { workspace = true }
reth-primitives = { workspace = true }
reth-interfaces.workspace = true
reth-primitives.workspace = true
reth-db = { path = "../../storage/db" }
reth-tasks = { workspace = true }
reth-metrics = { workspace = true }
reth-tasks.workspace = true
reth-metrics.workspace = true

# async
futures = { workspace = true }
futures-util = { workspace = true }
pin-project = { workspace = true }
futures.workspace = true
futures-util.workspace = true
pin-project.workspace = true
tokio = { workspace = true, features = ["sync"] }
tokio-stream = { workspace = true }
tokio-stream.workspace = true
tokio-util = { workspace = true, features = ["codec"] }

# misc
tracing = { workspace = true }
rayon = { workspace = true }
thiserror = { workspace = true }
tracing.workspace = true
rayon.workspace = true
thiserror.workspace = true

# optional deps for the test-utils feature
reth-rlp = { workspace = true, optional = true }
Expand All @@ -41,7 +41,7 @@ reth-tracing = { path = "../../tracing" }

assert_matches = "1.5.0"
tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
reth-rlp = { workspace = true }
reth-rlp.workspace = true
itertools = "0.10"

tempfile = "3.3"
Expand Down
14 changes: 7 additions & 7 deletions crates/net/ecies/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,26 @@ repository.workspace = true

[dependencies]
reth-rlp = { workspace = true, features = ["derive", "ethereum-types", "std"] }
reth-primitives = { workspace = true }
reth-primitives.workspace = true
reth-net-common = { path = "../common" }

futures = { workspace = true }
thiserror = { workspace = true }
futures.workspace = true
thiserror.workspace = true
tokio = { workspace = true, features = ["full"] }
tokio-stream = { workspace = true }
tokio-stream.workspace = true
tokio-util = { workspace = true, features = ["codec"] }
pin-project = { workspace = true }
pin-project.workspace = true

educe = "0.4.19"
tracing = { workspace = true }
tracing.workspace = true

# HeaderBytes
generic-array = "0.14.6"
typenum = "1.15.0"
byteorder = "1.4.3"

# crypto
rand = { workspace = true }
rand.workspace = true
ctr = "0.9.2"
digest = "0.10.5"
secp256k1 = { workspace = true, features = ["global-context", "rand-std", "recovery"] }
Expand Down
Loading

0 comments on commit 8cdb097

Please sign in to comment.