mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-09 03:31: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:
@@ -1,5 +1,5 @@
|
||||
use crate::{Error as DirError, ValidatorDir};
|
||||
use bls::get_withdrawal_credentials;
|
||||
use bls::{Keypair, Signature, get_withdrawal_credentials};
|
||||
use deposit_contract::{Error as DepositError, encode_eth1_tx_data};
|
||||
use eth2_keystore::{Error as KeystoreError, Keystore, KeystoreBuilder, PlainText};
|
||||
use filesystem::create_with_600_perms;
|
||||
@@ -7,7 +7,7 @@ use rand::{Rng, distr::Alphanumeric};
|
||||
use std::fs::{File, create_dir_all};
|
||||
use std::io::{self, Write};
|
||||
use std::path::{Path, PathBuf};
|
||||
use types::{ChainSpec, DepositData, Hash256, Keypair, Signature};
|
||||
use types::{ChainSpec, DepositData, Hash256};
|
||||
|
||||
/// The `Alphanumeric` crate only generates a-z, A-Z, 0-9, therefore it has a range of 62
|
||||
/// characters.
|
||||
|
||||
@@ -2,6 +2,7 @@ use crate::builder::{
|
||||
ETH1_DEPOSIT_AMOUNT_FILE, ETH1_DEPOSIT_DATA_FILE, VOTING_KEYSTORE_FILE,
|
||||
WITHDRAWAL_KEYSTORE_FILE, keystore_password_path,
|
||||
};
|
||||
use bls::Keypair;
|
||||
use deposit_contract::decode_eth1_tx_data;
|
||||
use educe::Educe;
|
||||
use eth2_keystore::{Error as KeystoreError, Keystore, PlainText};
|
||||
@@ -10,7 +11,7 @@ use std::fs::{File, read, write};
|
||||
use std::io;
|
||||
use std::path::{Path, PathBuf};
|
||||
use tree_hash::TreeHash;
|
||||
use types::{DepositData, Hash256, Keypair};
|
||||
use types::{DepositData, Hash256};
|
||||
|
||||
/// The file used to save the Eth1 transaction hash from a deposit.
|
||||
pub const ETH1_DEPOSIT_TX_HASH_FILE: &str = "eth1-deposit-tx-hash.txt";
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
#![cfg(not(debug_assertions))]
|
||||
|
||||
use bls::Keypair;
|
||||
use eth2_keystore::{Keystore, KeystoreBuilder, PlainText};
|
||||
use std::fs::{self, File};
|
||||
use std::path::Path;
|
||||
use tempfile::{TempDir, tempdir};
|
||||
use types::{EthSpec, Keypair, MainnetEthSpec, test_utils::generate_deterministic_keypair};
|
||||
use types::{EthSpec, MainnetEthSpec, test_utils::generate_deterministic_keypair};
|
||||
use validator_dir::{
|
||||
Builder, BuilderError, ETH1_DEPOSIT_DATA_FILE, ETH1_DEPOSIT_TX_HASH_FILE, VOTING_KEYSTORE_FILE,
|
||||
ValidatorDir, WITHDRAWAL_KEYSTORE_FILE,
|
||||
|
||||
Reference in New Issue
Block a user