Update to latest master & master (#260)

cumulus/rococo-parachains/src/command.rs

@@ -217,7 +217,7 @@ pub fn run() -> Result<()> {
 			})
 		}
 		Some(Subcommand::ExportGenesisState(params)) => {
-			sc_cli::init_logger("", sc_tracing::TracingReceiver::Log, None)?;
+			sc_cli::init_logger("", sc_tracing::TracingReceiver::Log, None, false)?;
 
 			let block: Block = generate_genesis_block(&load_spec(
 				&params.chain.clone().unwrap_or_default(),
@@ -239,7 +239,7 @@ pub fn run() -> Result<()> {
 			Ok(())
 		}
 		Some(Subcommand::ExportGenesisWasm(params)) => {
-			sc_cli::init_logger("", sc_tracing::TracingReceiver::Log, None)?;
+			sc_cli::init_logger("", sc_tracing::TracingReceiver::Log, None, false)?;
 
 			let raw_wasm_blob =
 				extract_genesis_wasm(&cli.load_spec(&params.chain.clone().unwrap_or_default())?)?;

cumulus/test/service/src/lib.rs

@@ -423,6 +423,7 @@ pub fn node_config(
 		base_path: Some(base_path),
 		informant_output_format: Default::default(),
 		wasm_runtime_overrides: None,
+		disable_log_reloading: false,
 	})
 }
 

cumulus/test/service/tests/integration.rs

@@ -22,7 +22,7 @@ use substrate_test_runtime_client::AccountKeyring::*;
 
 #[substrate_test_utils::test]
 async fn test_collating_and_non_collator_mode_catching_up(task_executor: TaskExecutor) {
-	sc_cli::init_logger("", Default::default(), None).expect("Sets up logger");
+	sc_cli::init_logger("", Default::default(), None, false).expect("Sets up logger");
 
 	let para_id = ParaId::from(100);