paritytech · Szegoo · Nov 13, 2023 · Nov 14, 2023 · Nov 14, 2023 · Nov 16, 2023
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cumulus/zombienet/tests/0004-runtime_upgrade.toml b/cumulus/zombienet/tests/0004-runtime_upgrade.toml
@@ -3,7 +3,7 @@ default_image = "{{RELAY_IMAGE}}"
 default_command = "polkadot"
 default_args = [ "-lparachain=debug" ]
 
-chain = "rococo-local"
+chain = "westend-local"
 
   [[relaychain.nodes]]
   name = "alice"

diff --git a/cumulus/zombienet/tests/0004-runtime_upgrade.zndsl b/cumulus/zombienet/tests/0004-runtime_upgrade.zndsl
@@ -4,6 +4,7 @@ Creds: config
 
 alice: parachain 2000 is registered within 225 seconds
 charlie: reports block height is at least 5 within 250 seconds
+
 charlie: parachain 2000 perform upgrade with /tmp/wasm_binary_spec_version_incremented.rs.compact.compressed.wasm within 200 seconds
 dave: reports block height is at least 20 within 250 seconds
 dave: js-script ./runtime_upgrade.js within 200 seconds
diff --git a/polkadot/runtime/common/Cargo.toml b/polkadot/runtime/common/Cargo.toml
@@ -46,6 +46,7 @@ pallet-transaction-payment = { path = "../../../substrate/frame/transaction-paym
 pallet-treasury = { path = "../../../substrate/frame/treasury", default-features = false }
 pallet-asset-rate = { path = "../../../substrate/frame/asset-rate", default-features = false, optional = true }
 pallet-election-provider-multi-phase = { path = "../../../substrate/frame/election-provider-multi-phase", default-features = false }
+polkadot-parachain-primitives = { path = "../../parachain", default-features = false }
 frame-election-provider-support = { path = "../../../substrate/frame/election-provider-support", default-features = false }
 
 frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-features = false, optional = true }
@@ -57,7 +58,7 @@ runtime-parachains = { package = "polkadot-runtime-parachains", path = "../parac
 
 slot-range-helper = { path = "slot_range_helper", default-features = false }
 xcm = { package = "staging-xcm", path = "../../xcm", default-features = false }
-xcm-executor = { package = "staging-xcm-executor", path = "../../xcm/xcm-executor", default-features = false, optional = true }
+xcm-executor = { package = "staging-xcm-executor", path = "../../xcm/xcm-executor", default-features = false }
 
 pallet-xcm-benchmarks = { path = "../../xcm/pallet-xcm-benchmarks", default-features = false, optional = true }
 xcm-builder = { package = "staging-xcm-builder", path = "../../xcm/xcm-builder", default-features = false }
@@ -101,6 +102,7 @@ std = [
 	"pallet-vesting/std",
 	"pallet-xcm-benchmarks/std",
 	"parity-scale-codec/std",
+	"polkadot-parachain-primitives/std",
 	"primitives/std",
 	"runtime-parachains/std",
 	"rustc-hex/std",
@@ -138,6 +140,7 @@ runtime-benchmarks = [
 	"pallet-treasury/runtime-benchmarks",
 	"pallet-vesting/runtime-benchmarks",
 	"pallet-xcm-benchmarks/runtime-benchmarks",
+	"polkadot-parachain-primitives/runtime-benchmarks",
 	"primitives/runtime-benchmarks",
 	"runtime-parachains/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",

diff --git a/polkadot/runtime/common/src/assigned_slots/mod.rs b/polkadot/runtime/common/src/assigned_slots/mod.rs
@@ -742,6 +742,8 @@ mod tests {
 		type UnsignedPriority = ParasUnsignedPriority;
 		type QueueFootprinter = ();
 		type NextSessionRotation = crate::mock::TestNextSessionRotation;
+		type PreCodeUpgrade = ();
+		type OnCodeUpgraded = ();
 		type OnNewHead = ();
 		type AssignCoretime = ();
 	}