mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-06 18:21:45 +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:
@@ -4,13 +4,15 @@ use beacon_chain::{
|
||||
StateSkipConfig,
|
||||
test_utils::{DEFAULT_ETH1_BLOCK_HASH, HARNESS_GENESIS_TIME, RelativeSyncCommittee},
|
||||
};
|
||||
use bls::PublicKey;
|
||||
use eth2::types::{IndexedErrorMessage, StateId, SyncSubcommittee};
|
||||
use execution_layer::test_utils::generate_genesis_header;
|
||||
use fixed_bytes::FixedBytesExtended;
|
||||
use genesis::{InteropGenesisBuilder, bls_withdrawal_credentials};
|
||||
use http_api::test_utils::*;
|
||||
use std::collections::HashSet;
|
||||
use types::{
|
||||
Address, ChainSpec, Epoch, EthSpec, FixedBytesExtended, Hash256, MinimalEthSpec, Slot,
|
||||
Address, ChainSpec, Epoch, EthSpec, Hash256, MinimalEthSpec, Slot,
|
||||
test_utils::{generate_deterministic_keypair, generate_deterministic_keypairs},
|
||||
};
|
||||
|
||||
@@ -392,7 +394,7 @@ async fn bls_to_execution_changes_update_all_around_capella_fork() {
|
||||
|
||||
fn withdrawal_credentials_fn<'a>(
|
||||
index: usize,
|
||||
_: &'a types::PublicKey,
|
||||
_: &'a PublicKey,
|
||||
spec: &'a ChainSpec,
|
||||
) -> Hash256 {
|
||||
// It is a bit inefficient to regenerate the whole keypair here, but this is a workaround.
|
||||
|
||||
Reference in New Issue
Block a user