Skip to content

Commit 12c6ef1

Browse files
committed
Fix some more tests
1 parent d37733b commit 12c6ef1

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

beacon_node/beacon_chain/tests/block_verification.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ fn update_blob_signed_header<E: EthSpec>(
206206
signed_block: &SignedBeaconBlock<E>,
207207
blobs: &mut BlobSidecarList<E>,
208208
) {
209-
for old_blob_sidecar in blobs.iter_mut() {
209+
for old_blob_sidecar in blobs.as_mut_slice().unwrap() {
210210
let new_blob = Arc::new(BlobSidecar::<E> {
211211
index: old_blob_sidecar.index,
212212
blob: old_blob_sidecar.blob.clone(),
@@ -1214,7 +1214,7 @@ async fn verify_block_for_gossip_slashing_detection() {
12141214
let slasher = Arc::new(
12151215
Slasher::open(
12161216
SlasherConfig::new(slasher_dir.path().into()),
1217-
spec,
1217+
spec.clone(),
12181218
test_logger(),
12191219
)
12201220
.unwrap(),
@@ -1238,7 +1238,7 @@ async fn verify_block_for_gossip_slashing_detection() {
12381238

12391239
if let Some((kzg_proofs, blobs)) = blobs1 {
12401240
let sidecars =
1241-
BlobSidecar::build_sidecars(blobs, verified_block.block(), kzg_proofs).unwrap();
1241+
BlobSidecar::build_sidecars(blobs, verified_block.block(), kzg_proofs, &spec).unwrap();
12421242
for sidecar in sidecars {
12431243
let blob_index = sidecar.index;
12441244
let verified_blob = harness

beacon_node/network/src/network_beacon_processor/tests.rs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ impl TestRig {
256256
assert!(beacon_processor.is_ok());
257257
let block = next_block_tuple.0;
258258
let blob_sidecars = if let Some((kzg_proofs, blobs)) = next_block_tuple.1 {
259-
Some(BlobSidecar::build_sidecars(blobs, &block, kzg_proofs).unwrap())
259+
Some(BlobSidecar::build_sidecars(blobs, &block, kzg_proofs, &chain.spec).unwrap())
260260
} else {
261261
None
262262
};
@@ -341,7 +341,7 @@ impl TestRig {
341341
}
342342
pub fn enqueue_single_lookup_rpc_blobs(&self) {
343343
if let Some(blobs) = self.next_blobs.clone() {
344-
let blobs = FixedBlobSidecarList::from(blobs.into_iter().map(Some).collect::<Vec<_>>());
344+
let blobs = FixedBlobSidecarList::new(blobs.into_iter().map(Some).collect::<Vec<_>>());
345345
self.network_beacon_processor
346346
.send_rpc_blobs(
347347
self.next_block.canonical_root(),
@@ -1100,7 +1100,12 @@ async fn test_blobs_by_range() {
11001100
.block_root_at_slot(Slot::new(slot), WhenSlotSkipped::None)
11011101
.unwrap();
11021102
blob_count += root
1103-
.map(|root| rig.chain.get_blobs(&root).unwrap_or_default().len())
1103+
.map(|root| {
1104+
rig.chain
1105+
.get_blobs(&root)
1106+
.map(|list| list.len())
1107+
.unwrap_or(0)
1108+
})
11041109
.unwrap_or(0);
11051110
}
11061111
let mut actual_count = 0;

0 commit comments

Comments
 (0)