diff --git a/Cargo.lock b/Cargo.lock index 5ede8152e..8fa5edbce 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5524,7 +5524,6 @@ dependencies = [ "proptest-derive", "rand 0.8.5", "reth-codecs", - "reth-db", "reth-interfaces", "reth-libmdbx", "reth-metrics", diff --git a/bin/reth/Cargo.toml b/bin/reth/Cargo.toml index 28b0d8118..1dbc4368b 100644 --- a/bin/reth/Cargo.toml +++ b/bin/reth/Cargo.toml @@ -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" } diff --git a/crates/blockchain-tree/Cargo.toml b/crates/blockchain-tree/Cargo.toml index 211f12b2d..1c8651dfe 100644 --- a/crates/blockchain-tree/Cargo.toml +++ b/crates/blockchain-tree/Cargo.toml @@ -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" } @@ -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"] } diff --git a/crates/consensus/beacon/Cargo.toml b/crates/consensus/beacon/Cargo.toml index d18018747..9c552cde1 100644 --- a/crates/consensus/beacon/Cargo.toml +++ b/crates/consensus/beacon/Cargo.toml @@ -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 @@ -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" } diff --git a/crates/interfaces/Cargo.toml b/crates/interfaces/Cargo.toml index 1f4786f75..158d03611 100644 --- a/crates/interfaces/Cargo.toml +++ b/crates/interfaces/Cargo.toml @@ -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"] } diff --git a/crates/net/downloaders/Cargo.toml b/crates/net/downloaders/Cargo.toml index 3c33ab23d..dbed752c1 100644 --- a/crates/net/downloaders/Cargo.toml +++ b/crates/net/downloaders/Cargo.toml @@ -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 @@ -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" } diff --git a/crates/stages/Cargo.toml b/crates/stages/Cargo.toml index 6f8ef3482..16d36c5b0 100644 --- a/crates/stages/Cargo.toml +++ b/crates/stages/Cargo.toml @@ -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" } @@ -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] diff --git a/crates/storage/db/Cargo.toml b/crates/storage/db/Cargo.toml index 76d650b97..029039aa2 100644 --- a/crates/storage/db/Cargo.toml +++ b/crates/storage/db/Cargo.toml @@ -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 @@ -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 diff --git a/crates/storage/provider/Cargo.toml b/crates/storage/provider/Cargo.toml index 32732f574..ee3616e73 100644 --- a/crates/storage/provider/Cargo.toml +++ b/crates/storage/provider/Cargo.toml @@ -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 @@ -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 diff --git a/crates/trie/Cargo.toml b/crates/trie/Cargo.toml index ae1840a60..9879bb3dc 100644 --- a/crates/trie/Cargo.toml +++ b/crates/trie/Cargo.toml @@ -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"] } @@ -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 diff --git a/testing/ef-tests/Cargo.toml b/testing/ef-tests/Cargo.toml index bdc221a22..7ca4f599b 100644 --- a/testing/ef-tests/Cargo.toml +++ b/testing/ef-tests/Cargo.toml @@ -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