xcm-emulator tests: remove dependency on polkadot-service full-node (#3323)

Don't bring the full polkadot node (with all its dependencies) in
`emulated-integration-tests-common` crate and deps.
This commit is contained in:
Adrian Catangiu
2024-02-15 12:13:19 +02:00
committed by GitHub
parent 5cfc05d518
commit f60486047f
5 changed files with 19 additions and 9 deletions
Generated
+1 -1
View File
@@ -4906,10 +4906,10 @@ dependencies = [
"paste", "paste",
"polkadot-primitives", "polkadot-primitives",
"polkadot-runtime-parachains", "polkadot-runtime-parachains",
"polkadot-service",
"sc-consensus-grandpa", "sc-consensus-grandpa",
"sp-authority-discovery", "sp-authority-discovery",
"sp-consensus-babe", "sp-consensus-babe",
"sp-consensus-beefy",
"sp-core", "sp-core",
"sp-runtime", "sp-runtime",
"staging-xcm", "staging-xcm",
@@ -25,8 +25,7 @@ use polkadot_primitives::{AssignmentId, ValidatorId};
// Cumulus // Cumulus
use emulated_integration_tests_common::{ use emulated_integration_tests_common::{
accounts, build_genesis_storage, get_account_id_from_seed, get_from_seed, get_host_config, accounts, build_genesis_storage, get_account_id_from_seed, get_host_config, validators,
validators,
}; };
use parachains_common::Balance; use parachains_common::Balance;
use rococo_runtime_constants::currency::UNITS as ROC; use rococo_runtime_constants::currency::UNITS as ROC;
@@ -71,7 +70,7 @@ pub fn genesis() -> Storage {
x.4.clone(), x.4.clone(),
x.5.clone(), x.5.clone(),
x.6.clone(), x.6.clone(),
get_from_seed::<BeefyId>("Alice"), x.7.clone(),
), ),
) )
}) })
@@ -26,7 +26,7 @@ use polkadot_primitives::{AssignmentId, ValidatorId};
// Cumulus // Cumulus
use emulated_integration_tests_common::{ use emulated_integration_tests_common::{
accounts, build_genesis_storage, get_from_seed, get_host_config, validators, accounts, build_genesis_storage, get_host_config, validators,
}; };
use parachains_common::Balance; use parachains_common::Balance;
use westend_runtime_constants::currency::UNITS as WND; use westend_runtime_constants::currency::UNITS as WND;
@@ -72,7 +72,7 @@ pub fn genesis() -> Storage {
x.4.clone(), x.4.clone(),
x.5.clone(), x.5.clone(),
x.6.clone(), x.6.clone(),
get_from_seed::<BeefyId>("Alice"), x.7.clone(),
), ),
) )
}) })
@@ -14,6 +14,7 @@ codec = { package = "parity-scale-codec", version = "3.4.0", default-features =
paste = "1.0.14" paste = "1.0.14"
# Substrate # Substrate
beefy-primitives = { package = "sp-consensus-beefy", path = "../../../../../substrate/primitives/consensus/beefy" }
grandpa = { package = "sc-consensus-grandpa", path = "../../../../../substrate/client/consensus/grandpa" } grandpa = { package = "sc-consensus-grandpa", path = "../../../../../substrate/client/consensus/grandpa" }
sp-authority-discovery = { path = "../../../../../substrate/primitives/authority-discovery" } sp-authority-discovery = { path = "../../../../../substrate/primitives/authority-discovery" }
sp-runtime = { path = "../../../../../substrate/primitives/runtime" } sp-runtime = { path = "../../../../../substrate/primitives/runtime" }
@@ -25,7 +26,6 @@ pallet-balances = { path = "../../../../../substrate/frame/balances" }
pallet-message-queue = { path = "../../../../../substrate/frame/message-queue" } pallet-message-queue = { path = "../../../../../substrate/frame/message-queue" }
# Polkadot # Polkadot
polkadot-service = { path = "../../../../../polkadot/node/service", default-features = false, features = ["full-node"] }
polkadot-primitives = { path = "../../../../../polkadot/primitives" } polkadot-primitives = { path = "../../../../../polkadot/primitives" }
polkadot-runtime-parachains = { path = "../../../../../polkadot/runtime/parachains" } polkadot-runtime-parachains = { path = "../../../../../polkadot/runtime/parachains" }
xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm" } xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm" }
@@ -20,6 +20,7 @@ pub mod xcm_helpers;
pub use xcm_emulator; pub use xcm_emulator;
// Substrate // Substrate
use beefy_primitives::ecdsa_crypto::AuthorityId as BeefyId;
use grandpa::AuthorityId as GrandpaId; use grandpa::AuthorityId as GrandpaId;
use sp_authority_discovery::AuthorityId as AuthorityDiscoveryId; use sp_authority_discovery::AuthorityId as AuthorityDiscoveryId;
use sp_consensus_babe::AuthorityId as BabeId; use sp_consensus_babe::AuthorityId as BabeId;
@@ -36,7 +37,6 @@ use polkadot_runtime_parachains::configuration::HostConfiguration;
// Cumulus // Cumulus
use parachains_common::{AccountId, AuraId}; use parachains_common::{AccountId, AuraId};
use polkadot_primitives::{AssignmentId, ValidatorId}; use polkadot_primitives::{AssignmentId, ValidatorId};
use polkadot_service::chain_spec::get_authority_keys_from_seed_no_beefy;
pub const XCM_V2: u32 = 2; pub const XCM_V2: u32 = 2;
pub const XCM_V3: u32 = 3; pub const XCM_V3: u32 = 3;
@@ -152,7 +152,18 @@ pub mod validators {
ValidatorId, ValidatorId,
AssignmentId, AssignmentId,
AuthorityDiscoveryId, AuthorityDiscoveryId,
BeefyId,
)> { )> {
vec![get_authority_keys_from_seed_no_beefy("Alice")] let seed = "Alice";
vec![(
get_account_id_from_seed::<sr25519::Public>(&format!("{}//stash", seed)),
get_account_id_from_seed::<sr25519::Public>(seed),
get_from_seed::<BabeId>(seed),
get_from_seed::<GrandpaId>(seed),
get_from_seed::<ValidatorId>(seed),
get_from_seed::<AssignmentId>(seed),
get_from_seed::<AuthorityDiscoveryId>(seed),
get_from_seed::<BeefyId>(seed),
)]
} }
} }