Small cosmetic nits (#1679)

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",

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",

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" }

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,

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"));
 	}
 }

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"]

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"
 ]

cumulus/parachains/pallets/ping/Cargo.toml

@@ -30,4 +30,5 @@ std = [
 	"sp-runtime/std",
 	"frame-support/std",
 	"frame-system/std",
+	"xcm/std",
 ]

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",
 ]