Remove consensus/types re-exports (#8540)

There are certain crates which we re-export within `types` which creates a fragmented DevEx, where there are various ways to import the same crates.

```rust
// consensus/types/src/lib.rs
pub use bls::{
AggregatePublicKey, AggregateSignature, Error as BlsError, Keypair, PUBLIC_KEY_BYTES_LEN,
PublicKey, PublicKeyBytes, SIGNATURE_BYTES_LEN, SecretKey, Signature, SignatureBytes,
get_withdrawal_credentials,
};
pub use context_deserialize::{ContextDeserialize, context_deserialize};
pub use fixed_bytes::FixedBytesExtended;
pub use milhouse::{self, List, Vector};
pub use ssz_types::{BitList, BitVector, FixedVector, VariableList, typenum, typenum::Unsigned};
pub use superstruct::superstruct;
```

This PR removes these re-exports and makes it explicit that these types are imported from a non-`consensus/types` crate.


Co-Authored-By: Mac L <mjladson@pm.me>
This commit is contained in:
Mac L
2025-12-09 11:13:41 +04:00
committed by GitHub
parent 77d58437da
commit f3fd1f210b
213 changed files with 556 additions and 259 deletions

View File

@@ -6,6 +6,7 @@ edition = { workspace = true }
[dependencies]
account_utils = { workspace = true }
bls = { workspace = true }
clap = { workspace = true }
clap_utils = { workspace = true }
educe = { workspace = true }

View File

@@ -1,5 +1,6 @@
pub use account_utils::STDIN_INPUTS_FLAG;
use account_utils::strip_off_newlines;
use bls::{Keypair, PublicKeyBytes, SignatureBytes};
use eth2::lighthouse_vc::std_types::{InterchangeJsonStr, KeystoreJsonStr};
use eth2::{
SensitiveUrl,

View File

@@ -1,6 +1,7 @@
use super::common::*;
use crate::DumpConfig;
use account_utils::{random_password_string, read_mnemonic_from_cli, read_password_from_user};
use bls::PublicKeyBytes;
use clap::{Arg, ArgAction, ArgMatches, Command};
use clap_utils::FLAG_HEADER;
use eth2::{
@@ -586,6 +587,7 @@ async fn run<E: EthSpec>(config: CreateConfig, spec: &ChainSpec) -> Result<(), S
#[cfg(test)]
pub mod tests {
use super::*;
use bls::SignatureBytes;
use eth2_network_config::Eth2NetworkConfig;
use regex::Regex;
use std::path::Path;

View File

@@ -1,3 +1,4 @@
use bls::PublicKeyBytes;
use clap::{Arg, ArgAction, ArgMatches, Command};
use eth2::{
SensitiveUrl,
@@ -5,7 +6,6 @@ use eth2::{
};
use serde::{Deserialize, Serialize};
use std::path::PathBuf;
use types::PublicKeyBytes;
use crate::{DumpConfig, common::vc_http_client};

View File

@@ -1,5 +1,6 @@
use crate::{DumpConfig, common::vc_http_client};
use bls::PublicKeyBytes;
use clap::{Arg, ArgAction, ArgMatches, Command};
use clap_utils::FLAG_HEADER;
use eth2::types::{ConfigAndPreset, Epoch, StateId, ValidatorId, ValidatorStatus};
@@ -10,7 +11,7 @@ use slot_clock::{SlotClock, SystemTimeSlotClock};
use std::fs::write;
use std::path::PathBuf;
use std::time::Duration;
use types::{ChainSpec, EthSpec, PublicKeyBytes};
use types::{ChainSpec, EthSpec};
pub const CMD: &str = "exit";
pub const BEACON_URL_FLAG: &str = "beacon-node";

View File

@@ -1,3 +1,4 @@
use bls::PublicKeyBytes;
use clap::{Arg, ArgAction, ArgMatches, Command};
use eth2::lighthouse_vc::types::SingleKeystoreResponse;
use eth2::types::{ConfigAndPreset, StateId, ValidatorId, ValidatorStatus};
@@ -5,7 +6,7 @@ use eth2::{BeaconNodeHttpClient, SensitiveUrl, Timeouts};
use serde::{Deserialize, Serialize};
use std::path::PathBuf;
use std::time::Duration;
use types::{ChainSpec, EthSpec, PublicKeyBytes};
use types::{ChainSpec, EthSpec};
use crate::exit_validators::get_current_epoch;
use crate::{DumpConfig, common::vc_http_client};

View File

@@ -1,6 +1,7 @@
use super::common::*;
use crate::DumpConfig;
use account_utils::read_password_from_user;
use bls::PublicKeyBytes;
use clap::{Arg, ArgAction, ArgMatches, Command};
use eth2::{
SensitiveUrl,
@@ -18,7 +19,7 @@ use std::path::PathBuf;
use std::str::FromStr;
use std::time::Duration;
use tokio::time::sleep;
use types::{Address, PublicKeyBytes};
use types::Address;
use zeroize::Zeroizing;
pub const MOVE_DIR_NAME: &str = "lighthouse-validator-move";