diff --git a/runtime/dancebox/src/tests/common/xcm/constants.rs b/runtime/dancebox/src/tests/common/xcm/constants.rs index 27a236628..c9c03cb27 100644 --- a/runtime/dancebox/src/tests/common/xcm/constants.rs +++ b/runtime/dancebox/src/tests/common/xcm/constants.rs @@ -18,7 +18,6 @@ use { AccountId, AssignmentId, AuthorityDiscoveryId, ValidatorId, }, emulated_integration_tests_common::build_genesis_storage, - polkadot_service::chain_spec::get_authority_keys_from_seed_no_beefy, sc_consensus_grandpa::AuthorityId as GrandpaId, sp_consensus_babe::AuthorityId as BabeId, sp_consensus_beefy::ecdsa_crypto::AuthorityId as BeefyId, @@ -46,6 +45,29 @@ where AccountPublic::from(get_from_seed::(seed)).into_account() } +/// Helper function to generate stash, controller and session key from seed +pub fn get_authority_keys_from_seed_no_beefy( + seed: &str, +) -> ( + AccountId, + AccountId, + BabeId, + GrandpaId, + ValidatorId, + AssignmentId, + AuthorityDiscoveryId, +) { + ( + get_account_id_from_seed::(&format!("{}//stash", seed)), + get_account_id_from_seed::(seed), + get_from_seed::(seed), + get_from_seed::(seed), + get_from_seed::(seed), + get_from_seed::(seed), + get_from_seed::(seed), + ) +} + pub mod accounts { use super::*; pub const ALICE: &str = "Alice"; @@ -174,7 +196,7 @@ pub mod westend { x.0.clone(), x.1.clone(), STASH, - westend_runtime::StakerStatus::Validator, + polkadot_runtime_common::StakerStatus::Validator, ) }) .collect(), diff --git a/runtime/dancebox/src/tests/common/xcm/core_buyer.rs b/runtime/dancebox/src/tests/common/xcm/core_buyer.rs index feec99317..54465ba4b 100644 --- a/runtime/dancebox/src/tests/common/xcm/core_buyer.rs +++ b/runtime/dancebox/src/tests/common/xcm/core_buyer.rs @@ -23,7 +23,7 @@ use { *, }, }, - polkadot_runtime_parachains::assigner_on_demand as parachains_assigner_on_demand, + polkadot_runtime_parachains::on_demand as parachains_assigner_on_demand, staging_xcm::latest::{MaybeErrorCode, Response}, tp_traits::ParaId, xcm_emulator::Chain, diff --git a/runtime/dancebox/src/tests/common/xcm/core_buyer_common.rs b/runtime/dancebox/src/tests/common/xcm/core_buyer_common.rs index 7b01c81d8..7e08908d4 100644 --- a/runtime/dancebox/src/tests/common/xcm/core_buyer_common.rs +++ b/runtime/dancebox/src/tests/common/xcm/core_buyer_common.rs @@ -36,9 +36,7 @@ use { nimbus_primitives::NimbusId, pallet_xcm_core_buyer::RelayXcmWeightConfigInner, parity_scale_codec::Encode, - polkadot_runtime_parachains::{ - assigner_on_demand as parachains_assigner_on_demand, configuration, - }, + polkadot_runtime_parachains::{configuration, on_demand as parachains_assigner_on_demand}, sp_core::Pair, sp_runtime::{traits::ValidateUnsigned, AccountId32}, staging_xcm::v3::QueryId, diff --git a/runtime/dancebox/src/tests/common/xcm/force_core_buyer.rs b/runtime/dancebox/src/tests/common/xcm/force_core_buyer.rs index 965e96c61..e0c10e39f 100644 --- a/runtime/dancebox/src/tests/common/xcm/force_core_buyer.rs +++ b/runtime/dancebox/src/tests/common/xcm/force_core_buyer.rs @@ -23,7 +23,7 @@ use { *, }, }, - polkadot_runtime_parachains::assigner_on_demand as parachains_assigner_on_demand, + polkadot_runtime_parachains::on_demand as parachains_assigner_on_demand, staging_xcm::latest::{MaybeErrorCode, Response}, tp_traits::ParaId, xcm_emulator::Chain, diff --git a/runtime/relay-encoder/src/rococo.rs b/runtime/relay-encoder/src/rococo.rs index 67f9e740c..b04c9a7d4 100644 --- a/runtime/relay-encoder/src/rococo.rs +++ b/runtime/relay-encoder/src/rococo.rs @@ -35,9 +35,7 @@ pub enum OnDemandAssignmentProviderCall { #[cfg(test)] mod tests { - use { - super::*, polkadot_runtime_parachains::assigner_on_demand as parachains_assigner_on_demand, - }; + use {super::*, polkadot_runtime_parachains::on_demand as parachains_assigner_on_demand}; #[test] fn encode_place_order_allow_death() { diff --git a/runtime/relay-encoder/src/westend.rs b/runtime/relay-encoder/src/westend.rs index f5a014f71..8ccdd9a9b 100644 --- a/runtime/relay-encoder/src/westend.rs +++ b/runtime/relay-encoder/src/westend.rs @@ -35,9 +35,7 @@ pub enum OnDemandAssignmentProviderCall { #[cfg(test)] mod tests { - use { - super::*, polkadot_runtime_parachains::assigner_on_demand as parachains_assigner_on_demand, - }; + use {super::*, polkadot_runtime_parachains::on_demand as parachains_assigner_on_demand}; #[test] fn encode_place_order_allow_death() { diff --git a/solo-chains/runtime/dancelight/src/tests/collator_assignment_tests.rs b/solo-chains/runtime/dancelight/src/tests/collator_assignment_tests.rs index fff9e7271..7402ee76e 100644 --- a/solo-chains/runtime/dancelight/src/tests/collator_assignment_tests.rs +++ b/solo-chains/runtime/dancelight/src/tests/collator_assignment_tests.rs @@ -22,10 +22,12 @@ use { Configuration, ContainerRegistrar, GetCoreAllocationConfigurationImpl, Paras, Registrar, ServicesPayment, TanssiAuthorityMapping, TanssiInvulnerables, }, - cumulus_primitives_core::{relay_chain::HeadData, ParaId}, + cumulus_primitives_core::{ + relay_chain::{HeadData, SchedulerParams}, + ParaId, + }, frame_support::{assert_noop, assert_ok, dispatch::RawOrigin}, parity_scale_codec::Encode, - primitives::vstaging::SchedulerParams, runtime_common::paras_registrar, sp_consensus_aura::AURA_ENGINE_ID, sp_core::Get, diff --git a/solo-chains/runtime/dancelight/src/tests/common/mod.rs b/solo-chains/runtime/dancelight/src/tests/common/mod.rs index 4c9c13222..fbb9d068b 100644 --- a/solo-chains/runtime/dancelight/src/tests/common/mod.rs +++ b/solo-chains/runtime/dancelight/src/tests/common/mod.rs @@ -1144,7 +1144,7 @@ impl ParasInherentTestBuilder } use { - frame_support::StorageHasher, primitives::vstaging::SchedulerParams, + cumulus_primitives_core::relay_chain::SchedulerParams, frame_support::StorageHasher, tp_traits::ParathreadParams, }; diff --git a/solo-chains/runtime/dancelight/src/tests/core_scheduling_tests.rs b/solo-chains/runtime/dancelight/src/tests/core_scheduling_tests.rs index 8cb1044a2..812d88c40 100644 --- a/solo-chains/runtime/dancelight/src/tests/core_scheduling_tests.rs +++ b/solo-chains/runtime/dancelight/src/tests/core_scheduling_tests.rs @@ -21,7 +21,7 @@ use { tests::common::*, ContainerRegistrar, OnDemandAssignmentProvider, Paras, Registrar, Session, }, cumulus_primitives_core::relay_chain::{ - vstaging::SchedulerParams, AsyncBackingParams, CoreIndex, HeadData, + AsyncBackingParams, CoreIndex, HeadData, SchedulerParams, }, dancelight_runtime_constants::time::EpochDurationInBlocks, frame_support::assert_ok,