From c1ecaa9a53a9f828dcf6906a4b799fa91e37569d Mon Sep 17 00:00:00 2001 From: realbigsean Date: Tue, 21 Mar 2023 15:34:24 -0400 Subject: [PATCH] rename blob arc list to blob list --- beacon_node/beacon_chain/src/beacon_chain.rs | 4 ++-- beacon_node/beacon_chain/src/blob_verification.rs | 8 ++++---- beacon_node/beacon_chain/src/early_attester_cache.rs | 6 +++--- beacon_node/store/src/hot_cold_store.rs | 12 ++++++------ beacon_node/store/src/lib.rs | 4 ++-- consensus/types/src/blob_sidecar.rs | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/beacon_node/beacon_chain/src/beacon_chain.rs b/beacon_node/beacon_chain/src/beacon_chain.rs index 535d483ca0..06c6cb31d3 100644 --- a/beacon_node/beacon_chain/src/beacon_chain.rs +++ b/beacon_node/beacon_chain/src/beacon_chain.rs @@ -112,7 +112,7 @@ use task_executor::{ShutdownReason, TaskExecutor}; use tree_hash::TreeHash; use types::beacon_block_body::KzgCommitments; use types::beacon_state::CloneConfig; -use types::blob_sidecar::{BlobIdentifier, BlobSidecarArcList, Blobs}; +use types::blob_sidecar::{BlobIdentifier, BlobSidecarList, Blobs}; use types::consts::eip4844::MIN_EPOCHS_FOR_BLOBS_SIDECARS_REQUESTS; use types::consts::merge::INTERVALS_PER_SLOT; use types::*; @@ -1071,7 +1071,7 @@ impl BeaconChain { pub fn get_blobs( &self, block_root: &Hash256, - ) -> Result>, Error> { + ) -> Result>, Error> { Ok(self.store.get_blobs(block_root)?) } diff --git a/beacon_node/beacon_chain/src/blob_verification.rs b/beacon_node/beacon_chain/src/blob_verification.rs index ed43f13010..9dae0e1a21 100644 --- a/beacon_node/beacon_chain/src/blob_verification.rs +++ b/beacon_node/beacon_chain/src/blob_verification.rs @@ -9,7 +9,7 @@ use crate::gossip_blob_cache::AvailabilityCheckError; use crate::BeaconChainError; use derivative::Derivative; use state_processing::per_block_processing::eip4844::eip4844::verify_kzg_commitments_against_transactions; -use types::blob_sidecar::BlobSidecarArcList; +use types::blob_sidecar::BlobSidecarList; use types::{ BeaconBlockRef, BeaconStateError, BlobSidecar, BlobSidecarList, Epoch, EthSpec, Hash256, KzgCommitment, SignedBeaconBlock, SignedBeaconBlockHeader, SignedBlobSidecar, Slot, @@ -392,7 +392,7 @@ impl AvailableBlock { &self.0.block } - pub fn blobs(&self) -> Option> { + pub fn blobs(&self) -> Option> { match &self.0.blobs { VerifiedBlobs::EmptyBlobs | VerifiedBlobs::NotRequired | VerifiedBlobs::PreEip4844 => { None @@ -401,7 +401,7 @@ impl AvailableBlock { } } - pub fn deconstruct(self) -> (Arc>, Option>) { + pub fn deconstruct(self) -> (Arc>, Option>) { match self.0.blobs { VerifiedBlobs::EmptyBlobs | VerifiedBlobs::NotRequired | VerifiedBlobs::PreEip4844 => { (self.0.block, None) @@ -415,7 +415,7 @@ impl AvailableBlock { #[derivative(Hash(bound = "E: EthSpec"))] pub enum VerifiedBlobs { /// These blobs are available. - Available(BlobSidecarArcList), + Available(BlobSidecarList), /// This block is from outside the data availability boundary so doesn't require /// a data availability check. NotRequired, diff --git a/beacon_node/beacon_chain/src/early_attester_cache.rs b/beacon_node/beacon_chain/src/early_attester_cache.rs index 2520af41a2..7f32595dc3 100644 --- a/beacon_node/beacon_chain/src/early_attester_cache.rs +++ b/beacon_node/beacon_chain/src/early_attester_cache.rs @@ -6,7 +6,7 @@ use crate::{ use parking_lot::RwLock; use proto_array::Block as ProtoBlock; use std::sync::Arc; -use types::blob_sidecar::BlobSidecarArcList; +use types::blob_sidecar::BlobSidecarList; use types::*; pub struct CacheItem { @@ -23,7 +23,7 @@ pub struct CacheItem { */ block: Arc>, //TODO(sean) remove this and just use the da checker?' - blobs: Option>, + blobs: Option>, proto_block: ProtoBlock, } @@ -162,7 +162,7 @@ impl EarlyAttesterCache { } /// Returns the blobs, if `block_root` matches the cached item. - pub fn get_blobs(&self, block_root: Hash256) -> Option> { + pub fn get_blobs(&self, block_root: Hash256) -> Option> { self.item .read() .as_ref() diff --git a/beacon_node/store/src/hot_cold_store.rs b/beacon_node/store/src/hot_cold_store.rs index c833c2d345..83d995833a 100644 --- a/beacon_node/store/src/hot_cold_store.rs +++ b/beacon_node/store/src/hot_cold_store.rs @@ -38,7 +38,7 @@ use std::marker::PhantomData; use std::path::{Path, PathBuf}; use std::sync::Arc; use std::time::Duration; -use types::blob_sidecar::BlobSidecarArcList; +use types::blob_sidecar::BlobSidecarList; use types::consts::eip4844::MIN_EPOCHS_FOR_BLOBS_SIDECARS_REQUESTS; use types::*; @@ -67,7 +67,7 @@ pub struct HotColdDB, Cold: ItemStore> { /// The hot database also contains all blocks. pub hot_db: Hot, /// LRU cache of deserialized blobs. Updated whenever a blob is loaded. - blob_cache: Mutex>>, + blob_cache: Mutex>>, /// LRU cache of deserialized blocks. Updated whenever a block is loaded. block_cache: Mutex>>, /// Chain spec. @@ -572,7 +572,7 @@ impl, Cold: ItemStore> HotColdDB pub fn put_blobs( &self, block_root: &Hash256, - blobs: BlobSidecarArcList, + blobs: BlobSidecarList, ) -> Result<(), Error> { let blobs_db = self.blobs_db.as_ref().unwrap_or(&self.cold_db); blobs_db.put_bytes( @@ -587,7 +587,7 @@ impl, Cold: ItemStore> HotColdDB pub fn blobs_as_kv_store_ops( &self, key: &Hash256, - blobs: &BlobSidecarArcList, + blobs: &BlobSidecarList, ops: &mut Vec, ) { let db_key = get_key_for_col(DBColumn::BeaconBlob.into(), key.as_bytes()); @@ -1325,12 +1325,12 @@ impl, Cold: ItemStore> HotColdDB } /// Fetch a blobs sidecar from the store. - pub fn get_blobs(&self, block_root: &Hash256) -> Result>, Error> { + pub fn get_blobs(&self, block_root: &Hash256) -> Result>, Error> { let blobs_db = self.blobs_db.as_ref().unwrap_or(&self.cold_db); match blobs_db.get_bytes(DBColumn::BeaconBlob.into(), block_root.as_bytes())? { Some(ref blobs_bytes) => { - let blobs = BlobSidecarArcList::from_ssz_bytes(blobs_bytes)?; + let blobs = BlobSidecarList::from_ssz_bytes(blobs_bytes)?; // FIXME(sean) I was attempting to use a blob cache here but was getting deadlocks, // may want to attempt to use one again self.blob_cache.lock().put(*block_root, blobs.clone()); diff --git a/beacon_node/store/src/lib.rs b/beacon_node/store/src/lib.rs index bcda5b97bf..47f0049fc2 100644 --- a/beacon_node/store/src/lib.rs +++ b/beacon_node/store/src/lib.rs @@ -43,7 +43,7 @@ pub use metrics::scrape_for_metrics; use parking_lot::MutexGuard; use std::sync::Arc; use strum::{EnumString, IntoStaticStr}; -use types::blob_sidecar::BlobSidecarArcList; +use types::blob_sidecar::BlobSidecarList; pub use types::*; pub type ColumnIter<'a> = Box), Error>> + 'a>; @@ -160,7 +160,7 @@ pub trait ItemStore: KeyValueStore + Sync + Send + Sized + 'stati pub enum StoreOp<'a, E: EthSpec> { PutBlock(Hash256, Arc>), PutState(Hash256, &'a BeaconState), - PutBlobs(Hash256, BlobSidecarArcList), + PutBlobs(Hash256, BlobSidecarList), PutOrphanedBlobsKey(Hash256), PutStateSummary(Hash256, HotStateSummary), PutStateTemporaryFlag(Hash256), diff --git a/consensus/types/src/blob_sidecar.rs b/consensus/types/src/blob_sidecar.rs index b71c0c91c7..4d23771daa 100644 --- a/consensus/types/src/blob_sidecar.rs +++ b/consensus/types/src/blob_sidecar.rs @@ -49,7 +49,7 @@ pub struct BlobSidecar { pub type BlobSidecarList = VariableList, ::MaxBlobsPerBlock>; //TODO(sean) is there any other way around this? need it arc blobs for caching in multiple places -pub type BlobSidecarArcList = +pub type BlobSidecarList = VariableList>, ::MaxBlobsPerBlock>; pub type Blobs = VariableList, ::MaxExtraDataBytes>;