Merge branch 'master' into rk-collation-2591

paritytech · eskimor · Mar 9, 2021 · Mar 9, 2021 · Mar 9, 2021 · Mar 10, 2021
commit 84f2c4c7786a8f74f6ca9368629728382fe51e8d
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/node/network/collator-protocol/Cargo.toml b/node/network/collator-protocol/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 futures = "0.3.12"
-tracing = "0.1.22"
+tracing = "0.1.25"
 thiserror = "1.0.23"
 
 polkadot-primitives = { path = "../../../primitives" }

diff --git a/node/network/collator-protocol/src/lib.rs b/node/network/collator-protocol/src/lib.rs
@@ -42,7 +42,7 @@ use polkadot_node_subsystem_util::{
 mod collator_side;
 mod validator_side;
 
-const LOG_TARGET: &'static str = "collator_protocol";
+const LOG_TARGET: &'static str = "parachain::collator-protocol";
 
 #[derive(Debug, Error)]
 enum Error {