diff --git a/availability-store/src/worker.rs b/availability-store/src/worker.rs index d7461cea5290..539b08548c59 100644 --- a/availability-store/src/worker.rs +++ b/availability-store/src/worker.rs @@ -22,7 +22,7 @@ use std::thread; use log::{error, info, trace, warn}; use sp_blockchain::{Result as ClientResult}; use sp_runtime::traits::{Header as HeaderT, ProvideRuntimeApi}; -use sp_api::{ApiExt, ApiErrorFor}; +use sp_api::ApiExt; use client::{ BlockchainEvents, BlockBody, blockchain::ProvideCache, @@ -214,20 +214,9 @@ where { let extrinsics = client.block_body(block)?; Ok(match extrinsics { - Some(extrinsics) => { - let api = client.runtime_api(); - - if api.has_api_with::>, _>( - parent, - |version| version >= 2, - ).map_err(|_| ConsensusError::ChainLookup("outdated runtime API".into()))? { - api.get_heads(&parent, extrinsics) - .map_err(|_| ConsensusError::ChainLookup("".into()))? - .map(|v| v.into_iter()) - } else { - None - } - } + Some(extrinsics) => client.runtime_api() + .get_heads(&parent, extrinsics).map_err(|_| ConsensusError::ChainLookup("".into()))? + .and_then(|v| Some(v.into_iter())), None => None, }) } diff --git a/primitives/src/parachain.rs b/primitives/src/parachain.rs index 91731fd547fb..66be2352c7fc 100644 --- a/primitives/src/parachain.rs +++ b/primitives/src/parachain.rs @@ -591,7 +591,6 @@ use runtime_primitives::traits::{Block as BlockT}; sp_api::decl_runtime_apis! { /// The API for querying the state of parachains on-chain. - #[api_version(2)] pub trait ParachainHost { /// Get the current validators. fn validators() -> Vec;