Update to latest master & master (#260)

This commit is contained in:
Bastian Köcher
2020-12-04 23:49:12 +01:00
committed by GitHub
parent 233b347a58
commit 092f0e9149
4 changed files with 187 additions and 182 deletions
+183 -179
View File
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -217,7 +217,7 @@ pub fn run() -> Result<()> {
}) })
} }
Some(Subcommand::ExportGenesisState(params)) => { 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( let block: Block = generate_genesis_block(&load_spec(
&params.chain.clone().unwrap_or_default(), &params.chain.clone().unwrap_or_default(),
@@ -239,7 +239,7 @@ pub fn run() -> Result<()> {
Ok(()) Ok(())
} }
Some(Subcommand::ExportGenesisWasm(params)) => { 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 = let raw_wasm_blob =
extract_genesis_wasm(&cli.load_spec(&params.chain.clone().unwrap_or_default())?)?; extract_genesis_wasm(&cli.load_spec(&params.chain.clone().unwrap_or_default())?)?;
+1
View File
@@ -423,6 +423,7 @@ pub fn node_config(
base_path: Some(base_path), base_path: Some(base_path),
informant_output_format: Default::default(), informant_output_format: Default::default(),
wasm_runtime_overrides: None, wasm_runtime_overrides: None,
disable_log_reloading: false,
}) })
} }
+1 -1
View File
@@ -22,7 +22,7 @@ use substrate_test_runtime_client::AccountKeyring::*;
#[substrate_test_utils::test] #[substrate_test_utils::test]
async fn test_collating_and_non_collator_mode_catching_up(task_executor: TaskExecutor) { 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); let para_id = ParaId::from(100);