Remove serde derive references (#4830)

* remove remaining uses of serde_derive

* fix lockfile

---------

Co-authored-by: João Oliveira <hello@jxs.pt>

beacon_node/client/Cargo.toml

@@ -22,7 +22,6 @@ types = { workspace = true }
 eth2_config = { workspace = true }
 slot_clock = { workspace = true }
 serde = { workspace = true }
-serde_derive = "1.0.116"
 error-chain = { workspace = true }
 slog = { workspace = true }
 tokio = { workspace = true }

beacon_node/client/src/config.rs

@@ -5,7 +5,7 @@ use directory::DEFAULT_ROOT_DIR;
 use environment::LoggerConfig;
 use network::NetworkConfig;
 use sensitive_url::SensitiveUrl;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use std::fs;
 use std::path::PathBuf;
 use std::time::Duration;

beacon_node/lighthouse_network/Cargo.toml

@@ -10,7 +10,6 @@ unsigned-varint = { version = "0.6", features = ["codec"] }
 ssz_types = { workspace = true }
 types = { workspace = true }
 serde = { workspace = true }
-serde_derive = "1"
 ethereum_ssz = { workspace = true }
 ethereum_ssz_derive = { workspace = true }
 tree_hash = { workspace = true }

beacon_node/lighthouse_network/src/config.rs

@@ -8,7 +8,7 @@ use directory::{
 use discv5::{Discv5Config, Discv5ConfigBuilder};
 use libp2p::gossipsub;
 use libp2p::Multiaddr;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use sha2::{Digest, Sha256};
 use std::net::{Ipv4Addr, Ipv6Addr};
 use std::num::NonZeroU16;

beacon_node/lighthouse_network/src/rpc/config.rs

@@ -6,7 +6,7 @@ use std::{
 
 use super::{methods, rate_limiter::Quota, Protocol};
 
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 /// Auxiliary struct to aid on configuration parsing.
 ///

beacon_node/lighthouse_network/src/rpc/rate_limiter.rs

@@ -2,7 +2,7 @@ use super::config::RateLimiterConfig;
 use crate::rpc::Protocol;
 use fnv::FnvHashMap;
 use libp2p::PeerId;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use std::convert::TryInto;
 use std::future::Future;
 use std::hash::Hash;

beacon_node/lighthouse_network/src/types/topics.rs

@@ -1,5 +1,5 @@
 use libp2p::gossipsub::{IdentTopic as Topic, TopicHash};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use strum::AsRefStr;
 use types::consts::deneb::BLOB_SIDECAR_SUBNET_COUNT;
 use types::{EthSpec, ForkName, SubnetId, SyncSubnetId};

beacon_node/operation_pool/Cargo.toml

@@ -16,7 +16,6 @@ ethereum_ssz = { workspace = true }
 ethereum_ssz_derive = { workspace = true }
 rayon = { workspace = true }
 serde = { workspace = true }
-serde_derive = "1.0.116"
 store = { workspace = true }
 bitvec = { workspace = true }
 rand = { workspace = true }

beacon_node/operation_pool/src/attestation_id.rs

@@ -1,4 +1,4 @@
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 
 /// Serialized `AttestationData` augmented with a domain to encode the fork info.

beacon_node/operation_pool/src/sync_aggregate_id.rs

@@ -1,4 +1,4 @@
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use types::{Hash256, Slot};
 

beacon_node/store/Cargo.toml

@@ -19,7 +19,6 @@ types = { workspace = true }
 state_processing = { workspace = true }
 slog = { workspace = true }
 serde = { workspace = true }
-serde_derive = "1.0.116"
 lazy_static = { workspace = true }
 lighthouse_metrics = { workspace = true }
 lru = { workspace = true }

beacon_node/store/src/config.rs

@@ -1,5 +1,5 @@
 use crate::{DBColumn, Error, StoreItem};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz::{Decode, Encode};
 use ssz_derive::{Decode, Encode};
 use types::{EthSpec, MinimalEthSpec};

beacon_node/store/src/hot_cold_store.rs

@@ -25,7 +25,7 @@ use itertools::process_results;
 use leveldb::iterator::LevelDBIterator;
 use lru::LruCache;
 use parking_lot::{Mutex, RwLock};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use slog::{debug, error, info, trace, warn, Logger};
 use ssz::{Decode, Encode};
 use ssz_derive::{Decode, Encode};

beacon_node/store/src/metadata.rs

@@ -1,5 +1,5 @@
 use crate::{DBColumn, Error, StoreItem};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz::{Decode, Encode};
 use ssz_derive::{Decode, Encode};
 use types::{Checkpoint, Hash256, Slot};