Fix merge and warning

paritytech · Nov 25, 2022 · 37788ae · 37788ae
1 parent eadd0db
commit 37788ae
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/client/service/test/Cargo.toml b/client/service/test/Cargo.toml
@@ -40,6 +40,6 @@ sp-state-machine = { version = "0.13.0", path = "../../../primitives/state-machi
 sp-storage = { version = "7.0.0", path = "../../../primitives/storage" }
 sp-tracing = { version = "6.0.0", path = "../../../primitives/tracing" }
 sp-trie = { version = "7.0.0", path = "../../../primitives/trie" }
-sp-io = { version = "6.0.0", path = "../../../primitives/io" }
+sp-io = { version = "7.0.0", path = "../../../primitives/io" }
 substrate-test-runtime = { version = "2.0.0", path = "../../../test-utils/runtime" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils/runtime/client" }
diff --git a/client/tracing/src/lib.rs b/client/tracing/src/lib.rs
@@ -625,11 +625,7 @@ mod tests {
 				let _guard2 = span2.enter();
 				// emit event
 				tracing::event!(target: "test_target", tracing::Level::INFO, "test_event1");
-				for msg in rx.recv() {
-					if !msg {
-						break
-					}
-				}
+				let _ = rx.recv();
 				// guard2 and span2 dropped / exited
 			});