cerc-io/lighthouse
16
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Remove hidden re-exports to appease Rust 1.73 (#4495)

Browse Source 
## Issue Addressed

#4494 

## Proposed Changes

 - Remove explicit re-exports of various types to appease the new compiler lint

## Additional Info

It seems `warn(hidden_glob_reexports)` is the main culprit.
This commit is contained in:
Jack McPherson 2023-07-12 07:06:00 +00:00
parent 420e9c490e
commit 62c9170755
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
beacon_node/execution_layer/src/lib.rs
View File

@ -38,11 +38,11 @@ use tokio::{
}; };
use tokio_stream::wrappers::WatchStream; use tokio_stream::wrappers::WatchStream;
use tree_hash::TreeHash; use tree_hash::TreeHash;
use types::{AbstractExecPayload, BeaconStateError, ExecPayload, Withdrawals}; use types::{AbstractExecPayload, BeaconStateError, ExecPayload};
use types::{ use types::{
BlindedPayload, BlockType, ChainSpec, Epoch, ExecutionBlockHash, ExecutionPayload, BlindedPayload, BlockType, ChainSpec, Epoch, ExecutionPayloadCapella, ExecutionPayloadMerge,
ExecutionPayloadCapella, ExecutionPayloadMerge, ForkName, ForkVersionedResponse, ForkVersionedResponse, ProposerPreparationData, PublicKeyBytes, Signature, SignedBeaconBlock,
ProposerPreparationData, PublicKeyBytes, Signature, SignedBeaconBlock, Slot, Uint256, Slot,
}; };
mod block_hash; mod block_hash;

7
beacon_node/http_api/tests/fork_tests.rs
View File

@ -326,11 +326,8 @@ async fn sync_committee_indices_across_fork() {
/// Assert that an HTTP API error has the given status code and indexed errors for the given indices. /// Assert that an HTTP API error has the given status code and indexed errors for the given indices.
fn assert_server_indexed_error(error: eth2::Error, status_code: u16, indices: Vec<usize>) { fn assert_server_indexed_error(error: eth2::Error, status_code: u16, indices: Vec<usize>) {
let eth2::Error::ServerIndexedMessage(IndexedErrorMessage { let eth2::Error::ServerIndexedMessage(IndexedErrorMessage { code, failures, .. }) = error
code, else {
failures,
..
}) = error else {
panic!("wrong error, expected ServerIndexedMessage, got: {error:?}") panic!("wrong error, expected ServerIndexedMessage, got: {error:?}")
}; };
assert_eq!(code, status_code); assert_eq!(code, status_code);