mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-02 16:21:42 +00:00
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:
@@ -20,6 +20,7 @@ eth2 = { workspace = true, features = ["lighthouse"] }
|
||||
eth2_keystore = { workspace = true }
|
||||
ethereum_serde_utils = { workspace = true }
|
||||
filesystem = { workspace = true }
|
||||
fixed_bytes = { workspace = true }
|
||||
graffiti_file = { workspace = true }
|
||||
health_metrics = { workspace = true }
|
||||
initialized_validators = { workspace = true }
|
||||
@@ -41,6 +42,7 @@ tempfile = { workspace = true }
|
||||
tokio = { workspace = true }
|
||||
tokio-stream = { workspace = true }
|
||||
tracing = { workspace = true }
|
||||
typenum = { workspace = true }
|
||||
types = { workspace = true }
|
||||
url = { workspace = true }
|
||||
validator_dir = { workspace = true }
|
||||
@@ -54,3 +56,4 @@ zeroize = { workspace = true }
|
||||
futures = { workspace = true }
|
||||
itertools = { workspace = true }
|
||||
rand = { workspace = true, features = ["small_rng"] }
|
||||
ssz_types = { workspace = true }
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
//! Implementation of the standard keystore management API.
|
||||
use account_utils::validator_definitions::PasswordStorage;
|
||||
use bls::PublicKeyBytes;
|
||||
use eth2::lighthouse_vc::{
|
||||
std_types::{
|
||||
DeleteKeystoreStatus, DeleteKeystoresRequest, DeleteKeystoresResponse,
|
||||
@@ -18,7 +19,7 @@ use std::sync::Arc;
|
||||
use task_executor::TaskExecutor;
|
||||
use tokio::runtime::Handle;
|
||||
use tracing::{info, warn};
|
||||
use types::{EthSpec, PublicKeyBytes};
|
||||
use types::EthSpec;
|
||||
use validator_dir::{Builder as ValidatorDirBuilder, keystore_password_path};
|
||||
use warp::Rejection;
|
||||
use warp_utils::reject::{custom_bad_request, custom_server_error};
|
||||
|
||||
@@ -22,6 +22,7 @@ use account_utils::{
|
||||
};
|
||||
pub use api_secret::ApiSecret;
|
||||
use beacon_node_fallback::CandidateInfo;
|
||||
use bls::{PublicKey, PublicKeyBytes};
|
||||
use core::convert::Infallible;
|
||||
use create_validator::{
|
||||
create_validators_mnemonic, create_validators_web3signer, get_voting_password_storage,
|
||||
@@ -30,8 +31,8 @@ use directory::{DEFAULT_HARDCODED_NETWORK, DEFAULT_ROOT_DIR, DEFAULT_VALIDATOR_D
|
||||
use eth2::lighthouse_vc::{
|
||||
std_types::{AuthResponse, GetFeeRecipientResponse, GetGasLimitResponse},
|
||||
types::{
|
||||
self as api_types, GenericResponse, GetGraffitiResponse, Graffiti, PublicKey,
|
||||
PublicKeyBytes, SetGraffitiRequest, UpdateCandidatesRequest, UpdateCandidatesResponse,
|
||||
self as api_types, GenericResponse, GetGraffitiResponse, Graffiti, SetGraffitiRequest,
|
||||
UpdateCandidatesRequest, UpdateCandidatesResponse,
|
||||
},
|
||||
};
|
||||
use health_metrics::observe::Observe;
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
use account_utils::validator_definitions::{
|
||||
SigningDefinition, ValidatorDefinition, Web3SignerDefinition,
|
||||
};
|
||||
use bls::PublicKeyBytes;
|
||||
use eth2::lighthouse_vc::std_types::{
|
||||
DeleteRemotekeyStatus, DeleteRemotekeysRequest, DeleteRemotekeysResponse,
|
||||
ImportRemotekeyStatus, ImportRemotekeysRequest, ImportRemotekeysResponse,
|
||||
@@ -14,7 +15,7 @@ use std::sync::Arc;
|
||||
use task_executor::TaskExecutor;
|
||||
use tokio::runtime::Handle;
|
||||
use tracing::{info, warn};
|
||||
use types::{EthSpec, PublicKeyBytes};
|
||||
use types::EthSpec;
|
||||
use url::Url;
|
||||
use warp::Rejection;
|
||||
use warp_utils::reject::custom_server_error;
|
||||
|
||||
@@ -4,6 +4,7 @@ use account_utils::validator_definitions::ValidatorDefinitions;
|
||||
use account_utils::{
|
||||
eth2_wallet::WalletBuilder, mnemonic_from_phrase, random_mnemonic, random_password,
|
||||
};
|
||||
use bls::Keypair;
|
||||
use deposit_contract::decode_eth1_tx_data;
|
||||
use doppelganger_service::DoppelgangerService;
|
||||
use eth2::{
|
||||
|
||||
@@ -11,6 +11,7 @@ use account_utils::{
|
||||
eth2_wallet::WalletBuilder, mnemonic_from_phrase, random_mnemonic, random_password,
|
||||
random_password_string, validator_definitions::ValidatorDefinitions,
|
||||
};
|
||||
use bls::{Keypair, PublicKeyBytes};
|
||||
use deposit_contract::decode_eth1_tx_data;
|
||||
use eth2::{
|
||||
Error as ApiError,
|
||||
|
||||
@@ -1,19 +1,23 @@
|
||||
use super::*;
|
||||
use account_utils::random_password_string;
|
||||
use bls::PublicKeyBytes;
|
||||
use bls::{AggregateSignature, PublicKey};
|
||||
use eth2::lighthouse_vc::types::UpdateFeeRecipientRequest;
|
||||
use eth2::lighthouse_vc::{
|
||||
http_client::ValidatorClientHttpClient as HttpClient,
|
||||
std_types::{KeystoreJsonStr as Keystore, *},
|
||||
types::Web3SignerValidatorRequest,
|
||||
};
|
||||
use fixed_bytes::FixedBytesExtended;
|
||||
use itertools::Itertools;
|
||||
use lighthouse_validator_store::DEFAULT_GAS_LIMIT;
|
||||
use rand::rngs::StdRng;
|
||||
use rand::{Rng, SeedableRng};
|
||||
use slashing_protection::interchange::{Interchange, InterchangeMetadata};
|
||||
use ssz_types::BitList;
|
||||
use std::{collections::HashMap, path::Path};
|
||||
use tokio::runtime::Handle;
|
||||
use typenum::Unsigned;
|
||||
use types::{Address, attestation::AttestationBase};
|
||||
use validator_store::ValidatorStore;
|
||||
use zeroize::Zeroizing;
|
||||
|
||||
Reference in New Issue
Block a user