fix compile

paulhauner · Dec 8, 2023 · 3326584 · 3326584
1 parent d97b161
commit 3326584
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/beacon_node/lighthouse_network/src/rpc/codec/ssz_snappy.rs b/beacon_node/lighthouse_network/src/rpc/codec/ssz_snappy.rs
@@ -15,11 +15,11 @@ use std::io::{Read, Write};
 use std::marker::PhantomData;
 use std::sync::Arc;
 use tokio_util::codec::{Decoder, Encoder};
-use types::{light_client_bootstrap::LightClientBootstrap, BlobSidecar, ChainSpec};
+use types::ChainSpec;
 use types::{
-    BlobSidecar, EthSpec, ForkContext, ForkName, Hash256, RuntimeVariableList, LightClientBootstrap, SignedBeaconBlock,
-    SignedBeaconBlockAltair, SignedBeaconBlockBase, SignedBeaconBlockCapella,
-    SignedBeaconBlockDeneb, SignedBeaconBlockMerge,
+    BlobSidecar, EthSpec, ForkContext, ForkName, Hash256, LightClientBootstrap,
+    RuntimeVariableList, SignedBeaconBlock, SignedBeaconBlockAltair, SignedBeaconBlockBase,
+    SignedBeaconBlockCapella, SignedBeaconBlockDeneb, SignedBeaconBlockMerge,
 };
 use unsigned_varint::codec::Uvi;
 

diff --git a/beacon_node/lighthouse_network/src/rpc/methods.rs b/beacon_node/lighthouse_network/src/rpc/methods.rs
@@ -13,8 +13,8 @@ use strum::IntoStaticStr;
 use superstruct::superstruct;
 use types::blob_sidecar::BlobIdentifier;
 use types::{
-    blob_sidecar::BlobSidecar, light_client_bootstrap::LightClientBootstrap,LightClientBootstrap, ChainSpec, Epoch,
-    EthSpec, Hash256, RuntimeVariableList, SignedBeaconBlock, Slot,
+    blob_sidecar::BlobSidecar, ChainSpec, Epoch, EthSpec, Hash256, LightClientBootstrap,
+    RuntimeVariableList, SignedBeaconBlock, Slot,
 };
 
 /// Maximum length of error message.

diff --git a/beacon_node/network/src/network_beacon_processor/rpc_methods.rs b/beacon_node/network/src/network_beacon_processor/rpc_methods.rs
@@ -220,12 +220,14 @@ impl<T: BeaconChainTypes> NetworkBeaconProcessor<T> {
         request_id: PeerRequestId,
         request: BlobsByRootRequest,
     ) {
-        let Some(requested_root) = request.blob_ids.first().map(|id| id.block_root) else {
+        let Some(requested_root) = request.blob_ids.as_slice().first().map(|id| id.block_root)
+        else {
             // No blob ids requested.
             return;
         };
         let requested_indices = request
             .blob_ids
+            .as_slice()
             .iter()
             .map(|id| id.index)
             .collect::<Vec<_>>();

diff --git a/consensus/types/src/lib.rs b/consensus/types/src/lib.rs
@@ -101,8 +101,6 @@ pub mod sqlite;
 pub mod blob_sidecar;
 pub mod light_client_header;
 pub mod runtime_var_list;
-pub mod sidecar;
-pub mod signed_blob;
 
 use ethereum_types::{H160, H256};