Move import lock onto backend (#2797)

* Drop import_lock from client, move it into backend, impl default version via static mutex

* still need to allow depcretion because of client.backend

* additional docs

* Remove default impl of get_import_lock, impl on instances

* Bump parking_lot to 0.8.0 accross the board
This commit is contained in:
Benjamin Kampmann
2019-06-05 15:46:01 +02:00
committed by Bastian Köcher
parent 4f888f34d3
commit eaa0ab014a
37 changed files with 101 additions and 97 deletions
+1 -1
View File
@@ -23,7 +23,7 @@ authorities = { package = "substrate-consensus-authorities", path = "../authorit
runtime_primitives = { package = "sr-primitives", path = "../../sr-primitives" }
futures = "0.1.17"
tokio = "0.1.7"
parking_lot = "0.7.1"
parking_lot = "0.8.0"
log = "0.4"
[dev-dependencies]
-1
View File
@@ -886,7 +886,6 @@ mod tests {
#[allow(deprecated)]
let select_chain = LongestChain::new(
client.backend().clone(),
client.import_lock().clone(),
);
let environ = Arc::new(DummyFactory(client.clone()));
import_notifications.push(
+1 -1
View File
@@ -24,7 +24,7 @@ slots = { package = "substrate-consensus-slots", path = "../slots" }
runtime_primitives = { package = "sr-primitives", path = "../../sr-primitives" }
futures = "0.1.26"
tokio = "0.1.18"
parking_lot = "0.7.1"
parking_lot = "0.8.0"
log = "0.4.6"
schnorrkel = "0.1.1"
rand = "0.6.5"
+1 -1
View File
@@ -975,7 +975,7 @@ mod tests {
#[allow(deprecated)]
let select_chain = LongestChain::new(client.backend().clone(), client.import_lock().clone());
let select_chain = LongestChain::new(client.backend().clone());
let babe = start_babe(BabeParams {
config,
+1 -1
View File
@@ -18,7 +18,7 @@ runtime_version = { package = "sr-version", path = "../../sr-version" }
runtime_primitives = { package = "sr-primitives", path = "../../sr-primitives" }
tokio-timer = "0.2"
parity-codec = { version = "3.3", features = ["derive"] }
parking_lot = "0.7.1"
parking_lot = "0.8.0"
[dev-dependencies]
test_client = { package = "substrate-test-client", path = "../../test-client" }
+1 -1
View File
@@ -20,7 +20,7 @@ runtime_primitives = { package = "sr-primitives", path = "../../sr-primitives" }
runtime_version = { package = "sr-version", path = "../../sr-version" }
runtime_io = { package = "sr-io", path = "../../sr-io" }
tokio = "0.1.7"
parking_lot = "0.7.1"
parking_lot = "0.8.0"
log = "0.4"
rhododendron = { version = "0.5.0", features = ["codec"] }
exit-future = "0.1"
+1 -1
View File
@@ -14,7 +14,7 @@ consensus_common = { package = "substrate-consensus-common", path = "../common"
inherents = { package = "substrate-inherents", path = "../../inherents" }
futures = "0.1.17"
tokio = "0.1.7"
parking_lot = "0.7.1"
parking_lot = "0.8.0"
log = "0.4"
[dev-dependencies]