Merge branch 'master' into ao-debug-approval-distribution-III

* master: Call NetworkService::add_known_address before sending a request (#2726) Overseer: subsystems communicate directly (#2227) Request based PoV distribution (#2640)
paritytech · Mar 28, 2021 · be4a89d · be4a89d
2 parents 054690b + 43a2638
commit be4a89d
Show file tree

Hide file tree

Showing 42 changed files with 3,297 additions and 4,424 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -57,7 +57,6 @@ members = [
 	"node/core/runtime-api",
 	"node/network/approval-distribution",
 	"node/network/bridge",
-	"node/network/pov-distribution",
 	"node/network/protocol",
 	"node/network/statement-distribution",
 	"node/network/bitfield-distribution",

diff --git a/node/core/backing/Cargo.toml b/node/core/backing/Cargo.toml
@@ -22,6 +22,7 @@ sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "master" }
 futures = { version = "0.3.12", features = ["thread-pool"] }
 assert_matches = "1.4.0"
 polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }