cerc-io/lighthouse
10
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

fix CI errors

Browse Source
This commit is contained in:
qu0b 2023-07-27 14:32:58 +02:00
parent 28de041527
commit c991516419
3 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
beacon_node/beacon_chain/tests/attestation_production.rs
View File

@ -134,7 +134,7 @@ async fn produces_attestations() {
assert_eq!(data.target.root, target_root, "bad target root"); assert_eq!(data.target.root, target_root, "bad target root");
let rpc_block = let rpc_block =
RpcBlock::<MainnetEthSpec>::new(Arc::new(block.clone()), blobs.clone()).unwrap(); RpcBlock::<MainnetEthSpec>::new(Arc::new(block.clone()), Some(blobs.clone())).unwrap();
let beacon_chain::data_availability_checker::MaybeAvailableBlock::Available(available_block) = chain let beacon_chain::data_availability_checker::MaybeAvailableBlock::Available(available_block) = chain
.data_availability_checker .data_availability_checker
.check_rpc_block_availability(rpc_block) .check_rpc_block_availability(rpc_block)
@ -209,7 +209,7 @@ async fn early_attester_cache_old_request() {
.get_blobs(&head.beacon_block_root) .get_blobs(&head.beacon_block_root)
.expect("should get blobs"); .expect("should get blobs");
let rpc_block = RpcBlock::<MainnetEthSpec>::new(head.beacon_block.clone(), head_blobs).unwrap(); let rpc_block = RpcBlock::<MainnetEthSpec>::new(head.beacon_block.clone(), Some(head_blobs)).unwrap();
let beacon_chain::data_availability_checker::MaybeAvailableBlock::Available(available_block) = harness.chain let beacon_chain::data_availability_checker::MaybeAvailableBlock::Available(available_block) = harness.chain
.data_availability_checker .data_availability_checker
.check_rpc_block_availability(rpc_block) .check_rpc_block_availability(rpc_block)

10
beacon_node/beacon_chain/tests/block_verification.rs
View File

@ -67,10 +67,10 @@ async fn get_chain_segment() -> (Vec<BeaconSnapshot<E>>, Vec<Option<BlobSidecarL
beacon_state: snapshot.beacon_state, beacon_state: snapshot.beacon_state,
}); });
segment_blobs.push( segment_blobs.push(
harness Some(harness
.chain .chain
.get_blobs(&snapshot.beacon_block_root) .get_blobs(&snapshot.beacon_block_root)
.unwrap(), .unwrap()),
) )
} }
(segment, segment_blobs) (segment, segment_blobs)
@ -114,8 +114,6 @@ async fn get_chain_segment_with_signed_blobs() -> (
.chain .chain
.get_blobs(&snapshot.beacon_block_root) .get_blobs(&snapshot.beacon_block_root)
.unwrap() .unwrap()
.map(|blobs| {
let blobs = blobs
.into_iter() .into_iter()
.map(|blob| { .map(|blob| {
let block_root = blob.block_root; let block_root = blob.block_root;
@ -131,9 +129,7 @@ async fn get_chain_segment_with_signed_blobs() -> (
} }
}) })
.collect::<Vec<_>>(); .collect::<Vec<_>>();
VariableList::from(blobs) segment_blobs.push(Some(VariableList::from(signed_blobs)))
});
segment_blobs.push(signed_blobs)
} }
(segment, segment_blobs) (segment, segment_blobs)
} }

4
beacon_node/beacon_chain/tests/store_tests.rs
View File

@ -2179,7 +2179,7 @@ async fn weak_subjectivity_sync() {
beacon_chain beacon_chain
.process_block( .process_block(
full_block.canonical_root(), full_block.canonical_root(),
RpcBlock::new(Arc::new(full_block), blobs).unwrap(), RpcBlock::new(Arc::new(full_block), Some(blobs)).unwrap(),
NotifyExecutionLayer::Yes, NotifyExecutionLayer::Yes,
|| Ok(()), || Ok(()),
) )
@ -2239,7 +2239,7 @@ async fn weak_subjectivity_sync() {
if let MaybeAvailableBlock::Available(block) = harness if let MaybeAvailableBlock::Available(block) = harness
.chain .chain
.data_availability_checker .data_availability_checker
.check_rpc_block_availability(RpcBlock::new(Arc::new(full_block), blobs).unwrap()) .check_rpc_block_availability(RpcBlock::new(Arc::new(full_block), Some(blobs)).unwrap())
.expect("should check availability") .expect("should check availability")
{ {
available_blocks.push(block); available_blocks.push(block);