From 170a396903c2373d995e1289267906ef38327898 Mon Sep 17 00:00:00 2001
From: Matthias Seitz <matthias.seitz@outlook.de>
Date: Tue, 20 Aug 2024 09:47:33 +0200
Subject: [PATCH] chore: invert p2p and network types dep (#10390)

---
 Cargo.lock                                                   | 3 +--
 crates/net/network-types/Cargo.toml                          | 5 ++---
 crates/net/network-types/src/lib.rs                          | 2 +-
 crates/net/network-types/src/peers/mod.rs                    | 5 ++---
 .../net/{p2p/src => network-types/src/peers}/reputation.rs   | 0
 crates/net/p2p/Cargo.toml                                    | 5 +----
 crates/net/p2p/src/error.rs                                  | 5 ++---
 crates/net/p2p/src/lib.rs                                    | 3 ---
 8 files changed, 9 insertions(+), 19 deletions(-)
 rename crates/net/{p2p/src => network-types/src/peers}/reputation.rs (100%)

diff --git a/Cargo.lock b/Cargo.lock
index 4cd54a99d..30acc74a0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7592,9 +7592,9 @@ dependencies = [
  "reth-consensus",
  "reth-eth-wire-types",
  "reth-network-peers",
+ "reth-network-types",
  "reth-primitives",
  "reth-storage-errors",
- "serde",
  "tokio",
  "tracing",
 ]
@@ -7622,7 +7622,6 @@ dependencies = [
  "humantime-serde",
  "reth-ethereum-forks",
  "reth-net-banlist",
- "reth-network-p2p",
  "reth-network-peers",
  "serde",
  "serde_json",
diff --git a/crates/net/network-types/Cargo.toml b/crates/net/network-types/Cargo.toml
index 23d169101..97c8e65cb 100644
--- a/crates/net/network-types/Cargo.toml
+++ b/crates/net/network-types/Cargo.toml
@@ -16,9 +16,8 @@ workspace = true
 reth-network-peers.workspace = true
 reth-net-banlist.workspace = true
 reth-ethereum-forks.workspace = true
-reth-network-p2p.workspace = true
 
-# io
+# misc
 serde = { workspace = true, optional = true }
 humantime-serde = { workspace = true, optional = true }
 serde_json = { workspace = true }
@@ -27,5 +26,5 @@ serde_json = { workspace = true }
 tracing.workspace = true
 
 [features]
-serde = ["dep:serde", "dep:humantime-serde", "reth-network-p2p/serde"]
+serde = ["dep:serde", "dep:humantime-serde"]
 test-utils = []
diff --git a/crates/net/network-types/src/lib.rs b/crates/net/network-types/src/lib.rs
index f49b90fb7..1e8ad581d 100644
--- a/crates/net/network-types/src/lib.rs
+++ b/crates/net/network-types/src/lib.rs
@@ -19,7 +19,7 @@ pub mod session;
 /// [`BackoffKind`] definition.
 mod backoff;
 
-pub use reth_network_p2p::reputation::{Reputation, ReputationChangeKind, ReputationChangeWeights};
+pub use peers::reputation::{Reputation, ReputationChangeKind, ReputationChangeWeights};
 
 pub use backoff::BackoffKind;
 pub use peers::{
diff --git a/crates/net/network-types/src/peers/mod.rs b/crates/net/network-types/src/peers/mod.rs
index 15f080cc5..bcfddbca3 100644
--- a/crates/net/network-types/src/peers/mod.rs
+++ b/crates/net/network-types/src/peers/mod.rs
@@ -1,12 +1,11 @@
 pub mod addr;
 pub mod config;
 pub mod kind;
+pub mod reputation;
 pub mod state;
 
-pub use reth_network_p2p::reputation;
-
 pub use config::{ConnectionsConfig, PeersConfig};
-pub use reputation::ReputationChangeWeights;
+pub use reputation::{Reputation, ReputationChange, ReputationChangeKind, ReputationChangeWeights};
 
 use reth_ethereum_forks::ForkId;
 use tracing::trace;
diff --git a/crates/net/p2p/src/reputation.rs b/crates/net/network-types/src/peers/reputation.rs
similarity index 100%
rename from crates/net/p2p/src/reputation.rs
rename to crates/net/network-types/src/peers/reputation.rs
diff --git a/crates/net/p2p/Cargo.toml b/crates/net/p2p/Cargo.toml
index e5b94b913..9969842b2 100644
--- a/crates/net/p2p/Cargo.toml
+++ b/crates/net/p2p/Cargo.toml
@@ -16,11 +16,9 @@ reth-primitives.workspace = true
 reth-eth-wire-types.workspace = true
 reth-consensus.workspace = true
 reth-network-peers.workspace = true
+reth-network-types.workspace = true
 reth-storage-errors.workspace = true
 
-# io
-serde = { workspace = true, optional = true }
-
 # async
 futures.workspace = true
 tokio = { workspace = true, features = ["sync"] }
@@ -41,5 +39,4 @@ tokio = { workspace = true, features = ["full"] }
 [features]
 default = ["std"]
 test-utils = ["reth-consensus/test-utils", "parking_lot"]
-serde = ["dep:serde"]
 std = ["reth-consensus/std"]
diff --git a/crates/net/p2p/src/error.rs b/crates/net/p2p/src/error.rs
index 597b2c3c5..4bd173962 100644
--- a/crates/net/p2p/src/error.rs
+++ b/crates/net/p2p/src/error.rs
@@ -1,17 +1,16 @@
 use std::ops::RangeInclusive;
 
+use super::headers::client::HeadersRequest;
 use derive_more::Display;
 use reth_consensus::ConsensusError;
 use reth_network_peers::WithPeerId;
+use reth_network_types::ReputationChangeKind;
 use reth_primitives::{
     BlockHashOrNumber, BlockNumber, GotExpected, GotExpectedBoxed, Header, B256,
 };
 use reth_storage_errors::{db::DatabaseError, provider::ProviderError};
 use tokio::sync::{mpsc, oneshot};
 
-use super::headers::client::HeadersRequest;
-use crate::ReputationChangeKind;
-
 /// Result alias for result of a request.
 pub type RequestResult<T> = Result<T, RequestError>;
 
diff --git a/crates/net/p2p/src/lib.rs b/crates/net/p2p/src/lib.rs
index b67232a03..2ba8012f0 100644
--- a/crates/net/p2p/src/lib.rs
+++ b/crates/net/p2p/src/lib.rs
@@ -45,11 +45,8 @@ pub mod sync;
 #[cfg(any(test, feature = "test-utils"))]
 pub mod test_utils;
 
-pub mod reputation;
-
 pub use bodies::client::BodiesClient;
 pub use headers::client::HeadersClient;
-pub use reputation::{Reputation, ReputationChange, ReputationChangeKind, ReputationChangeWeights};
 
 /// Helper trait that unifies network behaviour needed for fetching blocks.
 pub trait BlockClient: HeadersClient + BodiesClient + Unpin + Clone {}