Merge branch 'master' into ao-validator-discovery-previous-sessions

* master: Some code cleanup in overseer (#2008) PoV Distribution optimization (#1990) Approval Distribution Subsystem (#1951) Session management for approval voting (#1973) Do not send messages twice in bitfield distribution (#2005)
paritytech · Nov 25, 2020 · f1cc838 · f1cc838
2 parents 835ae2f + 9a32ab1
commit f1cc838
Show file tree

Hide file tree

Showing 20 changed files with 1,600 additions and 423 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/node/network/bitfield-distribution/Cargo.toml b/node/network/bitfield-distribution/Cargo.toml
@@ -20,9 +20,7 @@ bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] }
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
 maplit = "1.0.2"
 log = "0.4.11"
 env_logger = "0.8.2"
 assert_matches = "1.4.0"
-tempfile = "3.1.0"