From 46a9b3a7edd4162514aea1027b6888365cfc6243 Mon Sep 17 00:00:00 2001
From: realbigsean <seananderson33@gmail.com>
Date: Wed, 26 Apr 2023 12:15:02 -0400
Subject: [PATCH] fix lints

---
 beacon_node/network/src/beacon_processor/mod.rs     |  9 ++++-----
 .../src/beacon_processor/worker/sync_methods.rs     |  3 +--
 beacon_node/network/src/sync/block_lookups/tests.rs | 13 ++++---------
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/beacon_node/network/src/beacon_processor/mod.rs b/beacon_node/network/src/beacon_processor/mod.rs
index 64efc37776..b5d1c9ddbe 100644
--- a/beacon_node/network/src/beacon_processor/mod.rs
+++ b/beacon_node/network/src/beacon_processor/mod.rs
@@ -54,7 +54,6 @@ use lighthouse_network::{
 };
 use logging::TimeLatch;
 use slog::{crit, debug, error, trace, warn, Logger};
-use ssz_types::FixedVector;
 use std::collections::VecDeque;
 use std::future::Future;
 use std::pin::Pin;
@@ -67,10 +66,10 @@ use tokio::sync::mpsc;
 use tokio::sync::mpsc::error::TrySendError;
 use types::blob_sidecar::FixedBlobSidecarList;
 use types::{
-    Attestation, AttesterSlashing, BlobSidecar, EthSpec, Hash256, LightClientFinalityUpdate,
-    LightClientOptimisticUpdate, ProposerSlashing, SignedAggregateAndProof, SignedBeaconBlock,
-    SignedBlobSidecar, SignedBlsToExecutionChange, SignedContributionAndProof, SignedVoluntaryExit,
-    SubnetId, SyncCommitteeMessage, SyncSubnetId,
+    Attestation, AttesterSlashing, Hash256, LightClientFinalityUpdate, LightClientOptimisticUpdate,
+    ProposerSlashing, SignedAggregateAndProof, SignedBeaconBlock, SignedBlobSidecar,
+    SignedBlsToExecutionChange, SignedContributionAndProof, SignedVoluntaryExit, SubnetId,
+    SyncCommitteeMessage, SyncSubnetId,
 };
 use work_reprocessing_queue::{
     spawn_reprocess_scheduler, QueuedAggregate, QueuedLightClientUpdate, QueuedRpcBlock,
diff --git a/beacon_node/network/src/beacon_processor/worker/sync_methods.rs b/beacon_node/network/src/beacon_processor/worker/sync_methods.rs
index e8c07d99b8..2ec23f673c 100644
--- a/beacon_node/network/src/beacon_processor/worker/sync_methods.rs
+++ b/beacon_node/network/src/beacon_processor/worker/sync_methods.rs
@@ -18,12 +18,11 @@ use beacon_chain::{AvailabilityProcessingStatus, CountUnrealized};
 use lighthouse_network::PeerAction;
 use slog::{debug, error, info, warn};
 use slot_clock::SlotClock;
-use ssz_types::FixedVector;
 use std::sync::Arc;
 use std::time::{SystemTime, UNIX_EPOCH};
 use tokio::sync::mpsc;
 use types::blob_sidecar::FixedBlobSidecarList;
-use types::{BlobSidecar, Epoch, EthSpec, Hash256, SignedBeaconBlock};
+use types::{Epoch, Hash256, SignedBeaconBlock};
 
 /// Id associated to a batch processing request, either a sync batch or a parent lookup.
 #[derive(Clone, Debug, PartialEq)]
diff --git a/beacon_node/network/src/sync/block_lookups/tests.rs b/beacon_node/network/src/sync/block_lookups/tests.rs
index fe5db49a6f..2a77c0f147 100644
--- a/beacon_node/network/src/sync/block_lookups/tests.rs
+++ b/beacon_node/network/src/sync/block_lookups/tests.rs
@@ -244,12 +244,7 @@ fn test_single_block_lookup_failure() {
     let peer_id = PeerId::random();
 
     // Trigger the request
-    bl.search_block(
-        block_hash,
-        peer_id.clone(),
-        PeerShouldHave::BlockAndBlobs,
-        &mut cx,
-    );
+    bl.search_block(block_hash, peer_id, PeerShouldHave::BlockAndBlobs, &mut cx);
     let id = rig.expect_block_request();
 
     // The request fails. RPC failures are handled elsewhere so we should not penalize the peer.
@@ -591,7 +586,7 @@ fn test_parent_lookup_too_many_processing_attempts_must_blacklist() {
         let id = dbg!(rig.expect_parent_request());
         assert!(!bl.failed_chains.contains(&block_hash));
         // send the right parent but fail processing
-        bl.parent_lookup_response(id, peer_id, Some(parent.clone().into()), D, &mut cx);
+        bl.parent_lookup_response(id, peer_id, Some(parent.clone()), D, &mut cx);
         bl.parent_block_processed(
             block_hash,
             BlockError::InvalidSignature.into(),
@@ -610,13 +605,13 @@ fn test_parent_lookup_too_many_processing_attempts_must_blacklist() {
 fn test_parent_lookup_too_deep() {
     let (mut bl, mut cx, mut rig) = TestRig::test_setup(false);
     let mut blocks =
-        Vec::<SignedBeaconBlock<E>>::with_capacity(parent_lookup::PARENT_DEPTH_TOLERANCE);
+        Vec::<Arc<SignedBeaconBlock<E>>>::with_capacity(parent_lookup::PARENT_DEPTH_TOLERANCE);
     while blocks.len() < parent_lookup::PARENT_DEPTH_TOLERANCE {
         let parent = blocks
             .last()
             .map(|b| b.canonical_root())
             .unwrap_or_else(Hash256::random);
-        let block = rig.block_with_parent(parent);
+        let block = Arc::new(rig.block_with_parent(parent));
         blocks.push(block);
     }