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

Merge branch 'some-blob-reprocessing-work' of https://github.com/realbigsean/lighthouse into some-blob-reprocessing-work

Browse Source
This commit is contained in:
realbigsean
2023-06-07 14:34:29 -04:00
parent e6b0754f06 584eb6ece5
commit ad422c3485
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
beacon_node/beacon_chain/src/data_availability_checker/overflow_lru_cache.rs
View File

@@ -1437,18 +1437,19 @@ mod test {
.cloned() .cloned()
.expect("kzg should exist"); .expect("kzg should exist");
let mut kzg_verified_blobs = vec![];
for _ in 0..(n_epochs * capacity) { for _ in 0..(n_epochs * capacity) {
let pending_block = pending_blocks.pop_front().expect("should have block"); let pending_block = pending_blocks.pop_front().expect("should have block");
let mut pending_block_blobs = pending_blobs.pop_front().expect("should have blobs");
let block_root = pending_block.block.as_block().canonical_root(); let block_root = pending_block.block.as_block().canonical_root();
let expected_blobs = pending_block.num_blobs_expected(); let expected_blobs = pending_block.num_blobs_expected();
if expected_blobs > 1 { if expected_blobs > 1 {
// might as well add a blob too // might as well add a blob too
let mut pending_blobs = pending_blobs.pop_front().expect("should have blobs"); let one_blob = pending_block_blobs
let one_blob = pending_blobs.pop().expect("should have at least one blob"); .pop()
.expect("should have at least one blob");
let kzg_verified_blob = verify_kzg_for_blob(one_blob.to_blob(), kzg.as_ref()) let kzg_verified_blob = verify_kzg_for_blob(one_blob.to_blob(), kzg.as_ref())
.expect("kzg should verify"); .expect("kzg should verify");
kzg_verified_blobs.push(kzg_verified_blob); let kzg_verified_blobs = vec![kzg_verified_blob];
// generate random boolean // generate random boolean
let block_first = (rand::random::<usize>() % 2) == 0; let block_first = (rand::random::<usize>() % 2) == 0;
if block_first { if block_first {
@@ -1486,8 +1487,6 @@ mod test {
); );
} }
} else { } else {
// still need to pop front so the blob count is correct
pending_blobs.pop_front().expect("should have blobs");
let availability = cache let availability = cache
.put_pending_executed_block(pending_block) .put_pending_executed_block(pending_block)
.expect("should put block"); .expect("should put block");
@@ -1591,21 +1590,21 @@ mod test {
.expect("kzg should exist"); .expect("kzg should exist");
let mut remaining_blobs = HashMap::new(); let mut remaining_blobs = HashMap::new();
let mut kzg_verified_blobs = vec![];
for _ in 0..(n_epochs * capacity) { for _ in 0..(n_epochs * capacity) {
let pending_block = pending_blocks.pop_front().expect("should have block"); let pending_block = pending_blocks.pop_front().expect("should have block");
let mut pending_block_blobs = pending_blobs.pop_front().expect("should have blobs");
let block_root = pending_block.block.as_block().canonical_root(); let block_root = pending_block.block.as_block().canonical_root();
let expected_blobs = pending_block.num_blobs_expected(); let expected_blobs = pending_block.num_blobs_expected();
if expected_blobs > 1 { if expected_blobs > 1 {
// might as well add a blob too // might as well add a blob too
let mut pending_blobs = pending_blobs.pop_front().expect("should have blobs"); let one_blob = pending_block_blobs
let one_blob = pending_blobs.pop().expect("should have at least one blob"); .pop()
.expect("should have at least one blob");
let kzg_verified_blob = verify_kzg_for_blob(one_blob.to_blob(), kzg.as_ref()) let kzg_verified_blob = verify_kzg_for_blob(one_blob.to_blob(), kzg.as_ref())
.expect("kzg should verify"); .expect("kzg should verify");
kzg_verified_blobs.push(kzg_verified_blob); let kzg_verified_blobs = vec![kzg_verified_blob];
// generate random boolean // generate random boolean
let block_first = (rand::random::<usize>() % 2) == 0; let block_first = (rand::random::<usize>() % 2) == 0;
remaining_blobs.insert(block_root, pending_blobs);
if block_first { if block_first {
let availability = cache let availability = cache
.put_pending_executed_block(pending_block) .put_pending_executed_block(pending_block)
@@ -1641,9 +1640,6 @@ mod test {
); );
} }
} else { } else {
// still need to pop front so the blob count is correct
let pending_blobs = pending_blobs.pop_front().expect("should have blobs");
remaining_blobs.insert(block_root, pending_blobs);
let availability = cache let availability = cache
.put_pending_executed_block(pending_block) .put_pending_executed_block(pending_block)
.expect("should put block"); .expect("should put block");
@@ -1652,6 +1648,7 @@ mod test {
"should be pending blobs" "should be pending blobs"
); );
} }
remaining_blobs.insert(block_root, pending_block_blobs);
} }
// now we should have a full cache spanning multiple epochs // now we should have a full cache spanning multiple epochs