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.

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

chore(dep): reth db workspace #4782

Merged
merged 1 commit into from
Sep 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion Cargo.lock

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

2 changes: 1 addition & 1 deletion bin/reth/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ normal = [
# reth
reth-config = { path = "../../crates/config" }
reth-primitives = { workspace = true, features = ["arbitrary"] }
reth-db = { path = "../../crates/storage/db", features = ["mdbx", "test-utils"] }
reth-db = { workspace = true, features = ["mdbx", "test-utils"] }
# TODO: Temporary use of the test-utils feature
reth-provider = { workspace = true, features = ["test-utils"] }
reth-revm = { path = "../../crates/revm" }
Expand Down
4 changes: 2 additions & 2 deletions crates/blockchain-tree/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ normal = [
# reth
reth-primitives.workspace = true
reth-interfaces.workspace = true
reth-db = { path = "../storage/db" }
reth-db.workspace = true
reth-provider.workspace = true
reth-stages = { path = "../stages" }

Expand All @@ -35,7 +35,7 @@ aquamarine.workspace = true
linked_hash_set = "0.1.4"

[dev-dependencies]
reth-db = { path = "../storage/db", features = ["test-utils"] }
reth-db = { workspace = true, features = ["test-utils"] }
reth-interfaces = { workspace = true, features = ["test-utils"] }
reth-primitives = { workspace = true , features = ["test-utils"] }
reth-provider = { workspace = true, features = ["test-utils"] }
Expand Down
4 changes: 2 additions & 2 deletions crates/consensus/beacon/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ reth-consensus-common = { path = "../common" }
reth-primitives.workspace = true
reth-interfaces.workspace = true
reth-stages = { path = "../../stages" }
reth-db = { path = "../../storage/db" }
reth-db.workspace = true
reth-provider.workspace = true
reth-rpc-types.workspace = true
reth-tasks.workspace = true
Expand All @@ -40,7 +40,7 @@ reth-payload-builder = { workspace = true, features = ["test-utils"] }
reth-interfaces = { workspace = true, features = ["test-utils"] }
reth-stages = { path = "../../stages", features = ["test-utils"] }
reth-blockchain-tree = { path = "../../blockchain-tree", features = ["test-utils"] }
reth-db = { path = "../../storage/db", features = ["test-utils"] }
reth-db = { workspace = true, features = ["test-utils"] }
reth-provider = { workspace = true, features = ["test-utils"] }
reth-tracing = { path = "../../tracing" }
reth-revm = { path = "../../revm" }
Expand Down
2 changes: 1 addition & 1 deletion crates/interfaces/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ parking_lot.workspace = true
clap = { version = "4", features = ["derive"], optional = true }

[dev-dependencies]
reth-db = { path = "../storage/db", features = ["test-utils"] }
reth-db = { workspace = true, features = ["test-utils"] }
tokio = { workspace = true, features = ["full"] }
tokio-stream = { workspace = true, features = ["sync"] }
arbitrary = { workspace = true, features = ["derive"] }
Expand Down
4 changes: 2 additions & 2 deletions crates/net/downloaders/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ description = "Implementations of various block downloaders"
# reth
reth-interfaces.workspace = true
reth-primitives.workspace = true
reth-db = { path = "../../storage/db" }
reth-db.workspace = true
reth-tasks.workspace = true

# async
Expand All @@ -38,7 +38,7 @@ tempfile = { version = "3.3", optional = true }
itertools = { workspace = true, optional = true }

[dev-dependencies]
reth-db = { path = "../../storage/db", features = ["test-utils"] }
reth-db = { workspace = true, features = ["test-utils"] }
reth-interfaces = { workspace = true, features = ["test-utils"] }
reth-tracing = { path = "../../tracing" }

Expand Down
4 changes: 2 additions & 2 deletions crates/stages/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ normal = [
# reth
reth-primitives.workspace = true
reth-interfaces.workspace = true
reth-db = { path = "../storage/db" }
reth-db.workspace = true
reth-codecs = { path = "../storage/codecs" }
reth-provider.workspace = true
reth-trie = { path = "../trie" }
Expand Down Expand Up @@ -53,7 +53,7 @@ num-traits = "0.2.15"
[dev-dependencies]
# reth
reth-primitives = { workspace = true, features = ["arbitrary"] }
reth-db = { path = "../storage/db", features = ["test-utils", "mdbx"] }
reth-db = { workspace = true, features = ["test-utils", "mdbx"] }
reth-interfaces = { workspace = true, features = ["test-utils"] }
reth-downloaders = { path = "../net/downloaders" }
reth-eth-wire = { path = "../net/eth-wire" } # TODO(onbjerg): We only need this for [BlockBody]
Expand Down
4 changes: 3 additions & 1 deletion crates/storage/db/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ pprof = { version = "0.12", features = ["flamegraph", "frame-pointer", "criterio
criterion = "0.5"
iai = "0.1.1"
tokio = { workspace = true, features = ["full"] }
reth-db = { path = ".", features = ["test-utils", "bench"] }

# needed for test-fuzz to work properly, see https://github.com/paradigmxyz/reth/pull/177#discussion_r1021172198
secp256k1.workspace = true
Expand Down Expand Up @@ -97,12 +96,15 @@ arbitrary = [

[[bench]]
name = "hash_keys"
required-features = ["test-utils"]
harness = false

[[bench]]
name = "criterion"
required-features = ["test-utils"]
harness = false

[[bench]]
name = "iai"
required-features = ["test-utils"]
harness = false
4 changes: 2 additions & 2 deletions crates/storage/provider/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ description = "Reth storage provider."
reth-primitives.workspace = true
reth-interfaces.workspace = true
reth-revm-primitives = { path = "../../revm/revm-primitives" }
reth-db = { path = "../db" }
reth-db.workspace = true
reth-trie = { path = "../../trie" }

# async
Expand All @@ -36,7 +36,7 @@ reth-rlp = { workspace = true, optional = true }
rayon = "1.7"

[dev-dependencies]
reth-db = { path = "../db", features = ["test-utils"] }
reth-db = { workspace = true, features = ["test-utils"] }
reth-primitives = { workspace = true, features = ["arbitrary", "test-utils"] }
reth-rlp.workspace = true
revm.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions crates/trie/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Merkle trie implementation
reth-primitives.workspace = true
reth-interfaces.workspace = true
reth-rlp.workspace = true
reth-db = { path = "../storage/db" }
reth-db.workspace = true

# tokio
tokio = { workspace = true, default-features = false, features = ["sync"] }
Expand All @@ -34,7 +34,7 @@ triehash = { version = "0.8", optional = true }
[dev-dependencies]
# reth
reth-primitives = { workspace = true, features = ["test-utils", "arbitrary"] }
reth-db = { path = "../storage/db", features = ["test-utils"] }
reth-db = { workspace = true, features = ["test-utils"] }
reth-provider.workspace = true

# trie
Expand Down
2 changes: 1 addition & 1 deletion testing/ef-tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ ef-tests = []

[dependencies]
reth-primitives.workspace = true
reth-db = { path = "../../crates/storage/db", features = ["mdbx", "test-utils"] }
reth-db = { workspace = true, features = ["mdbx", "test-utils"] }
reth-provider.workspace = true
reth-stages = { path = "../../crates/stages" }
reth-rlp.workspace = true
Expand Down
Loading