From bebcabed31a95cf2fdd383e86f4f67b58e5af488 Mon Sep 17 00:00:00 2001 From: Jimmy Chen Date: Fri, 17 May 2024 17:12:53 +0300 Subject: [PATCH] Fix CI errors. --- beacon_node/lighthouse_network/src/types/globals.rs | 2 +- beacon_node/network/src/sync/block_lookups/common.rs | 2 +- .../network/src/sync/block_lookups/single_block_lookup.rs | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/beacon_node/lighthouse_network/src/types/globals.rs b/beacon_node/lighthouse_network/src/types/globals.rs index 8aae2c5984a..7c6b1e74b09 100644 --- a/beacon_node/lighthouse_network/src/types/globals.rs +++ b/beacon_node/lighthouse_network/src/types/globals.rs @@ -151,7 +151,7 @@ mod test { E::number_of_columns() / E::data_column_subnet_count() * E::custody_requirement(); let globals = NetworkGlobals::::new_test_globals(vec![], &log); let any_epoch = Epoch::new(0); - let columns = globals.custody_columns(any_epoch).unwrap(); + let columns = globals.custody_columns(any_epoch); assert_eq!(columns.len(), default_custody_requirement_column_count); } } diff --git a/beacon_node/network/src/sync/block_lookups/common.rs b/beacon_node/network/src/sync/block_lookups/common.rs index 856d8999f92..aeaa9a0d8a8 100644 --- a/beacon_node/network/src/sync/block_lookups/common.rs +++ b/beacon_node/network/src/sync/block_lookups/common.rs @@ -183,7 +183,7 @@ impl RequestState for CustodyRequestState { cx: &mut SyncNetworkContext, ) -> Result { cx.custody_lookup_request(id, self.block_root, downloaded_block_expected_blobs) - .map_err(|e| LookupRequestError::SendFailedNetwork(e)) + .map_err(LookupRequestError::SendFailedNetwork) } fn send_for_processing( diff --git a/beacon_node/network/src/sync/block_lookups/single_block_lookup.rs b/beacon_node/network/src/sync/block_lookups/single_block_lookup.rs index 3cac22167e4..9bd5682f5dc 100644 --- a/beacon_node/network/src/sync/block_lookups/single_block_lookup.rs +++ b/beacon_node/network/src/sync/block_lookups/single_block_lookup.rs @@ -3,7 +3,8 @@ use super::{BlockComponent, PeerId, SINGLE_BLOCK_LOOKUP_MAX_ATTEMPTS}; use crate::sync::block_lookups::common::RequestState; use crate::sync::block_lookups::Id; use crate::sync::network_context::{ - LookupRequestResult, PeerGroup, ReqId, RpcRequestSendError, SendErrorProcessor, SyncNetworkContext, + LookupRequestResult, PeerGroup, ReqId, RpcRequestSendError, SendErrorProcessor, + SyncNetworkContext, }; use beacon_chain::data_column_verification::CustodyDataColumn; use beacon_chain::BeaconChainTypes;