Rococo/Westend: publish claim_queue Runtime API (#4005)

Signed-off-by: Andrei Sandu <andrei-mihail@parity.io>
This commit is contained in:
Andrei Sandu
2024-04-05 18:50:43 +03:00
committed by GitHub
parent 33bbdb3cae
commit 0832f0f36d
4 changed files with 29 additions and 10 deletions
@@ -24,7 +24,7 @@ use emulated_integration_tests_common::{
// Rococo declaration // Rococo declaration
decl_test_relay_chains! { decl_test_relay_chains! {
#[api_version(10)] #[api_version(11)]
pub struct Rococo { pub struct Rococo {
genesis = genesis::genesis(), genesis = genesis::genesis(),
on_init = (), on_init = (),
@@ -24,7 +24,7 @@ use emulated_integration_tests_common::{
// Westend declaration // Westend declaration
decl_test_relay_chains! { decl_test_relay_chains! {
#[api_version(10)] #[api_version(11)]
pub struct Westend { pub struct Westend {
genesis = genesis::genesis(), genesis = genesis::genesis(),
on_init = (), on_init = (),
+14 -4
View File
@@ -29,7 +29,7 @@ use pallet_nis::WithMaximumOf;
use parity_scale_codec::{Decode, Encode, MaxEncodedLen}; use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
use primitives::{ use primitives::{
slashing, AccountId, AccountIndex, ApprovalVotingParams, Balance, BlockNumber, CandidateEvent, slashing, AccountId, AccountIndex, ApprovalVotingParams, Balance, BlockNumber, CandidateEvent,
CandidateHash, CommittedCandidateReceipt, CoreState, DisputeState, ExecutorParams, CandidateHash, CommittedCandidateReceipt, CoreIndex, CoreState, DisputeState, ExecutorParams,
GroupRotationInfo, Hash, Id as ParaId, InboundDownwardMessage, InboundHrmpMessage, Moment, GroupRotationInfo, Hash, Id as ParaId, InboundDownwardMessage, InboundHrmpMessage, Moment,
NodeFeatures, Nonce, OccupiedCoreAssumption, PersistedValidationData, ScrapedOnChainVotes, NodeFeatures, Nonce, OccupiedCoreAssumption, PersistedValidationData, ScrapedOnChainVotes,
SessionInfo, Signature, ValidationCode, ValidationCodeHash, ValidatorId, ValidatorIndex, SessionInfo, Signature, ValidationCode, ValidationCodeHash, ValidatorId, ValidatorIndex,
@@ -54,13 +54,19 @@ use runtime_parachains::{
inclusion::{AggregateMessageOrigin, UmpQueueId}, inclusion::{AggregateMessageOrigin, UmpQueueId},
initializer as parachains_initializer, origin as parachains_origin, paras as parachains_paras, initializer as parachains_initializer, origin as parachains_origin, paras as parachains_paras,
paras_inherent as parachains_paras_inherent, paras_inherent as parachains_paras_inherent,
runtime_api_impl::v10 as parachains_runtime_api_impl, runtime_api_impl::{
v10 as parachains_runtime_api_impl, vstaging as vstaging_parachains_runtime_api_impl,
},
scheduler as parachains_scheduler, session_info as parachains_session_info, scheduler as parachains_scheduler, session_info as parachains_session_info,
shared as parachains_shared, shared as parachains_shared,
}; };
use scale_info::TypeInfo; use scale_info::TypeInfo;
use sp_genesis_builder::PresetId; use sp_genesis_builder::PresetId;
use sp_std::{cmp::Ordering, collections::btree_map::BTreeMap, prelude::*}; use sp_std::{
cmp::Ordering,
collections::{btree_map::BTreeMap, vec_deque::VecDeque},
prelude::*,
};
use frame_support::{ use frame_support::{
construct_runtime, derive_impl, construct_runtime, derive_impl,
@@ -1734,7 +1740,7 @@ sp_api::impl_runtime_apis! {
} }
} }
#[api_version(10)] #[api_version(11)]
impl primitives::runtime_api::ParachainHost<Block> for Runtime { impl primitives::runtime_api::ParachainHost<Block> for Runtime {
fn validators() -> Vec<ValidatorId> { fn validators() -> Vec<ValidatorId> {
parachains_runtime_api_impl::validators::<Runtime>() parachains_runtime_api_impl::validators::<Runtime>()
@@ -1889,6 +1895,10 @@ sp_api::impl_runtime_apis! {
fn node_features() -> NodeFeatures { fn node_features() -> NodeFeatures {
parachains_runtime_api_impl::node_features::<Runtime>() parachains_runtime_api_impl::node_features::<Runtime>()
} }
fn claim_queue() -> BTreeMap<CoreIndex, VecDeque<ParaId>> {
vstaging_parachains_runtime_api_impl::claim_queue::<Runtime>()
}
} }
#[api_version(3)] #[api_version(3)]
+13 -4
View File
@@ -46,7 +46,7 @@ use pallet_transaction_payment::{FeeDetails, FungibleAdapter, RuntimeDispatchInf
use parity_scale_codec::{Decode, Encode, MaxEncodedLen}; use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
use primitives::{ use primitives::{
slashing, AccountId, AccountIndex, ApprovalVotingParams, Balance, BlockNumber, CandidateEvent, slashing, AccountId, AccountIndex, ApprovalVotingParams, Balance, BlockNumber, CandidateEvent,
CandidateHash, CommittedCandidateReceipt, CoreState, DisputeState, ExecutorParams, CandidateHash, CommittedCandidateReceipt, CoreIndex, CoreState, DisputeState, ExecutorParams,
GroupRotationInfo, Hash, Id as ParaId, InboundDownwardMessage, InboundHrmpMessage, Moment, GroupRotationInfo, Hash, Id as ParaId, InboundDownwardMessage, InboundHrmpMessage, Moment,
NodeFeatures, Nonce, OccupiedCoreAssumption, PersistedValidationData, PvfCheckStatement, NodeFeatures, Nonce, OccupiedCoreAssumption, PersistedValidationData, PvfCheckStatement,
ScrapedOnChainVotes, SessionInfo, Signature, ValidationCode, ValidationCodeHash, ValidatorId, ScrapedOnChainVotes, SessionInfo, Signature, ValidationCode, ValidationCodeHash, ValidatorId,
@@ -73,7 +73,9 @@ use runtime_parachains::{
inclusion::{AggregateMessageOrigin, UmpQueueId}, inclusion::{AggregateMessageOrigin, UmpQueueId},
initializer as parachains_initializer, origin as parachains_origin, paras as parachains_paras, initializer as parachains_initializer, origin as parachains_origin, paras as parachains_paras,
paras_inherent as parachains_paras_inherent, reward_points as parachains_reward_points, paras_inherent as parachains_paras_inherent, reward_points as parachains_reward_points,
runtime_api_impl::v10 as parachains_runtime_api_impl, runtime_api_impl::{
v10 as parachains_runtime_api_impl, vstaging as vstaging_parachains_runtime_api_impl,
},
scheduler as parachains_scheduler, session_info as parachains_session_info, scheduler as parachains_scheduler, session_info as parachains_session_info,
shared as parachains_shared, shared as parachains_shared,
}; };
@@ -91,7 +93,10 @@ use sp_runtime::{
ApplyExtrinsicResult, FixedU128, KeyTypeId, Perbill, Percent, Permill, ApplyExtrinsicResult, FixedU128, KeyTypeId, Perbill, Percent, Permill,
}; };
use sp_staking::SessionIndex; use sp_staking::SessionIndex;
use sp_std::{collections::btree_map::BTreeMap, prelude::*}; use sp_std::{
collections::{btree_map::BTreeMap, vec_deque::VecDeque},
prelude::*,
};
#[cfg(any(feature = "std", test))] #[cfg(any(feature = "std", test))]
use sp_version::NativeVersion; use sp_version::NativeVersion;
use sp_version::RuntimeVersion; use sp_version::RuntimeVersion;
@@ -1794,7 +1799,7 @@ sp_api::impl_runtime_apis! {
} }
} }
#[api_version(10)] #[api_version(11)]
impl primitives::runtime_api::ParachainHost<Block> for Runtime { impl primitives::runtime_api::ParachainHost<Block> for Runtime {
fn validators() -> Vec<ValidatorId> { fn validators() -> Vec<ValidatorId> {
parachains_runtime_api_impl::validators::<Runtime>() parachains_runtime_api_impl::validators::<Runtime>()
@@ -1949,6 +1954,10 @@ sp_api::impl_runtime_apis! {
fn node_features() -> NodeFeatures { fn node_features() -> NodeFeatures {
parachains_runtime_api_impl::node_features::<Runtime>() parachains_runtime_api_impl::node_features::<Runtime>()
} }
fn claim_queue() -> BTreeMap<CoreIndex, VecDeque<ParaId>> {
vstaging_parachains_runtime_api_impl::claim_queue::<Runtime>()
}
} }
impl beefy_primitives::BeefyApi<Block, BeefyId> for Runtime { impl beefy_primitives::BeefyApi<Block, BeefyId> for Runtime {