From 86bdaec2ea4e0aa7bcf35005d3b51352ba288aa8 Mon Sep 17 00:00:00 2001
From: Branislav Kontur <bkontur@gmail.com>
Date: Fri, 23 Sep 2022 14:53:31 +0200
Subject: [PATCH] Small cosmetic nits (#1679)
---
cumulus/Cargo.lock | 1 -
cumulus/Cargo.toml | 2 +-
cumulus/client/relay-chain-inprocess-interface/Cargo.toml | 3 ---
cumulus/client/service/src/lib.rs | 3 +--
cumulus/pallets/parachain-system/src/validate_block/tests.rs | 3 ++-
cumulus/pallets/xcm/Cargo.toml | 1 +
cumulus/parachains/common/Cargo.toml | 2 ++
cumulus/parachains/pallets/ping/Cargo.toml | 1 +
cumulus/primitives/utility/Cargo.toml | 2 ++
9 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/cumulus/Cargo.lock b/cumulus/Cargo.lock
index b9e79306fac..bcbd8a28233 100644
--- a/cumulus/Cargo.lock
+++ b/cumulus/Cargo.lock
@@ -1989,7 +1989,6 @@ dependencies = [
"async-trait",
"cumulus-primitives-core",
"cumulus-relay-chain-interface",
- "cumulus-test-service",
"futures",
"futures-timer",
"polkadot-cli",
diff --git a/cumulus/Cargo.toml b/cumulus/Cargo.toml
index d4497a7767e..487fc124da8 100644
--- a/cumulus/Cargo.toml
+++ b/cumulus/Cargo.toml
@@ -24,7 +24,7 @@ members = [
"primitives/parachain-inherent",
"primitives/timestamp",
"primitives/utility",
- "polkadot-parachain/",
+ "polkadot-parachain",
"parachains/common",
"parachains/pallets/parachain-info",
"parachains/pallets/ping",
diff --git a/cumulus/client/relay-chain-inprocess-interface/Cargo.toml b/cumulus/client/relay-chain-inprocess-interface/Cargo.toml
index c8d5b93a2d0..05d237ad9c3 100644
--- a/cumulus/client/relay-chain-inprocess-interface/Cargo.toml
+++ b/cumulus/client/relay-chain-inprocess-interface/Cargo.toml
@@ -42,6 +42,3 @@ sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master
# Polkadot
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-test-client = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-
-# Cumulus
-cumulus-test-service = { path = "../../test/service" }
diff --git a/cumulus/client/service/src/lib.rs b/cumulus/client/service/src/lib.rs
index 600e1fcf444..269112b1622 100644
--- a/cumulus/client/service/src/lib.rs
+++ b/cumulus/client/service/src/lib.rs
@@ -125,9 +125,8 @@ where
task_manager
.spawn_essential_handle()
.spawn("cumulus-pov-recovery", None, pov_recovery.run());
-
cumulus_client_collator::start_collator(cumulus_client_collator::StartCollatorParams {
- runtime_api: client.clone(),
+ runtime_api: client,
block_status,
announce_block,
overseer_handle,
diff --git a/cumulus/pallets/parachain-system/src/validate_block/tests.rs b/cumulus/pallets/parachain-system/src/validate_block/tests.rs
index e06c2cafdcf..6087e6a29a3 100644
--- a/cumulus/pallets/parachain-system/src/validate_block/tests.rs
+++ b/cumulus/pallets/parachain-system/src/validate_block/tests.rs
@@ -284,7 +284,8 @@ fn check_inherents_are_unsigned_and_before_all_other_extrinsics() {
.expect("Runs the test");
assert!(output.status.success());
- assert!(String::from_utf8(output.stderr).unwrap()
+ assert!(String::from_utf8(output.stderr)
+ .unwrap()
.contains("Could not find `set_validation_data` inherent"));
}
}
diff --git a/cumulus/pallets/xcm/Cargo.toml b/cumulus/pallets/xcm/Cargo.toml
index 36a8e433f2f..4d1a38da171 100644
--- a/cumulus/pallets/xcm/Cargo.toml
+++ b/cumulus/pallets/xcm/Cargo.toml
@@ -30,5 +30,6 @@ std = [
"sp-runtime/std",
"frame-support/std",
"frame-system/std",
+ "xcm/std",
]
try-runtime = ["frame-support/try-runtime"]
diff --git a/cumulus/parachains/common/Cargo.toml b/cumulus/parachains/common/Cargo.toml
index 041f02a73d6..46c5704d9b7 100644
--- a/cumulus/parachains/common/Cargo.toml
+++ b/cumulus/parachains/common/Cargo.toml
@@ -63,5 +63,7 @@ std = [
"sp-std/std",
"pallet-collator-selection/std",
"cumulus-primitives-utility/std",
+ "xcm/std",
+ "xcm-executor/std",
"xcm-builder/std"
]
diff --git a/cumulus/parachains/pallets/ping/Cargo.toml b/cumulus/parachains/pallets/ping/Cargo.toml
index 00c17d65675..60a8eed188e 100644
--- a/cumulus/parachains/pallets/ping/Cargo.toml
+++ b/cumulus/parachains/pallets/ping/Cargo.toml
@@ -30,4 +30,5 @@ std = [
"sp-runtime/std",
"frame-support/std",
"frame-system/std",
+ "xcm/std",
]
diff --git a/cumulus/primitives/utility/Cargo.toml b/cumulus/primitives/utility/Cargo.toml
index 6a76740bde1..668e612f2b2 100644
--- a/cumulus/primitives/utility/Cargo.toml
+++ b/cumulus/primitives/utility/Cargo.toml
@@ -38,5 +38,7 @@ std = [
"polkadot-parachain/std",
"polkadot-primitives/std",
"cumulus-primitives-core/std",
+ "xcm/std",
+ "xcm-builder/std",
"xcm-executor/std",
]
--
GitLab