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

Fix rebase conflicts

Browse Source
This commit is contained in:
Emilia Hane
2023-02-01 17:55:24 +01:00
parent 72cd68c0a4
commit ca934b7cb5
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
beacon_node/store/src/hot_cold_store.rs
View File

@@ -237,11 +237,15 @@ impl<E: EthSpec> HotColdDB<E, LevelDB<E>, LevelDB<E>> {
if let Some(path) = blobs_db_path {
let new_blob_info = if open_blobs_db {
db.blobs_db = Some(LevelDB::open(path.as_path())?);
Some(BlobInfo { blobs_db: true })
let mut new_blob_info = blob_info.clone().unwrap_or_default();
new_blob_info.blobs_db = true;
new_blob_info
} else {
Some(BlobInfo { blobs_db: false })
let mut new_blob_info = blob_info.clone().unwrap_or_default();
new_blob_info.blobs_db = false;
new_blob_info
};
db.compare_and_set_blob_info_with_write(blob_info, new_blob_info)?;
db.compare_and_set_blob_info_with_write(blob_info, Some(new_blob_info))?;
info!(
db.log,
"Blobs DB initialized";

2
beacon_node/store/src/metadata.rs
View File

@@ -126,6 +126,8 @@ pub struct BlobInfo {
pub oldest_blob_slot: Option<Slot>,
/// A separate blobs database is in use.
pub blobs_db: bool,
/// The slot after which blobs are available (>=).
pub oldest_blob_slot: Option<Slot>,
}
impl StoreItem for BlobInfo {