fix ci

Cuprate · Nov 10, 2024 · 7c5fa6d · 7c5fa6d
1 parent e652c18
commit 7c5fa6d
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 22 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/binaries/cuprated/Cargo.toml b/binaries/cuprated/Cargo.toml
@@ -20,7 +20,7 @@ cuprate-fixed-bytes      = { workspace = true }
 cuprate-levin            = { workspace = true }
 cuprate-wire             = { workspace = true }
 cuprate-p2p              = { workspace = true }
-cuprate-p2p-core         = { workspace = true, features = ["serde"] }
+cuprate-p2p-core         = { workspace = true }
 cuprate-dandelion-tower  = { workspace = true, features = ["txpool"] }
 cuprate-async-buffer     = { workspace = true }
 cuprate-address-book     = { workspace = true }

diff --git a/binaries/cuprated/src/config/p2p.rs b/binaries/cuprated/src/config/p2p.rs
@@ -1,9 +1,12 @@
-use cuprate_helper::fs::addressbook_path;
-use cuprate_helper::network::Network;
+use std::{
+    net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr},
+    path::Path,
+    time::Duration,
+};
+
 use serde::{Deserialize, Serialize};
-use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr};
-use std::path::Path;
-use std::time::Duration;
+
+use cuprate_helper::{fs::addressbook_path, network::Network};
 
 /// P2P config.
 #[derive(Default, Deserialize, Serialize)]

diff --git a/binaries/cuprated/src/config/storage.rs b/binaries/cuprated/src/config/storage.rs
@@ -1,6 +1,7 @@
-use serde::{Deserialize, Serialize};
 use std::path::PathBuf;
 
+use serde::{Deserialize, Serialize};
+
 use cuprate_database::config::SyncMode;
 use cuprate_database_service::ReaderThreads;
 use cuprate_helper::fs::CUPRATE_DATA_DIR;

diff --git a/p2p/address-book/Cargo.toml b/p2p/address-book/Cargo.toml
@@ -8,7 +8,6 @@ authors = ["Boog900"]
 
 [dependencies]
 cuprate-constants   = { workspace = true }
-cuprate-helper      = { workspace = true, features = ["std"], optional = true }
 cuprate-pruning     = { workspace = true }
 cuprate-p2p-core    = { workspace = true, features = ["borsh"] }
 

diff --git a/p2p/p2p-core/Cargo.toml b/p2p/p2p-core/Cargo.toml
@@ -28,7 +28,6 @@ tracing = { workspace = true, features = ["std", "attributes"] }
 hex-literal = { workspace = true }
 
 borsh = { workspace = true, features = ["derive", "std"], optional = true }
-serde = { workspace = true, features = ["derive", "std"], optional = true }
 
 [dev-dependencies]
 cuprate-test-utils = { workspace = true }

diff --git a/p2p/p2p-core/src/network_zones/clear.rs b/p2p/p2p-core/src/network_zones/clear.rs
@@ -1,5 +1,5 @@
 use std::{
-    net::{IpAddr, Ipv4Addr, SocketAddr},
+    net::{IpAddr, SocketAddr},
     pin::Pin,
     task::{Context, Poll},
 };
@@ -38,20 +38,10 @@ impl NetZoneAddress for SocketAddr {
 }
 
 #[derive(Debug, Clone)]
-#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
-#[cfg_attr(feature = "serde", serde(deny_unknown_fields))]
 pub struct ClearNetServerCfg {
     pub ip: IpAddr,
 }
 
-impl Default for ClearNetServerCfg {
-    fn default() -> Self {
-        Self {
-            ip: IpAddr::V4(Ipv4Addr::UNSPECIFIED),
-        }
-    }
-}
-
 #[derive(Clone, Copy)]
 pub enum ClearNet {}