Merge commit 58b7eb56 (conflicts)

cli/Cargo.toml

@@ -24,7 +24,6 @@ service = { package = "polkadot-service", path = "../node/service", default-feat
 polkadot-parachain = { path = "../parachain", optional = true }
 
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "master" }
 tracing-futures = "0.2.4"
 frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
 sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }

cli/src/command.rs

@@ -252,7 +252,19 @@ pub fn run() -> Result<()> {
 			})
 		},
 		Some(Subcommand::ValidationWorker(cmd)) => {
+<<<<<<< HEAD
 			let _ = sc_cli::GlobalLoggerBuilder::new("").init();
+=======
+			let _ = sc_cli::init_logger(
+				sc_cli::InitLoggerParams {
+					pattern: "".into(),
+					tracing_receiver: Default::default(),
+					tracing_targets: None,
+					disable_log_reloading: false,
+					disable_log_color: true,
+				},
+			);
+>>>>>>> 58b7eb5607e8524cd75eb0a400862237e01ab7bf
 
 			if cfg!(feature = "browser") || cfg!(target_os = "android") {
 				Err(sc_cli::Error::Input("Cannot run validation worker in browser".into()))

node/test/service/tests/build-blocks.rs

@@ -21,7 +21,7 @@ use sp_keyring::Sr25519Keyring;
 
 #[substrate_test_utils::test]
 async fn ensure_test_service_build_blocks(task_executor: TaskExecutor) {
-	sc_cli::GlobalLoggerBuilder::new("").init().expect("Sets up logger");
+	sc_cli::GlobalLoggerBuilder::new("").with_colors(false).init().expect("Sets up logger");
 
 	let mut alice = run_validator_node(
 		task_executor.clone(),

parachain/test-parachains/adder/collator/tests/integration.rs

@@ -25,7 +25,7 @@ async fn collating_using_adder_collator(task_executor: sc_service::TaskExecutor)
 	use futures::join;
 	use polkadot_primitives::v1::Id as ParaId;
 
-	sc_cli::GlobalLoggerBuilder::new("").init().expect("Sets up logger");
+	sc_cli::GlobalLoggerBuilder::new("").with_colors(false).init().expect("Sets up logger");
 
 	let para_id = ParaId::from(100);