From f59db3151d1b1182e3b30cdf1b5f5d5460553ee1 Mon Sep 17 00:00:00 2001 From: Matthias Seitz Date: Mon, 2 Oct 2023 22:45:36 +0200 Subject: [PATCH] chore(deps): move more things to workspace (#4881) --- Cargo.lock | 35 ++++++++++++++++--- Cargo.toml | 4 ++- bin/reth/Cargo.toml | 4 +-- crates/config/Cargo.toml | 2 +- crates/interfaces/Cargo.toml | 2 +- crates/net/downloaders/Cargo.toml | 4 +-- crates/net/network/Cargo.toml | 4 +-- crates/primitives/Cargo.toml | 6 ++-- crates/rpc/rpc/Cargo.toml | 2 +- crates/storage/db/Cargo.toml | 4 +-- crates/storage/libmdbx-rs/Cargo.toml | 2 +- crates/storage/nippy-jar/Cargo.toml | 6 ++-- crates/storage/provider/Cargo.toml | 4 +-- .../Cargo.toml | 2 +- 14 files changed, 54 insertions(+), 27 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cd0622c96..6ac339bd8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5008,7 +5008,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit", + "toml_edit 0.19.15", ] [[package]] @@ -5469,7 +5469,7 @@ dependencies = [ "tempfile", "thiserror", "tokio", - "toml 0.7.8", + "toml 0.8.1", "tracing", "tui", "vergen", @@ -5594,7 +5594,7 @@ dependencies = [ "serde", "serde_json", "tempfile", - "toml 0.7.8", + "toml 0.8.1", ] [[package]] @@ -6056,7 +6056,7 @@ dependencies = [ "thiserror", "tokio", "tokio-stream", - "toml 0.7.8", + "toml 0.8.1", "tracing", "triehash", "url", @@ -7812,7 +7812,19 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.19.15", +] + +[[package]] +name = "toml" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc1433177506450fe920e46a4f9812d0c211f5dd556da10e731a0a3dfa151f0" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.20.1", ] [[package]] @@ -7837,6 +7849,19 @@ dependencies = [ "winnow", ] +[[package]] +name = "toml_edit" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca676d9ba1a322c1b64eb8045a5ec5c0cfb0c9d08e15e9ff622589ad5221c8fe" +dependencies = [ + "indexmap 2.0.2", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + [[package]] name = "toolchain_find" version = "0.4.0" diff --git a/Cargo.toml b/Cargo.toml index eeba5880e..1420aaffd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -131,6 +131,7 @@ boa_gc = "0.17" aquamarine = "0.3" bytes = "1.5" bitflags = "2.3" +clap = "4" tracing = "0.1.0" tracing-appender = "0.2" thiserror = "1.0" @@ -176,11 +177,12 @@ c-kzg = "0.1.1" ## config confy = "0.5" -toml = "0.7" +toml = "0.8" ### misc-testing arbitrary = "1.1" assert_matches = "1.5.0" +tempfile = "3.8" proptest = "1.0" proptest-derive = "0.4" diff --git a/bin/reth/Cargo.toml b/bin/reth/Cargo.toml index 05f927959..cba9d4a89 100644 --- a/bin/reth/Cargo.toml +++ b/bin/reth/Cargo.toml @@ -94,8 +94,8 @@ hyper = "0.14.25" # misc aquamarine.workspace = true eyre = "0.6.8" -clap = { version = "4", features = ["derive"] } -tempfile = { version = "3.3.0" } +clap = { workspace = true, features = ["derive"] } +tempfile.workspace = true backon = "0.4" thiserror.workspace = true pretty_assertions = "1.3.0" diff --git a/crates/config/Cargo.toml b/crates/config/Cargo.toml index f3872f0c7..e4de7d7c5 100644 --- a/crates/config/Cargo.toml +++ b/crates/config/Cargo.toml @@ -25,7 +25,7 @@ secp256k1 = { workspace = true, features = ["global-context", "rand-std", "recov # misc confy.workspace = true -tempfile = "3.4" +tempfile.workspace = true [dev-dependencies] toml.workspace = true \ No newline at end of file diff --git a/crates/interfaces/Cargo.toml b/crates/interfaces/Cargo.toml index 506efd0bd..75e304f78 100644 --- a/crates/interfaces/Cargo.toml +++ b/crates/interfaces/Cargo.toml @@ -39,7 +39,7 @@ secp256k1 = { workspace = true, default-features = false, features = [ ], optional = true } modular-bitfield = "0.11.2" parking_lot.workspace = true -clap = { version = "4", features = ["derive"], optional = true } +clap = { workspace = true, features = ["derive"], optional = true } [dev-dependencies] reth-db = { workspace = true, features = ["test-utils"] } diff --git a/crates/net/downloaders/Cargo.toml b/crates/net/downloaders/Cargo.toml index bc399f9d2..95e4ff77e 100644 --- a/crates/net/downloaders/Cargo.toml +++ b/crates/net/downloaders/Cargo.toml @@ -34,7 +34,7 @@ thiserror.workspace = true # optional deps for the test-utils feature alloy-rlp = { workspace = true, optional = true } -tempfile = { version = "3.3", optional = true } +tempfile = { workspace = true, optional = true } itertools = { workspace = true, optional = true } [dev-dependencies] @@ -47,7 +47,7 @@ tokio = { workspace = true, features = ["macros", "rt-multi-thread"] } alloy-rlp.workspace = true itertools.workspace = true -tempfile = "3.3" +tempfile.workspace = true [features] test-utils = ["dep:alloy-rlp", "dep:tempfile", "dep:itertools"] diff --git a/crates/net/network/Cargo.toml b/crates/net/network/Cargo.toml index 971e38afa..c4c6abcf3 100644 --- a/crates/net/network/Cargo.toml +++ b/crates/net/network/Cargo.toml @@ -63,7 +63,7 @@ rand.workspace = true secp256k1 = { workspace = true, features = ["global-context", "rand-std", "recovery"] } enr = { workspace = true, features = ["rust-secp256k1"], optional = true } -tempfile = { version = "3.3", optional = true } +tempfile = { workspace = true, optional = true } [dev-dependencies] # reth @@ -88,7 +88,7 @@ enr = { workspace = true, features = ["serde", "rust-secp256k1"] } # misc serial_test.workspace = true -tempfile = "3.3" +tempfile.workspace = true [features] default = ["serde"] diff --git a/crates/primitives/Cargo.toml b/crates/primitives/Cargo.toml index 82c40d760..7ca606c63 100644 --- a/crates/primitives/Cargo.toml +++ b/crates/primitives/Cargo.toml @@ -49,8 +49,8 @@ url = "2.3" once_cell = "1.17.0" zstd = { version = "0.12", features = ["experimental"] } paste = "1.0" -rayon = "1.7" -tempfile = "3.3" +rayon.workspace = true +tempfile.workspace = true sha2 = "0.10.7" itertools = "0.11" num_enum = "0.7" @@ -74,7 +74,7 @@ arbitrary = { workspace = true, features = ["derive"] } proptest.workspace = true proptest-derive.workspace = true assert_matches.workspace = true -toml = "0.7.4" +toml.workspace = true triehash = "0.8" plain_hasher = "0.2" diff --git a/crates/rpc/rpc/Cargo.toml b/crates/rpc/rpc/Cargo.toml index d22337a20..6ca1110a3 100644 --- a/crates/rpc/rpc/Cargo.toml +++ b/crates/rpc/rpc/Cargo.toml @@ -72,5 +72,5 @@ futures.workspace = true [dev-dependencies] jsonrpsee = { workspace = true, features = ["client"] } assert_matches.workspace = true -tempfile = "3.5.0" +tempfile.workspace = true reth-interfaces = { workspace = true, features = ["test-utils"] } diff --git a/crates/storage/db/Cargo.toml b/crates/storage/db/Cargo.toml index a04d89508..2c895e018 100644 --- a/crates/storage/db/Cargo.toml +++ b/crates/storage/db/Cargo.toml @@ -39,7 +39,7 @@ metrics.workspace = true bytes.workspace = true page_size = "0.6.0" thiserror.workspace = true -tempfile = { version = "3.3.0", optional = true } +tempfile = { workspace = true, optional = true } parking_lot.workspace = true derive_more = "0.99" eyre = "0.6.8" @@ -56,7 +56,7 @@ reth-primitives = { workspace = true, features = ["arbitrary"] } reth-codecs = { path = "../codecs", features = ["arbitrary"] } reth-interfaces.workspace = true -tempfile = "3.3.0" +tempfile.workspace = true test-fuzz = "4" pprof = { version = "0.12", features = ["flamegraph", "frame-pointer", "criterion"] } diff --git a/crates/storage/libmdbx-rs/Cargo.toml b/crates/storage/libmdbx-rs/Cargo.toml index e83d06785..094724f58 100644 --- a/crates/storage/libmdbx-rs/Cargo.toml +++ b/crates/storage/libmdbx-rs/Cargo.toml @@ -33,7 +33,7 @@ pprof = { version = "0.12", features = ["flamegraph", "frame-pointer", "criterio criterion = "0.5" rand.workspace = true rand_xorshift = "0.3" -tempfile = "3" +tempfile.workspace = true [[bench]] name = "cursor" diff --git a/crates/storage/nippy-jar/Cargo.toml b/crates/storage/nippy-jar/Cargo.toml index 036bb90d4..3aa7f92d7 100644 --- a/crates/storage/nippy-jar/Cargo.toml +++ b/crates/storage/nippy-jar/Cargo.toml @@ -16,12 +16,12 @@ memmap2 = "0.7.1" bloomfilter = "1" zstd = { version = "0.12", features = ["experimental", "zdict_builder"] } ph = "0.8.0" -thiserror = "1.0" +thiserror .workspace = true bincode = "1.3" serde = { version = "1.0", features = ["derive"] } -bytes = "1.5" +bytes.workspace = true cuckoofilter = { version = "0.5.0", features = ["serde_support", "serde_bytes"] } -tempfile = "3.4" +tempfile.workspace = true sucds = "~0.8" anyhow = "1.0" diff --git a/crates/storage/provider/Cargo.toml b/crates/storage/provider/Cargo.toml index df0460580..2be95fce1 100644 --- a/crates/storage/provider/Cargo.toml +++ b/crates/storage/provider/Cargo.toml @@ -36,7 +36,7 @@ parking_lot.workspace = true alloy-rlp = { workspace = true, optional = true } # parallel utils -rayon = "1.7" +rayon.workspace = true [dev-dependencies] reth-db = { workspace = true, features = ["test-utils"] } @@ -46,7 +46,7 @@ reth-interfaces = { workspace = true, features = ["test-utils"] } alloy-rlp.workspace = true parking_lot.workspace = true -tempfile = "3.3" +tempfile.workspace = true assert_matches.workspace = true rand.workspace = true diff --git a/examples/additional-rpc-namespace-in-cli/Cargo.toml b/examples/additional-rpc-namespace-in-cli/Cargo.toml index 3de40b2d0..1f1feee74 100644 --- a/examples/additional-rpc-namespace-in-cli/Cargo.toml +++ b/examples/additional-rpc-namespace-in-cli/Cargo.toml @@ -9,7 +9,7 @@ license.workspace = true reth.workspace = true reth-transaction-pool.workspace = true -clap = { version = "4", features = ["derive"] } +clap = { workspace = true, features = ["derive"] } jsonrpsee = { workspace = true, features = ["server", "macros"] } eyre = "0.6"