Remove serde derive references (#4830)

* remove remaining uses of serde_derive

* fix lockfile

---------

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

consensus/types/src/aggregate_and_proof.rs

@@ -3,7 +3,7 @@ use super::{
     Signature, SignedRoot,
 };
 use crate::test_utils::TestRandom;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use test_random_derive::TestRandom;
 use tree_hash_derive::TreeHash;

consensus/types/src/attestation.rs

@@ -1,6 +1,6 @@
 use derivative::Derivative;
 use safe_arith::ArithError;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use test_random_derive::TestRandom;
 use tree_hash_derive::TreeHash;

consensus/types/src/attestation_data.rs

@@ -2,7 +2,7 @@ use crate::test_utils::TestRandom;
 use crate::{Checkpoint, Hash256, SignedRoot, Slot};
 
 use crate::slot_data::SlotData;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use test_random_derive::TestRandom;
 use tree_hash_derive::TreeHash;

consensus/types/src/attestation_duty.rs

@@ -1,5 +1,5 @@
 use crate::*;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 #[derive(arbitrary::Arbitrary, Debug, PartialEq, Clone, Copy, Default, Serialize, Deserialize)]
 pub struct AttestationDuty {

consensus/types/src/attester_slashing.rs

@@ -1,7 +1,7 @@
 use crate::{test_utils::TestRandom, EthSpec, IndexedAttestation};
 
 use derivative::Derivative;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use test_random_derive::TestRandom;
 use tree_hash_derive::TreeHash;

consensus/types/src/beacon_block.rs

@@ -6,7 +6,7 @@ use crate::test_utils::TestRandom;
 use crate::*;
 use bls::Signature;
 use derivative::Derivative;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz::{Decode, DecodeError};
 use ssz_derive::{Decode, Encode};
 use std::marker::PhantomData;

consensus/types/src/beacon_block_body.rs

@@ -1,7 +1,7 @@
 use crate::test_utils::TestRandom;
 use crate::*;
 use derivative::Derivative;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use ssz_types::VariableList;
 use std::marker::PhantomData;

consensus/types/src/beacon_block_header.rs

@@ -1,7 +1,7 @@
 use crate::test_utils::TestRandom;
 use crate::*;
 
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use test_random_derive::TestRandom;
 use tree_hash::TreeHash;

consensus/types/src/beacon_state.rs

@@ -9,7 +9,7 @@ use ethereum_hashing::hash;
 use int_to_bytes::{int_to_bytes4, int_to_bytes8};
 use pubkey_cache::PubkeyCache;
 use safe_arith::{ArithError, SafeArith};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz::{ssz_encode, Decode, DecodeError, Encode};
 use ssz_derive::{Decode, Encode};
 use ssz_types::{typenum::Unsigned, BitVector, FixedVector};

consensus/types/src/beacon_state/committee_cache.rs

@@ -4,7 +4,7 @@ use super::BeaconState;
 use crate::*;
 use core::num::NonZeroUsize;
 use safe_arith::SafeArith;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz::{four_byte_option_impl, Decode, DecodeError, Encode};
 use ssz_derive::{Decode, Encode};
 use std::ops::Range;

consensus/types/src/beacon_state/exit_cache.rs

@@ -1,6 +1,6 @@
 use super::{BeaconStateError, ChainSpec, Epoch, Validator};
 use safe_arith::SafeArith;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 
 /// Map from exit epoch to the number of validators with that exit epoch.

consensus/types/src/beacon_state/progressive_balances_cache.rs

@@ -2,7 +2,7 @@ use crate::beacon_state::balance::Balance;
 use crate::{BeaconState, BeaconStateError, ChainSpec, Epoch, EthSpec};
 use arbitrary::Arbitrary;
 use safe_arith::SafeArith;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use strum::{Display, EnumString, EnumVariantNames};
 
 /// This cache keeps track of the accumulated target attestation balance for the current & previous

consensus/types/src/beacon_state/pubkey_cache.rs

@@ -1,5 +1,5 @@
 use crate::*;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 
 type ValidatorIndex = usize;

consensus/types/src/blob_sidecar.rs

@@ -3,7 +3,7 @@ use crate::{Blob, EthSpec, Hash256, SignedRoot, Slot};
 use derivative::Derivative;
 use kzg::{Kzg, KzgCommitment, KzgPreset, KzgProof, BYTES_PER_FIELD_ELEMENT};
 use rand::Rng;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz::Encode;
 use ssz_derive::{Decode, Encode};
 use ssz_types::{FixedVector, VariableList};

consensus/types/src/bls_to_execution_change.rs

@@ -1,7 +1,7 @@
 use crate::test_utils::TestRandom;
 use crate::*;
 use bls::PublicKeyBytes;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use test_random_derive::TestRandom;
 use tree_hash_derive::TreeHash;

consensus/types/src/builder_bid.rs

@@ -6,8 +6,7 @@ use crate::{
 };
 use bls::PublicKeyBytes;
 use bls::Signature;
-use serde::Deserializer;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Deserializer, Serialize};
 use ssz_derive::Encode;
 use superstruct::superstruct;
 use tree_hash_derive::TreeHash;

consensus/types/src/chain_spec.rs

@@ -1,8 +1,8 @@
 use crate::application_domain::{ApplicationDomain, APPLICATION_DOMAIN_BUILDER};
 use crate::*;
 use int_to_bytes::int_to_bytes4;
+use serde::Deserialize;
 use serde::{Deserializer, Serialize, Serializer};
-use serde_derive::Deserialize;
 use serde_utils::quoted_u64::MaybeQuoted;
 use std::fs::File;
 use std::path::Path;

consensus/types/src/checkpoint.rs

@@ -1,6 +1,6 @@
 use crate::test_utils::TestRandom;
 use crate::{Epoch, Hash256};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use test_random_derive::TestRandom;
 use tree_hash_derive::TreeHash;

consensus/types/src/config_and_preset.rs

@@ -3,7 +3,7 @@ use crate::{
     DenebPreset, EthSpec, ForkName,
 };
 use maplit::hashmap;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use serde_json::Value;
 use std::collections::HashMap;
 use superstruct::superstruct;

consensus/types/src/contribution_and_proof.rs

@@ -3,7 +3,7 @@ use super::{
     SyncSelectionProof,
 };
 use crate::test_utils::TestRandom;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use test_random_derive::TestRandom;
 use tree_hash_derive::TreeHash;

consensus/types/src/deposit.rs

@@ -1,6 +1,6 @@
 use crate::test_utils::TestRandom;
 use crate::*;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use ssz_types::typenum::U33;
 use test_random_derive::TestRandom;

consensus/types/src/deposit_data.rs

@@ -2,7 +2,7 @@ use crate::test_utils::TestRandom;
 use crate::*;
 
 use bls::{PublicKeyBytes, SignatureBytes};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use test_random_derive::TestRandom;
 use tree_hash_derive::TreeHash;

consensus/types/src/deposit_message.rs

@@ -2,7 +2,7 @@ use crate::test_utils::TestRandom;
 use crate::*;
 
 use bls::PublicKeyBytes;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use test_random_derive::TestRandom;
 use tree_hash_derive::TreeHash;

consensus/types/src/deposit_tree_snapshot.rs

@@ -1,7 +1,7 @@
 use crate::*;
 use ethereum_hashing::{hash32_concat, ZERO_HASHES};
 use int_to_bytes::int_to_bytes32;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use test_random_derive::TestRandom;
 use test_utils::TestRandom;

consensus/types/src/enr_fork_id.rs

@@ -1,7 +1,7 @@
 use crate::test_utils::TestRandom;
 use crate::Epoch;
 
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use test_random_derive::TestRandom;
 use tree_hash_derive::TreeHash;

consensus/types/src/eth1_data.rs

@@ -1,7 +1,7 @@
 use super::Hash256;
 use crate::test_utils::TestRandom;
 
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use test_random_derive::TestRandom;
 use tree_hash_derive::TreeHash;

consensus/types/src/eth_spec.rs

@@ -2,7 +2,7 @@ use crate::*;
 
 use kzg::{BlobTrait, KzgPreset, MainnetKzgPreset, MinimalKzgPreset};
 use safe_arith::SafeArith;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz_types::typenum::{
     bit::B0, UInt, Unsigned, U0, U1024, U1048576, U1073741824, U1099511627776, U128, U131072, U16,
     U16777216, U2, U2048, U256, U32, U4, U4096, U512, U6, U625, U64, U65536, U8, U8192,

consensus/types/src/execution_block_hash.rs

@@ -2,7 +2,7 @@ use crate::test_utils::TestRandom;
 use crate::Hash256;
 use derivative::Derivative;
 use rand::RngCore;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz::{Decode, DecodeError, Encode};
 use std::fmt;
 

consensus/types/src/execution_payload.rs

@@ -1,6 +1,6 @@
 use crate::{test_utils::TestRandom, *};
 use derivative::Derivative;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz::{Decode, Encode};
 use ssz_derive::{Decode, Encode};
 use test_random_derive::TestRandom;

consensus/types/src/execution_payload_header.rs

@@ -1,6 +1,6 @@
 use crate::{test_utils::TestRandom, *};
 use derivative::Derivative;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz::Decode;
 use ssz_derive::{Decode, Encode};
 use test_random_derive::TestRandom;

consensus/types/src/fork.rs

@@ -1,7 +1,7 @@
 use crate::test_utils::TestRandom;
 use crate::Epoch;
 
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use test_random_derive::TestRandom;
 use tree_hash_derive::TreeHash;

consensus/types/src/fork_data.rs

@@ -1,7 +1,7 @@
 use crate::test_utils::TestRandom;
 use crate::{Hash256, SignedRoot};
 
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use test_random_derive::TestRandom;
 use tree_hash_derive::TreeHash;

consensus/types/src/fork_name.rs

@@ -1,5 +1,5 @@
 use crate::{ChainSpec, Epoch};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use std::convert::TryFrom;
 use std::fmt::{self, Display, Formatter};

consensus/types/src/historical_batch.rs

@@ -1,7 +1,7 @@
 use crate::test_utils::TestRandom;
 use crate::*;
 
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use ssz_types::FixedVector;
 use test_random_derive::TestRandom;

consensus/types/src/historical_summary.rs

@@ -4,7 +4,7 @@ use crate::{BeaconState, EthSpec, Hash256};
 use cached_tree_hash::Error;
 use cached_tree_hash::{int_log, CacheArena, CachedTreeHash, TreeHashCache};
 use compare_fields_derive::CompareFields;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use ssz_types::VariableList;
 use test_random_derive::TestRandom;

consensus/types/src/indexed_attestation.rs

@@ -1,6 +1,6 @@
 use crate::{test_utils::TestRandom, AggregateSignature, AttestationData, EthSpec, VariableList};
 use derivative::Derivative;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz::Encode;
 use ssz_derive::{Decode, Encode};
 use std::hash::{Hash, Hasher};

consensus/types/src/light_client_bootstrap.rs

@@ -1,6 +1,6 @@
 use super::{BeaconBlockHeader, BeaconState, EthSpec, FixedVector, Hash256, SyncCommittee};
 use crate::{light_client_update::*, test_utils::TestRandom};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use std::sync::Arc;
 use test_random_derive::TestRandom;

consensus/types/src/light_client_finality_update.rs

@@ -3,7 +3,7 @@ use super::{
     Slot, SyncAggregate,
 };
 use crate::{light_client_update::*, test_utils::TestRandom, BeaconState, ChainSpec};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use test_random_derive::TestRandom;
 use tree_hash::TreeHash;

consensus/types/src/light_client_optimistic_update.rs

@@ -2,7 +2,7 @@ use super::{BeaconBlockHeader, EthSpec, Slot, SyncAggregate};
 use crate::{
     light_client_update::Error, test_utils::TestRandom, BeaconState, ChainSpec, SignedBeaconBlock,
 };
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use test_random_derive::TestRandom;
 use tree_hash::TreeHash;

consensus/types/src/light_client_update.rs

@@ -1,7 +1,7 @@
 use super::{BeaconBlockHeader, EthSpec, FixedVector, Hash256, Slot, SyncAggregate, SyncCommittee};
 use crate::{beacon_state, test_utils::TestRandom, BeaconBlock, BeaconState, ChainSpec};
 use safe_arith::ArithError;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use ssz_types::typenum::{U5, U6};
 use std::sync::Arc;

consensus/types/src/participation_flags.rs

@@ -1,6 +1,6 @@
 use crate::{consts::altair::NUM_FLAG_INDICES, test_utils::TestRandom, Hash256};
 use safe_arith::{ArithError, SafeArith};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz::{Decode, DecodeError, Encode};
 use test_random_derive::TestRandom;
 use tree_hash::{PackedEncoding, TreeHash, TreeHashType};

consensus/types/src/pending_attestation.rs

@@ -1,7 +1,7 @@
 use crate::test_utils::TestRandom;
 use crate::{AttestationData, BitList, EthSpec};
 
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use test_random_derive::TestRandom;
 use tree_hash_derive::TreeHash;

consensus/types/src/preset.rs

@@ -1,5 +1,5 @@
 use crate::{ChainSpec, Epoch, EthSpec, Unsigned};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 /// Value-level representation of an Ethereum consensus "preset".
 ///

consensus/types/src/proposer_slashing.rs

@@ -1,7 +1,7 @@
 use crate::test_utils::TestRandom;
 use crate::SignedBeaconBlockHeader;
 
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use test_random_derive::TestRandom;
 use tree_hash_derive::TreeHash;

consensus/types/src/shuffling_id.rs

@@ -1,5 +1,5 @@
 use crate::*;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use std::hash::Hash;
 

consensus/types/src/signed_aggregate_and_proof.rs

@@ -3,7 +3,7 @@ use super::{
     SelectionProof, Signature, SignedRoot,
 };
 use crate::test_utils::TestRandom;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use test_random_derive::TestRandom;
 use tree_hash_derive::TreeHash;

consensus/types/src/signed_beacon_block.rs

@@ -1,7 +1,7 @@
 use crate::*;
 use bls::Signature;
 use derivative::Derivative;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use std::fmt;
 use superstruct::superstruct;

consensus/types/src/signed_beacon_block_header.rs

@@ -2,7 +2,7 @@ use crate::{
     test_utils::TestRandom, BeaconBlockHeader, ChainSpec, Domain, EthSpec, Fork, Hash256,
     PublicKey, Signature, SignedRoot,
 };
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use test_random_derive::TestRandom;
 use tree_hash_derive::TreeHash;

consensus/types/src/signed_blob.rs

@@ -5,7 +5,7 @@ use crate::{
 };
 use bls::PublicKey;
 use derivative::Derivative;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use ssz_types::VariableList;
 use std::marker::PhantomData;

consensus/types/src/signed_bls_to_execution_change.rs

@@ -1,7 +1,7 @@
 use crate::test_utils::TestRandom;
 use crate::*;
 use bls::Signature;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use test_random_derive::TestRandom;
 use tree_hash_derive::TreeHash;

consensus/types/src/signed_contribution_and_proof.rs

@@ -3,7 +3,7 @@ use super::{
     SignedRoot, SyncCommitteeContribution, SyncSelectionProof,
 };
 use crate::test_utils::TestRandom;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use test_random_derive::TestRandom;
 use tree_hash_derive::TreeHash;

consensus/types/src/signed_voluntary_exit.rs

@@ -1,7 +1,7 @@
 use crate::{test_utils::TestRandom, VoluntaryExit};
 use bls::Signature;
 
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use test_random_derive::TestRandom;
 use tree_hash_derive::TreeHash;

consensus/types/src/signing_data.rs

@@ -1,7 +1,7 @@
 use crate::test_utils::TestRandom;
 use crate::Hash256;
 
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use test_random_derive::TestRandom;
 use tree_hash::TreeHash;

consensus/types/src/slot_epoch.rs

@@ -15,7 +15,7 @@ use crate::{ChainSpec, SignedRoot};
 
 use rand::RngCore;
 use safe_arith::{ArithError, SafeArith};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz::{Decode, DecodeError, Encode};
 use std::fmt;
 use std::hash::Hash;

consensus/types/src/subnet_id.rs

@@ -1,7 +1,7 @@
 //! Identifies each shard by an integer identifier.
 use crate::{AttestationData, ChainSpec, CommitteeIndex, Epoch, EthSpec, Slot};
 use safe_arith::{ArithError, SafeArith};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use std::ops::{Deref, DerefMut};
 use swap_or_not_shuffle::compute_shuffled_index;
 

consensus/types/src/sync_aggregate.rs

@@ -3,7 +3,7 @@ use crate::test_utils::TestRandom;
 use crate::{AggregateSignature, BitVector, EthSpec, SyncCommitteeContribution};
 use derivative::Derivative;
 use safe_arith::{ArithError, SafeArith};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use test_random_derive::TestRandom;
 use tree_hash_derive::TreeHash;

consensus/types/src/sync_aggregator_selection_data.rs

@@ -1,7 +1,7 @@
 use crate::test_utils::TestRandom;
 use crate::{SignedRoot, Slot};
 
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use test_random_derive::TestRandom;
 use tree_hash_derive::TreeHash;

consensus/types/src/sync_committee.rs

@@ -3,7 +3,7 @@ use crate::typenum::Unsigned;
 use crate::{EthSpec, FixedVector, SyncSubnetId};
 use bls::PublicKeyBytes;
 use safe_arith::{ArithError, SafeArith};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use std::collections::HashMap;
 use test_random_derive::TestRandom;

consensus/types/src/sync_committee_contribution.rs

@@ -2,7 +2,7 @@ use super::{AggregateSignature, EthSpec, SignedRoot};
 use crate::slot_data::SlotData;
 use crate::{test_utils::TestRandom, BitVector, Hash256, Slot, SyncCommitteeMessage};
 use safe_arith::ArithError;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use test_random_derive::TestRandom;
 use tree_hash_derive::TreeHash;

consensus/types/src/sync_committee_message.rs

@@ -2,7 +2,7 @@ use crate::test_utils::TestRandom;
 use crate::{ChainSpec, Domain, EthSpec, Fork, Hash256, SecretKey, Signature, SignedRoot, Slot};
 
 use crate::slot_data::SlotData;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use test_random_derive::TestRandom;
 use tree_hash_derive::TreeHash;

consensus/types/src/sync_duty.rs

@@ -1,7 +1,7 @@
 use crate::{EthSpec, SyncCommittee, SyncSubnetId};
 use bls::PublicKeyBytes;
 use safe_arith::ArithError;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use std::collections::HashSet;
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]

consensus/types/src/sync_subnet_id.rs

@@ -2,7 +2,7 @@
 use crate::consts::altair::SYNC_COMMITTEE_SUBNET_COUNT;
 use crate::EthSpec;
 use safe_arith::{ArithError, SafeArith};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz_types::typenum::Unsigned;
 use std::collections::HashSet;
 use std::fmt::{self, Display};

consensus/types/src/validator.rs

@@ -2,7 +2,7 @@ use crate::{
     test_utils::TestRandom, Address, BeaconState, ChainSpec, Epoch, EthSpec, Hash256,
     PublicKeyBytes,
 };
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use test_random_derive::TestRandom;
 use tree_hash_derive::TreeHash;

consensus/types/src/voluntary_exit.rs

@@ -3,7 +3,7 @@ use crate::{
     SignedVoluntaryExit,
 };
 
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use test_random_derive::TestRandom;
 use tree_hash_derive::TreeHash;

consensus/types/src/withdrawal.rs

@@ -1,6 +1,6 @@
 use crate::test_utils::TestRandom;
 use crate::*;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use test_random_derive::TestRandom;
 use tree_hash_derive::TreeHash;