From 3c9fb78aa1d6b621811fc0f4d604791d8b410a4b Mon Sep 17 00:00:00 2001 From: realbigsean Date: Wed, 26 Apr 2023 17:28:24 -0400 Subject: [PATCH] compilation fix in beacon chain tests --- beacon_node/beacon_chain/src/blob_verification.rs | 11 +++++++++++ .../beacon_chain/tests/attestation_production.rs | 11 +++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/beacon_node/beacon_chain/src/blob_verification.rs b/beacon_node/beacon_chain/src/blob_verification.rs index 64e4a84b6c..e947e653f5 100644 --- a/beacon_node/beacon_chain/src/blob_verification.rs +++ b/beacon_node/beacon_chain/src/blob_verification.rs @@ -501,6 +501,17 @@ pub enum MaybeAvailableBlock { AvailabilityPending(AvailabilityPendingBlock), } +impl TryInto> for MaybeAvailableBlock { + type Error = AvailabilityCheckError; + + fn try_into(self) -> Result, Self::Error> { + match self { + Self::Available(block) => Ok(block), + Self::AvailabilityPending(_) => Err(AvailabilityCheckError::MissingBlobs), + } + } +} + /// Trait for common block operations. pub trait AsBlock { fn slot(&self) -> Slot; diff --git a/beacon_node/beacon_chain/tests/attestation_production.rs b/beacon_node/beacon_chain/tests/attestation_production.rs index feea5c7218..a45389c3c6 100644 --- a/beacon_node/beacon_chain/tests/attestation_production.rs +++ b/beacon_node/beacon_chain/tests/attestation_production.rs @@ -1,5 +1,4 @@ -#![cfg(not(debug_assertions))] - +#[cfg(not(debug_assertions))] use beacon_chain::blob_verification::BlockWrapper; use beacon_chain::test_utils::{AttestationStrategy, BeaconChainHarness, BlockStrategy}; use beacon_chain::{StateSkipConfig, WhenSlotSkipped}; @@ -135,7 +134,9 @@ async fn produces_attestations() { let block_wrapper: BlockWrapper = Arc::new(block.clone()).into(); let available_block = chain .data_availability_checker - .try_check_availability(block_wrapper) + .check_availability(block_wrapper) + .unwrap() + .try_into() .unwrap(); let early_attestation = { @@ -203,7 +204,9 @@ async fn early_attester_cache_old_request() { let available_block = harness .chain .data_availability_checker - .try_check_availability(block_wrapper) + .check_availability(block_wrapper) + .unwrap() + .try_into() .unwrap(); harness