gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-03-11 18:04:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Rust beta compiler errors 1.78.0-beta.1 (#5439)

Browse Source 
* remove redundant imports

* fix test

* contains key

* fmt

* Merge branch 'unstable' into fix-beta-compiler
This commit is contained in:
Eitan Seri-Levi
2024-03-20 07:17:02 +02:00
committed by GitHub
parent 4449627c7c
commit 01ec42e75a
148 changed files with 104 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
beacon_node/network/src/network_beacon_processor/rpc_methods.rs
View File

@@ -6,7 +6,6 @@ use beacon_chain::{BeaconChainError, BeaconChainTypes, HistoricalBlockError, Whe
use beacon_processor::SendOnDrop;
use itertools::process_results;
use lighthouse_network::rpc::methods::{BlobsByRangeRequest, BlobsByRootRequest};
use lighthouse_network::rpc::StatusMessage;
use lighthouse_network::rpc::*;
use lighthouse_network::{PeerId, PeerRequestId, ReportSource, Response, SyncInfo};
use slog::{debug, error, warn};

3
beacon_node/network/src/persisted_dht.rs
View File

@@ -60,11 +60,10 @@ impl StoreItem for PersistedDht {
#[cfg(test)]
mod tests {
use super::*;
use lighthouse_network::Enr;
use sloggers::{null::NullLoggerBuilder, Build};
use std::str::FromStr;
use store::config::StoreConfig;
use store::{HotColdDB, MemoryStore};
use store::MemoryStore;
use types::{ChainSpec, MinimalEthSpec};
#[test]
fn test_persisted_dht() {

3
beacon_node/network/src/sync/block_lookups/single_block_lookup.rs
View File

@@ -519,7 +519,6 @@ impl slog::Value for SingleLookupRequestState {
mod tests {
use super::*;
use crate::sync::block_lookups::common::LookupType;
use crate::sync::block_lookups::common::{Lookup, RequestState};
use beacon_chain::builder::Witness;
use beacon_chain::eth1_chain::CachingEth1Backend;
use sloggers::null::NullLoggerBuilder;
@@ -529,7 +528,7 @@ mod tests {
use store::{HotColdDB, MemoryStore, StoreConfig};
use types::{
test_utils::{SeedableRng, TestRandom, XorShiftRng},
ChainSpec, EthSpec, MinimalEthSpec as E, SignedBeaconBlock, Slot,
ChainSpec, MinimalEthSpec as E, SignedBeaconBlock, Slot,
};
fn rand_block() -> SignedBeaconBlock<E> {

2
beacon_node/network/src/sync/block_lookups/tests.rs
View File

@@ -1154,9 +1154,7 @@ fn test_same_chain_race_condition() {
mod deneb_only {
use super::*;
use crate::sync::block_lookups::common::ResponseType;
use beacon_chain::data_availability_checker::AvailabilityCheckError;
use beacon_chain::test_utils::NumBlobs;
use ssz_types::VariableList;
use std::ops::IndexMut;
use std::str::FromStr;

1
beacon_node/network/src/sync/manager.rs
View File

@@ -57,7 +57,6 @@ use lighthouse_network::types::{NetworkGlobals, SyncState};
use lighthouse_network::SyncInfo;
use lighthouse_network::{PeerAction, PeerId};
use slog::{crit, debug, error, info, trace, warn, Logger};
use std::boxed::Box;
use std::ops::IndexMut;
use std::ops::Sub;
use std::sync::Arc;

3
beacon_node/network/src/sync/range_sync/range.rs
View File

@@ -395,10 +395,9 @@ mod tests {
use slog::{o, Drain};
use slot_clock::TestingSlotClock;
use std::collections::HashSet;
use std::sync::Arc;
use store::MemoryStore;
use tokio::sync::mpsc;
use types::{ForkName, Hash256, MinimalEthSpec as E};
use types::{ForkName, MinimalEthSpec as E};
#[derive(Debug)]
struct FakeStorage {