From 1c2db1747e72a0d953a69e88569fa822eb94622a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Tue, 16 Jan 2024 01:19:17 +0100
Subject: [PATCH] Some random fixes (#2936)

- Do not disable `std` feature in the integration tests
- `contracts-fixtures` test should only check for `riscv` build when the
feature is enabled
---
 .../emulated/common/Cargo.toml                | 28 +++++++++----------
 substrate/frame/contracts/fixtures/src/lib.rs |  1 +
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/cumulus/parachains/integration-tests/emulated/common/Cargo.toml b/cumulus/parachains/integration-tests/emulated/common/Cargo.toml
index 8277b3d734f..2ee91e83585 100644
--- a/cumulus/parachains/integration-tests/emulated/common/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/common/Cargo.toml
@@ -16,29 +16,29 @@ serde_json = "1.0.111"
 
 # Substrate
 grandpa = { package = "sc-consensus-grandpa", path = "../../../../../substrate/client/consensus/grandpa" }
-sp-authority-discovery = { path = "../../../../../substrate/primitives/authority-discovery", default-features = false }
-sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false }
-frame-support = { path = "../../../../../substrate/frame/support", default-features = false }
-sp-core = { path = "../../../../../substrate/primitives/core", default-features = false }
-sp-consensus-babe = { path = "../../../../../substrate/primitives/consensus/babe", default-features = false }
-pallet-assets = { path = "../../../../../substrate/frame/assets", default-features = false }
-pallet-balances = { path = "../../../../../substrate/frame/balances", default-features = false }
-pallet-message-queue = { path = "../../../../../substrate/frame/message-queue", default-features = false }
-pallet-im-online = { path = "../../../../../substrate/frame/im-online", default-features = false }
+sp-authority-discovery = { path = "../../../../../substrate/primitives/authority-discovery" }
+sp-runtime = { path = "../../../../../substrate/primitives/runtime" }
+frame-support = { path = "../../../../../substrate/frame/support" }
+sp-core = { path = "../../../../../substrate/primitives/core" }
+sp-consensus-babe = { path = "../../../../../substrate/primitives/consensus/babe" }
+pallet-assets = { path = "../../../../../substrate/frame/assets" }
+pallet-balances = { path = "../../../../../substrate/frame/balances" }
+pallet-message-queue = { path = "../../../../../substrate/frame/message-queue" }
+pallet-im-online = { path = "../../../../../substrate/frame/im-online" }
 beefy-primitives = { package = "sp-consensus-beefy", path = "../../../../../substrate/primitives/consensus/beefy" }
 
 # Polkadot
 polkadot-service = { path = "../../../../../polkadot/node/service", default-features = false, features = ["full-node"] }
-polkadot-primitives = { path = "../../../../../polkadot/primitives", default-features = false }
+polkadot-primitives = { path = "../../../../../polkadot/primitives" }
 polkadot-runtime-parachains = { path = "../../../../../polkadot/runtime/parachains" }
-xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false }
-pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false }
+xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm" }
+pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm" }
 
 # Cumulus
 parachains-common = { path = "../../../common" }
 cumulus-primitives-core = { path = "../../../../primitives/core" }
-xcm-emulator = { path = "../../../../xcm/xcm-emulator", default-features = false }
-cumulus-pallet-xcmp-queue = { path = "../../../../pallets/xcmp-queue", default-features = false }
+xcm-emulator = { path = "../../../../xcm/xcm-emulator" }
+cumulus-pallet-xcmp-queue = { path = "../../../../pallets/xcmp-queue" }
 cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system" }
 asset-test-utils = { path = "../../../runtimes/assets/test-utils" }
 
diff --git a/substrate/frame/contracts/fixtures/src/lib.rs b/substrate/frame/contracts/fixtures/src/lib.rs
index 4d850d75624..e0d9d4f8bd5 100644
--- a/substrate/frame/contracts/fixtures/src/lib.rs
+++ b/substrate/frame/contracts/fixtures/src/lib.rs
@@ -70,6 +70,7 @@ mod test {
 	fn out_dir_should_have_compiled_mocks() {
 		let out_dir: std::path::PathBuf = env!("OUT_DIR").into();
 		assert!(out_dir.join("dummy.wasm").exists());
+		#[cfg(feature = "riscv")]
 		assert!(out_dir.join("dummy.polkavm").exists());
 	}
 }
-- 
GitLab