Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
Feb 15, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions cumulus/parachains/integration-tests/emulated/chains/relays/rococo/src/genesis.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ use polkadot_primitives::{AssignmentId, ValidatorId};

// Cumulus
use emulated_integration_tests_common::{
accounts, build_genesis_storage, get_account_id_from_seed, get_from_seed, get_host_config,
validators,
accounts, build_genesis_storage, get_account_id_from_seed, get_host_config, validators,
};
use parachains_common::Balance;
use rococo_runtime_constants::currency::UNITS as ROC;
Expand Down Expand Up @@ -71,7 +70,7 @@ pub fn genesis() -> Storage {
x.4.clone(),
x.5.clone(),
x.6.clone(),
get_from_seed::<BeefyId>("Alice"),
x.7.clone(),
),
)
})
Expand Down
4 changes: 2 additions & 2 deletions cumulus/parachains/integration-tests/emulated/chains/relays/westend/src/genesis.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ use polkadot_primitives::{AssignmentId, ValidatorId};

// Cumulus
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 westend_runtime_constants::currency::UNITS as WND;
Expand Down Expand Up @@ -72,7 +72,7 @@ pub fn genesis() -> Storage {
x.4.clone(),
x.5.clone(),
x.6.clone(),
get_from_seed::<BeefyId>("Alice"),
x.7.clone(),
),
)
})
Expand Down
2 changes: 1 addition & 1 deletion cumulus/parachains/integration-tests/emulated/common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ codec = { package = "parity-scale-codec", version = "3.4.0", default-features =
paste = "1.0.14"

# Substrate
beefy-primitives = { package = "sp-consensus-beefy", path = "../../../../../substrate/primitives/consensus/beefy" }
grandpa = { package = "sc-consensus-grandpa", path = "../../../../../substrate/client/consensus/grandpa" }
sp-authority-discovery = { path = "../../../../../substrate/primitives/authority-discovery" }
sp-runtime = { path = "../../../../../substrate/primitives/runtime" }
Expand All @@ -25,7 +26,6 @@ pallet-balances = { path = "../../../../../substrate/frame/balances" }
pallet-message-queue = { path = "../../../../../substrate/frame/message-queue" }

# Polkadot
polkadot-service = { path = "../../../../../polkadot/node/service", default-features = false, features = ["full-node"] }
polkadot-primitives = { path = "../../../../../polkadot/primitives" }
polkadot-runtime-parachains = { path = "../../../../../polkadot/runtime/parachains" }
xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm" }
Expand Down
15 changes: 13 additions & 2 deletions cumulus/parachains/integration-tests/emulated/common/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ pub mod xcm_helpers;
pub use xcm_emulator;

// Substrate
use beefy_primitives::ecdsa_crypto::AuthorityId as BeefyId;
use grandpa::AuthorityId as GrandpaId;
use sp_authority_discovery::AuthorityId as AuthorityDiscoveryId;
use sp_consensus_babe::AuthorityId as BabeId;
Expand All @@ -36,7 +37,6 @@ use polkadot_runtime_parachains::configuration::HostConfiguration;
// Cumulus
use parachains_common::{AccountId, AuraId};
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_V3: u32 = 3;
Expand Down Expand Up @@ -152,7 +152,18 @@ pub mod validators {
ValidatorId,
AssignmentId,
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),
)]
}
}
Loading