From f14580535eadbaf029cba2651e102e2d09ac5cd6 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Tue, 30 Apr 2019 09:33:19 +0200
Subject: [PATCH] Depreate functions that spawn a thread (#2418)

* Depreate functions that spawn a thread

* Bump versions
---
 substrate/Cargo.lock                      | 14 +++++++-------
 substrate/core/consensus/aura/Cargo.toml  |  2 +-
 substrate/core/consensus/aura/src/lib.rs  |  2 ++
 substrate/core/consensus/slots/Cargo.toml |  2 +-
 substrate/core/consensus/slots/src/lib.rs |  1 +
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/substrate/Cargo.lock b/substrate/Cargo.lock
index fd55b572e8..1e3e42560a 100644
--- a/substrate/Cargo.lock
+++ b/substrate/Cargo.lock
@@ -1996,7 +1996,7 @@ dependencies = [
  "substrate-basic-authorship 1.0.0",
  "substrate-cli 1.0.0",
  "substrate-client 1.0.0",
- "substrate-consensus-aura 1.0.1",
+ "substrate-consensus-aura 1.1.0",
  "substrate-finality-grandpa 1.0.0",
  "substrate-inherents 1.0.0",
  "substrate-keystore 1.0.0",
@@ -2105,7 +2105,7 @@ dependencies = [
  "substrate-basic-authorship 1.0.0",
  "substrate-cli 1.0.0",
  "substrate-client 1.0.0",
- "substrate-consensus-aura 1.0.1",
+ "substrate-consensus-aura 1.1.0",
  "substrate-executor 1.0.0",
  "substrate-inherents 1.0.0",
  "substrate-network 0.1.0",
@@ -3876,7 +3876,7 @@ dependencies = [
 
 [[package]]
 name = "substrate-consensus-aura"
-version = "1.0.1"
+version = "1.1.0"
 dependencies = [
  "env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3894,7 +3894,7 @@ dependencies = [
  "substrate-consensus-aura-primitives 1.0.0",
  "substrate-consensus-authorities 1.0.0",
  "substrate-consensus-common 1.0.0",
- "substrate-consensus-slots 1.0.0",
+ "substrate-consensus-slots 1.1.0",
  "substrate-executor 1.0.0",
  "substrate-inherents 1.0.0",
  "substrate-keyring 1.0.0",
@@ -3949,7 +3949,7 @@ dependencies = [
  "substrate-consensus-authorities 1.0.0",
  "substrate-consensus-babe-primitives 1.0.0",
  "substrate-consensus-common 1.0.0",
- "substrate-consensus-slots 1.0.0",
+ "substrate-consensus-slots 1.1.0",
  "substrate-executor 1.0.0",
  "substrate-inherents 1.0.0",
  "substrate-keyring 1.0.0",
@@ -3968,7 +3968,7 @@ dependencies = [
  "parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-primitives 1.0.0",
  "substrate-client 1.0.0",
- "substrate-consensus-slots 1.0.0",
+ "substrate-consensus-slots 1.1.0",
 ]
 
 [[package]]
@@ -4016,7 +4016,7 @@ dependencies = [
 
 [[package]]
 name = "substrate-consensus-slots"
-version = "1.0.0"
+version = "1.1.0"
 dependencies = [
  "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/substrate/core/consensus/aura/Cargo.toml b/substrate/core/consensus/aura/Cargo.toml
index a776a92035..cab7adf670 100644
--- a/substrate/core/consensus/aura/Cargo.toml
+++ b/substrate/core/consensus/aura/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-consensus-aura"
-version = "1.0.1"
+version = "1.1.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Aura consensus algorithm for substrate"
 edition = "2018"
diff --git a/substrate/core/consensus/aura/src/lib.rs b/substrate/core/consensus/aura/src/lib.rs
index fd32e1501f..784872f6af 100644
--- a/substrate/core/consensus/aura/src/lib.rs
+++ b/substrate/core/consensus/aura/src/lib.rs
@@ -194,6 +194,7 @@ impl SlotCompatible for AuraSlotCompatible {
 }
 
 /// Start the aura worker in a separate thread.
+#[deprecated(since = "1.1", note = "Please spawn a thread manually")]
 pub fn start_aura_thread<B, C, E, I, P, SO, Error, OnExit>(
 	slot_duration: SlotDuration,
 	local_key: Arc<P>,
@@ -231,6 +232,7 @@ pub fn start_aura_thread<B, C, E, I, P, SO, Error, OnExit>(
 		force_authoring,
 	};
 
+	#[allow(deprecated)]	// The function we are in is also deprecated.
 	slots::start_slot_worker_thread::<_, _, _, _, AuraSlotCompatible, u64, _>(
 		slot_duration.0,
 		client,
diff --git a/substrate/core/consensus/slots/Cargo.toml b/substrate/core/consensus/slots/Cargo.toml
index 88e3879f7a..c5a72671ac 100644
--- a/substrate/core/consensus/slots/Cargo.toml
+++ b/substrate/core/consensus/slots/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-consensus-slots"
-version = "1.0.0"
+version = "1.1.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Generic slots-based utilities for consensus"
 edition = "2018"
diff --git a/substrate/core/consensus/slots/src/lib.rs b/substrate/core/consensus/slots/src/lib.rs
index 5f00990d0b..600df43abf 100644
--- a/substrate/core/consensus/slots/src/lib.rs
+++ b/substrate/core/consensus/slots/src/lib.rs
@@ -71,6 +71,7 @@ pub fn inherent_to_common_error(err: inherents::RuntimeString) -> consensus_comm
 }
 
 /// Start a new slot worker in a separate thread.
+#[deprecated(since = "1.1", note = "Please spawn a thread manually")]
 pub fn start_slot_worker_thread<B, C, W, SO, SC, T, OnExit>(
 	slot_duration: SlotDuration<T>,
 	client: Arc<C>,