mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-03 00:31:50 +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:
@@ -13,8 +13,10 @@ alloy-provider = { workspace = true }
|
||||
alloy-rpc-types-eth = { workspace = true }
|
||||
alloy-signer-local = { workspace = true }
|
||||
async-channel = { workspace = true }
|
||||
bls = { workspace = true }
|
||||
deposit_contract = { workspace = true }
|
||||
execution_layer = { workspace = true }
|
||||
fixed_bytes = { workspace = true }
|
||||
fork_choice = { workspace = true }
|
||||
futures = { workspace = true }
|
||||
hex = { workspace = true }
|
||||
@@ -26,4 +28,5 @@ serde_json = { workspace = true }
|
||||
task_executor = { workspace = true }
|
||||
tempfile = { workspace = true }
|
||||
tokio = { workspace = true }
|
||||
typenum = { workspace = true }
|
||||
types = { workspace = true }
|
||||
|
||||
@@ -6,11 +6,13 @@ use alloy_network::{EthereumWallet, TransactionBuilder};
|
||||
use alloy_primitives::Address as AlloyAddress;
|
||||
use alloy_provider::{Provider, ProviderBuilder};
|
||||
use alloy_signer_local::PrivateKeySigner;
|
||||
use bls::PublicKeyBytes;
|
||||
use execution_layer::test_utils::DEFAULT_GAS_LIMIT;
|
||||
use execution_layer::{
|
||||
BlockProposalContentsType, BuilderParams, ChainHealth, ExecutionLayer, PayloadAttributes,
|
||||
PayloadParameters, PayloadStatus,
|
||||
};
|
||||
use fixed_bytes::FixedBytesExtended;
|
||||
use fork_choice::ForkchoiceUpdateParameters;
|
||||
use reqwest::{Client, header::CONTENT_TYPE};
|
||||
use sensitive_url::SensitiveUrl;
|
||||
@@ -22,8 +24,9 @@ use tokio::time::sleep;
|
||||
use types::payload::BlockProductionVersion;
|
||||
use types::{
|
||||
Address, ChainSpec, EthSpec, ExecutionBlockHash, ExecutionPayload, ExecutionPayloadHeader,
|
||||
FixedBytesExtended, ForkName, Hash256, MainnetEthSpec, PublicKeyBytes, Slot, Uint256,
|
||||
ForkName, Hash256, MainnetEthSpec, Slot, Uint256,
|
||||
};
|
||||
|
||||
const EXECUTION_ENGINE_START_TIMEOUT: Duration = Duration::from_secs(60);
|
||||
|
||||
const TEST_FORK: ForkName = ForkName::Capella;
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
use alloy_network::TransactionBuilder;
|
||||
use alloy_primitives::{Address, U256};
|
||||
use alloy_rpc_types_eth::{AccessList, TransactionRequest};
|
||||
use bls::{Keypair, Signature};
|
||||
use deposit_contract::{BYTECODE, CONTRACT_DEPLOY_GAS, DEPOSIT_GAS, encode_eth1_tx_data};
|
||||
use types::{DepositData, EthSpec, FixedBytesExtended, Hash256, Keypair, Signature};
|
||||
use fixed_bytes::FixedBytesExtended;
|
||||
use types::{DepositData, EthSpec, Hash256};
|
||||
|
||||
/// Hardcoded deposit contract address based on sender address and nonce
|
||||
pub const DEPOSIT_CONTRACT_ADDRESS: &str = "64f43BEc7F86526686C931d65362bB8698872F90";
|
||||
|
||||
Reference in New Issue
Block a user