From 48cf69def4ad430de4026a12fe6ce5738588e203 Mon Sep 17 00:00:00 2001
From: Matthias Seitz <matthias.seitz@outlook.de>
Date: Sat, 14 Oct 2023 09:23:02 +0200
Subject: [PATCH] chore(deps): move some deps to workspace (#5020)

---
 Cargo.toml                                          | 5 ++++-
 bin/reth/Cargo.toml                                 | 2 +-
 crates/metrics/metrics-derive/Cargo.toml            | 4 ++--
 crates/primitives/Cargo.toml                        | 2 +-
 crates/storage/codecs/derive/Cargo.toml             | 2 +-
 crates/storage/db/Cargo.toml                        | 2 +-
 examples/Cargo.toml                                 | 2 +-
 examples/additional-rpc-namespace-in-cli/Cargo.toml | 2 +-
 examples/cli-extension-event-hooks/Cargo.toml       | 2 +-
 examples/manual-p2p/Cargo.toml                      | 4 ++--
 examples/rpc-db/Cargo.toml                          | 2 +-
 11 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 407792cee..4db0a74ad 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -106,7 +106,7 @@ reth-rpc-types-compat = { path = "./crates/rpc/rpc-types-compat" }
 reth-discv4 = { path = "./crates/net/discv4" }
 reth-eth-wire = { path = "./crates/net/eth-wire" }
 reth-ecies = { path = "./crates/net/ecies" }
-reth-tracing = {path = "./crates/tracing"}
+reth-tracing = { path = "./crates/tracing" }
 
 # revm
 revm = "3.5.0"
@@ -133,6 +133,7 @@ aquamarine = "0.3"
 bytes = "1.5"
 bitflags = "2.3"
 clap = "4"
+eyre = "0.6"
 tracing = "0.1.0"
 tracing-appender = "0.2"
 thiserror = "1.0"
@@ -145,6 +146,8 @@ itertools = "0.11"
 parking_lot = "0.12"
 metrics = "0.21.1" # Needed for `metrics-macro` to resolve the crate using `::metrics` notation
 hex-literal = "0.4"
+once_cell = "1.17"
+syn = "2.0"
 
 ### proc-macros
 proc-macro2 = "1.0"
diff --git a/bin/reth/Cargo.toml b/bin/reth/Cargo.toml
index de30aa3f1..11ff97c0f 100644
--- a/bin/reth/Cargo.toml
+++ b/bin/reth/Cargo.toml
@@ -95,7 +95,7 @@ hyper = "0.14.25"
 
 # misc
 aquamarine.workspace = true
-eyre = "0.6.8"
+eyre.workspace = true
 clap = { workspace = true, features = ["derive"] }
 tempfile.workspace = true
 backon = "0.4"
diff --git a/crates/metrics/metrics-derive/Cargo.toml b/crates/metrics/metrics-derive/Cargo.toml
index 8af2af4af..6f3a6ba46 100644
--- a/crates/metrics/metrics-derive/Cargo.toml
+++ b/crates/metrics/metrics-derive/Cargo.toml
@@ -12,10 +12,10 @@ proc-macro = true
 
 [dependencies]
 proc-macro2.workspace = true
-syn = { version = "2.0", features = ["extra-traits"] }
+syn = { workspace = true, features = ["extra-traits"] }
 quote.workspace = true
 regex = "1.6.0"
-once_cell = "1.17.0"
+once_cell.workspace = true
 
 [dev-dependencies]
 metrics.workspace = true
diff --git a/crates/primitives/Cargo.toml b/crates/primitives/Cargo.toml
index af84ec1bb..5e2b457a0 100644
--- a/crates/primitives/Cargo.toml
+++ b/crates/primitives/Cargo.toml
@@ -47,7 +47,7 @@ sucds = "~0.6"
 modular-bitfield = "0.11.2"
 derive_more = "0.99"
 url = "2.3"
-once_cell = "1.17.0"
+once_cell.workspace = true
 zstd = { version = "0.12", features = ["experimental"] }
 rayon.workspace = true
 tempfile.workspace = true
diff --git a/crates/storage/codecs/derive/Cargo.toml b/crates/storage/codecs/derive/Cargo.toml
index 6d5f8be7c..113e45102 100644
--- a/crates/storage/codecs/derive/Cargo.toml
+++ b/crates/storage/codecs/derive/Cargo.toml
@@ -22,7 +22,7 @@ proc-macro = true
 [dependencies]
 proc-macro2.workspace = true
 quote.workspace = true
-syn = { version = "2.0", features = ["full", "extra-traits"] }
+syn = { workspace = true, features = ["full", "extra-traits"] }
 convert_case = "0.6.0"
 
 # codecs
diff --git a/crates/storage/db/Cargo.toml b/crates/storage/db/Cargo.toml
index de96cc5b8..937bb232b 100644
--- a/crates/storage/db/Cargo.toml
+++ b/crates/storage/db/Cargo.toml
@@ -43,7 +43,7 @@ thiserror.workspace = true
 tempfile = { workspace = true, optional = true }
 parking_lot.workspace = true
 derive_more = "0.99"
-eyre = "0.6.8"
+eyre.workspace = true
 paste = "1.0"
 
 # arbitrary utils
diff --git a/examples/Cargo.toml b/examples/Cargo.toml
index 2bbf33605..9f21bd4e0 100644
--- a/examples/Cargo.toml
+++ b/examples/Cargo.toml
@@ -22,7 +22,7 @@ reth-network.workspace = true
 reth-transaction-pool.workspace = true
 reth-tasks.workspace = true
 
-eyre = "0.6.8"
+eyre.workspace = true
 futures.workspace = true
 async-trait.workspace = true
 tokio.workspace = true
diff --git a/examples/additional-rpc-namespace-in-cli/Cargo.toml b/examples/additional-rpc-namespace-in-cli/Cargo.toml
index 1f1feee74..eb332bf07 100644
--- a/examples/additional-rpc-namespace-in-cli/Cargo.toml
+++ b/examples/additional-rpc-namespace-in-cli/Cargo.toml
@@ -11,7 +11,7 @@ reth-transaction-pool.workspace = true
 
 clap = { workspace = true, features = ["derive"] }
 jsonrpsee = { workspace = true, features = ["server", "macros"] }
-eyre = "0.6"
+eyre.workspace = true
 
 [dev-dependencies]
 tokio.workspace = true
diff --git a/examples/cli-extension-event-hooks/Cargo.toml b/examples/cli-extension-event-hooks/Cargo.toml
index 9c9b30b65..09b5ef567 100644
--- a/examples/cli-extension-event-hooks/Cargo.toml
+++ b/examples/cli-extension-event-hooks/Cargo.toml
@@ -8,4 +8,4 @@ license.workspace = true
 [dependencies]
 reth.workspace = true
 clap.workspace = true
-eyre = "0.6"
+eyre.workspace = true
diff --git a/examples/manual-p2p/Cargo.toml b/examples/manual-p2p/Cargo.toml
index f31a57908..9e463ae8c 100644
--- a/examples/manual-p2p/Cargo.toml
+++ b/examples/manual-p2p/Cargo.toml
@@ -6,8 +6,8 @@ edition.workspace = true
 license.workspace = true
 
 [dependencies]
-once_cell = "1.17.0"
-eyre = "0.6.8"
+once_cell.workspace = true
+eyre.workspace = true
 
 reth-primitives.workspace = true
 reth-network.workspace = true
diff --git a/examples/rpc-db/Cargo.toml b/examples/rpc-db/Cargo.toml
index ed9cc88e7..9a23e7af8 100644
--- a/examples/rpc-db/Cargo.toml
+++ b/examples/rpc-db/Cargo.toml
@@ -10,4 +10,4 @@ futures.workspace = true
 jsonrpsee.workspace = true
 reth.workspace = true
 tokio = { workspace = true, features = ["full"] }
-eyre = "0.6.8"
+eyre.workspace = true