mirror of
https://github.com/sigp/lighthouse.git
synced 2026-05-08 09:16:00 +00:00
Fix some more tests
This commit is contained in:
@@ -206,7 +206,7 @@ fn update_blob_signed_header<E: EthSpec>(
|
|||||||
signed_block: &SignedBeaconBlock<E>,
|
signed_block: &SignedBeaconBlock<E>,
|
||||||
blobs: &mut BlobSidecarList<E>,
|
blobs: &mut BlobSidecarList<E>,
|
||||||
) {
|
) {
|
||||||
for old_blob_sidecar in blobs.iter_mut() {
|
for old_blob_sidecar in blobs.as_mut_slice().unwrap() {
|
||||||
let new_blob = Arc::new(BlobSidecar::<E> {
|
let new_blob = Arc::new(BlobSidecar::<E> {
|
||||||
index: old_blob_sidecar.index,
|
index: old_blob_sidecar.index,
|
||||||
blob: old_blob_sidecar.blob.clone(),
|
blob: old_blob_sidecar.blob.clone(),
|
||||||
@@ -1214,7 +1214,7 @@ async fn verify_block_for_gossip_slashing_detection() {
|
|||||||
let slasher = Arc::new(
|
let slasher = Arc::new(
|
||||||
Slasher::open(
|
Slasher::open(
|
||||||
SlasherConfig::new(slasher_dir.path().into()),
|
SlasherConfig::new(slasher_dir.path().into()),
|
||||||
spec,
|
spec.clone(),
|
||||||
test_logger(),
|
test_logger(),
|
||||||
)
|
)
|
||||||
.unwrap(),
|
.unwrap(),
|
||||||
@@ -1238,7 +1238,7 @@ async fn verify_block_for_gossip_slashing_detection() {
|
|||||||
|
|
||||||
if let Some((kzg_proofs, blobs)) = blobs1 {
|
if let Some((kzg_proofs, blobs)) = blobs1 {
|
||||||
let sidecars =
|
let sidecars =
|
||||||
BlobSidecar::build_sidecars(blobs, verified_block.block(), kzg_proofs).unwrap();
|
BlobSidecar::build_sidecars(blobs, verified_block.block(), kzg_proofs, &spec).unwrap();
|
||||||
for sidecar in sidecars {
|
for sidecar in sidecars {
|
||||||
let blob_index = sidecar.index;
|
let blob_index = sidecar.index;
|
||||||
let verified_blob = harness
|
let verified_blob = harness
|
||||||
|
|||||||
@@ -256,7 +256,7 @@ impl TestRig {
|
|||||||
assert!(beacon_processor.is_ok());
|
assert!(beacon_processor.is_ok());
|
||||||
let block = next_block_tuple.0;
|
let block = next_block_tuple.0;
|
||||||
let blob_sidecars = if let Some((kzg_proofs, blobs)) = next_block_tuple.1 {
|
let blob_sidecars = if let Some((kzg_proofs, blobs)) = next_block_tuple.1 {
|
||||||
Some(BlobSidecar::build_sidecars(blobs, &block, kzg_proofs).unwrap())
|
Some(BlobSidecar::build_sidecars(blobs, &block, kzg_proofs, &chain.spec).unwrap())
|
||||||
} else {
|
} else {
|
||||||
None
|
None
|
||||||
};
|
};
|
||||||
@@ -341,7 +341,7 @@ impl TestRig {
|
|||||||
}
|
}
|
||||||
pub fn enqueue_single_lookup_rpc_blobs(&self) {
|
pub fn enqueue_single_lookup_rpc_blobs(&self) {
|
||||||
if let Some(blobs) = self.next_blobs.clone() {
|
if let Some(blobs) = self.next_blobs.clone() {
|
||||||
let blobs = FixedBlobSidecarList::from(blobs.into_iter().map(Some).collect::<Vec<_>>());
|
let blobs = FixedBlobSidecarList::new(blobs.into_iter().map(Some).collect::<Vec<_>>());
|
||||||
self.network_beacon_processor
|
self.network_beacon_processor
|
||||||
.send_rpc_blobs(
|
.send_rpc_blobs(
|
||||||
self.next_block.canonical_root(),
|
self.next_block.canonical_root(),
|
||||||
@@ -1100,7 +1100,12 @@ async fn test_blobs_by_range() {
|
|||||||
.block_root_at_slot(Slot::new(slot), WhenSlotSkipped::None)
|
.block_root_at_slot(Slot::new(slot), WhenSlotSkipped::None)
|
||||||
.unwrap();
|
.unwrap();
|
||||||
blob_count += root
|
blob_count += root
|
||||||
.map(|root| rig.chain.get_blobs(&root).unwrap_or_default().len())
|
.map(|root| {
|
||||||
|
rig.chain
|
||||||
|
.get_blobs(&root)
|
||||||
|
.map(|list| list.len())
|
||||||
|
.unwrap_or(0)
|
||||||
|
})
|
||||||
.unwrap_or(0);
|
.unwrap_or(0);
|
||||||
}
|
}
|
||||||
let mut actual_count = 0;
|
let mut actual_count = 0;
|
||||||
|
|||||||
Reference in New Issue
Block a user