Skip to content

Commit 1c2db17

Browse files
authored
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
1 parent 0c166ae commit 1c2db17

File tree

2 files changed

+15
-14
lines changed
  • cumulus/parachains/integration-tests/emulated/common
  • substrate/frame/contracts/fixtures/src

2 files changed

+15
-14
lines changed

cumulus/parachains/integration-tests/emulated/common/Cargo.toml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,29 +16,29 @@ serde_json = "1.0.111"
1616

1717
# Substrate
1818
grandpa = { package = "sc-consensus-grandpa", path = "../../../../../substrate/client/consensus/grandpa" }
19-
sp-authority-discovery = { path = "../../../../../substrate/primitives/authority-discovery", default-features = false }
20-
sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false }
21-
frame-support = { path = "../../../../../substrate/frame/support", default-features = false }
22-
sp-core = { path = "../../../../../substrate/primitives/core", default-features = false }
23-
sp-consensus-babe = { path = "../../../../../substrate/primitives/consensus/babe", default-features = false }
24-
pallet-assets = { path = "../../../../../substrate/frame/assets", default-features = false }
25-
pallet-balances = { path = "../../../../../substrate/frame/balances", default-features = false }
26-
pallet-message-queue = { path = "../../../../../substrate/frame/message-queue", default-features = false }
27-
pallet-im-online = { path = "../../../../../substrate/frame/im-online", default-features = false }
19+
sp-authority-discovery = { path = "../../../../../substrate/primitives/authority-discovery" }
20+
sp-runtime = { path = "../../../../../substrate/primitives/runtime" }
21+
frame-support = { path = "../../../../../substrate/frame/support" }
22+
sp-core = { path = "../../../../../substrate/primitives/core" }
23+
sp-consensus-babe = { path = "../../../../../substrate/primitives/consensus/babe" }
24+
pallet-assets = { path = "../../../../../substrate/frame/assets" }
25+
pallet-balances = { path = "../../../../../substrate/frame/balances" }
26+
pallet-message-queue = { path = "../../../../../substrate/frame/message-queue" }
27+
pallet-im-online = { path = "../../../../../substrate/frame/im-online" }
2828
beefy-primitives = { package = "sp-consensus-beefy", path = "../../../../../substrate/primitives/consensus/beefy" }
2929

3030
# Polkadot
3131
polkadot-service = { path = "../../../../../polkadot/node/service", default-features = false, features = ["full-node"] }
32-
polkadot-primitives = { path = "../../../../../polkadot/primitives", default-features = false }
32+
polkadot-primitives = { path = "../../../../../polkadot/primitives" }
3333
polkadot-runtime-parachains = { path = "../../../../../polkadot/runtime/parachains" }
34-
xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false }
35-
pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false }
34+
xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm" }
35+
pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm" }
3636

3737
# Cumulus
3838
parachains-common = { path = "../../../common" }
3939
cumulus-primitives-core = { path = "../../../../primitives/core" }
40-
xcm-emulator = { path = "../../../../xcm/xcm-emulator", default-features = false }
41-
cumulus-pallet-xcmp-queue = { path = "../../../../pallets/xcmp-queue", default-features = false }
40+
xcm-emulator = { path = "../../../../xcm/xcm-emulator" }
41+
cumulus-pallet-xcmp-queue = { path = "../../../../pallets/xcmp-queue" }
4242
cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system" }
4343
asset-test-utils = { path = "../../../runtimes/assets/test-utils" }
4444

substrate/frame/contracts/fixtures/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ mod test {
7070
fn out_dir_should_have_compiled_mocks() {
7171
let out_dir: std::path::PathBuf = env!("OUT_DIR").into();
7272
assert!(out_dir.join("dummy.wasm").exists());
73+
#[cfg(feature = "riscv")]
7374
assert!(out_dir.join("dummy.polkavm").exists());
7475
}
7576
}

0 commit comments

Comments
 (0)