diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8262a76f65..924413b304 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -194,7 +194,9 @@ jobs: SNAP_AH: "../../ah-polkadot.snap" RUST_LOG: "warn" + # TODO: remove if not needed. or reuse for Paseo ahm-test-westend: + if: false runs-on: ubuntu-22.04 steps: - name: Cancel previous runs @@ -431,6 +433,5 @@ jobs: # FAIL-CI - zombienet-smoke - ecosystem-tests - ahm-test-polkadot - - ahm-test-westend steps: - run: echo '### Good job! All the tests passed 🚀' >> $GITHUB_STEP_SUMMARY diff --git a/Cargo.lock b/Cargo.lock index 266e5252c0..13e067b01c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -9593,10 +9593,8 @@ dependencies = [ "cumulus-primitives-core", "emulated-integration-tests-common", "frame-support", - "kusama-emulated-chain", "parachains-common", "penpal-runtime", - "polkadot-emulated-chain", "sp-core 34.0.0", "staging-xcm", ] @@ -10163,7 +10161,6 @@ dependencies = [ "frame-try-runtime", "hex-literal", "log", - "pallet-ah-migrator", "pallet-asset-rate", "pallet-authority-discovery", "pallet-authorship", diff --git a/Cargo.toml b/Cargo.toml index 04adb70442..3a051fe887 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -192,7 +192,7 @@ polkadot-core-primitives = { version = "15.0.0", default-features = false } polkadot-emulated-chain = { path = "integration-tests/emulated/chains/relays/polkadot" } polkadot-parachain-primitives = { version = "14.0.0", default-features = false } polkadot-primitives = { version = "16.0.0", default-features = false } -polkadot-runtime = { path = "relay/polkadot", default-features = false } +polkadot-runtime = { path = "relay/polkadot" } polkadot-runtime-common = { version = "17.0.0", default-features = false } polkadot-runtime-constants = { path = "relay/polkadot/constants", default-features = false } polkadot-system-emulated-network = { path = "integration-tests/emulated/networks/polkadot-system" } diff --git a/integration-tests/ahm/Cargo.toml b/integration-tests/ahm/Cargo.toml index bd0bd1f57b..2523850045 100644 --- a/integration-tests/ahm/Cargo.toml +++ b/integration-tests/ahm/Cargo.toml @@ -30,7 +30,7 @@ parachains-common = { workspace = true, default-features = true } pallet-multisig = { workspace = true, default-features = true } polkadot-parachain-primitives = { workspace = true, default-features = true } polkadot-primitives = { workspace = true, default-features = true } -polkadot-runtime = { workspace = true, default-features = true } +polkadot-runtime = { workspace = true } polkadot-runtime-common = { workspace = true, default-features = true } polkadot-runtime-constants = { workspace = true, default-features = true } remote-externalities = { workspace = true } diff --git a/integration-tests/emulated/chains/parachains/testing/penpal/Cargo.toml b/integration-tests/emulated/chains/parachains/testing/penpal/Cargo.toml index b31580dd63..10ad69db57 100644 --- a/integration-tests/emulated/chains/parachains/testing/penpal/Cargo.toml +++ b/integration-tests/emulated/chains/parachains/testing/penpal/Cargo.toml @@ -20,10 +20,6 @@ emulated-integration-tests-common = { workspace = true } penpal-runtime = { workspace = true } xcm = { workspace = true, default-features = true } -# Runtimes -kusama-emulated-chain = { workspace = true } -polkadot-emulated-chain = { workspace = true } - [features] runtime-benchmarks = [ "cumulus-primitives-core/runtime-benchmarks", diff --git a/relay/polkadot/Cargo.toml b/relay/polkadot/Cargo.toml index 424087d722..e7122ccdec 100644 --- a/relay/polkadot/Cargo.toml +++ b/relay/polkadot/Cargo.toml @@ -11,7 +11,6 @@ license.workspace = true # Asset Hub Migration concerning deps pallet-rc-migrator = { workspace = true, features = ["ahm-polkadot"] } -pallet-ah-migrator = { workspace = true, features = ["ahm-polkadot"] } # End: Asset Hub Migration concerning deps codec = { features = ["derive", "max-encoded-len"], workspace = true } @@ -154,7 +153,6 @@ std = [ "frame-system/std", "frame-try-runtime/std", "log/std", - "pallet-ah-migrator/std", "pallet-asset-rate/std", "pallet-authority-discovery/std", "pallet-authorship/std", @@ -243,7 +241,6 @@ runtime-benchmarks = [ "frame-support/runtime-benchmarks", "frame-system-benchmarking/runtime-benchmarks", "frame-system/runtime-benchmarks", - "pallet-ah-migrator/runtime-benchmarks", "pallet-asset-rate/runtime-benchmarks", "pallet-babe/runtime-benchmarks", "pallet-bags-list/runtime-benchmarks", @@ -301,7 +298,6 @@ try-runtime = [ "frame-system/try-runtime", "frame-try-runtime", "frame-try-runtime/try-runtime", - "pallet-ah-migrator/try-runtime", "pallet-asset-rate/try-runtime", "pallet-authority-discovery/try-runtime", "pallet-authorship/try-runtime", diff --git a/relay/polkadot/src/genesis_config_presets.rs b/relay/polkadot/src/genesis_config_presets.rs index 63717f69e5..75b0a614c6 100644 --- a/relay/polkadot/src/genesis_config_presets.rs +++ b/relay/polkadot/src/genesis_config_presets.rs @@ -16,7 +16,11 @@ //! Genesis configs presets for the Polkadot runtime +extern crate alloc; + use crate::*; +#[cfg(not(feature = "std"))] +use alloc::format; use babe_primitives::AuthorityId as BabeId; use pallet_staking::{Forcing, StakerStatus}; use polkadot_primitives::{AccountPublic, AssignmentId, AsyncBackingParams}; @@ -25,9 +29,6 @@ use runtime_parachains::configuration::HostConfiguration; use sp_core::{sr25519, Pair, Public}; use sp_genesis_builder::PresetId; use sp_runtime::{traits::IdentifyAccount, Perbill}; -#[cfg(not(feature = "std"))] -use sp_std::alloc::format; -use sp_std::vec::Vec; /// Helper function to generate a crypto pair from seed fn get_from_seed(seed: &str) -> ::Public { diff --git a/relay/polkadot/src/weights/pallet_ah_migrator.rs b/relay/polkadot/src/weights/pallet_ah_migrator.rs index 2aeed1a68d..3a47bd996b 100644 --- a/relay/polkadot/src/weights/pallet_ah_migrator.rs +++ b/relay/polkadot/src/weights/pallet_ah_migrator.rs @@ -47,7 +47,7 @@ use core::marker::PhantomData; /// Weight functions for `pallet_ah_migrator`. pub struct WeightInfo(PhantomData); -impl pallet_ah_migrator::WeightInfo for WeightInfo { +impl pallet_rc_migrator::weights_ah::WeightInfo for WeightInfo { /// Storage: `AhMigrator::DmpDataMessageCounts` (r:1 w:0) /// Proof: `AhMigrator::DmpDataMessageCounts` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`) /// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)