From 47c36e6efe8285c9a6cbbcc0f588e3e7c4009de5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomusdrw@users.noreply.github.com>
Date: Thu, 16 Jan 2020 13:57:41 +0100
Subject: [PATCH] Rename basic-authority to basic-authorship (#4640)

* Rename basic-authority to basic-authorship

* Revert weird tab.

* Fix rename.
---
 .maintain/rename-crates-for-2.0.sh | 3 ++-
 Cargo.lock                         | 6 +++---
 bin/node-template/Cargo.toml       | 2 +-
 bin/node-template/src/service.rs   | 3 +--
 bin/node/cli/Cargo.toml            | 2 +-
 bin/node/cli/src/service.rs        | 4 ++--
 client/basic-authorship/Cargo.toml | 2 +-
 client/basic-authorship/src/lib.rs | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.maintain/rename-crates-for-2.0.sh b/.maintain/rename-crates-for-2.0.sh
index d2bd871f09780..b024cfd4418c6 100644
--- a/.maintain/rename-crates-for-2.0.sh
+++ b/.maintain/rename-crates-for-2.0.sh
@@ -43,6 +43,7 @@ TO_RENAME=(
     "sp-finality-granpda sp-finality-grandpa"
     "sp-sesssion sp-session"
     "sp-tracing-pool sp-transaction-pool"
+    "sc-basic-authority sc-basic-authorship"
 
     # PRIMITIVES
     "substrate-application-crypto sp-application-crypto"
@@ -88,7 +89,7 @@ TO_RENAME=(
     "substrate-client sc-client"
     "substrate-client-api sc-api"
     "substrate-authority-discovery sc-authority-discovery"
-    "substrate-basic-authorship sc-basic-authority"
+    "substrate-basic-authorship sc-basic-authorship"
     "substrate-block-builder sc-block-builder"
     "substrate-chain-spec sc-chain-spec"
     "substrate-chain-spec-derive sc-chain-spec-derive"
diff --git a/Cargo.lock b/Cargo.lock
index ac34452e31516..1588be33b1a03 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3044,7 +3044,7 @@ dependencies = [
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "sc-authority-discovery 0.8.0",
- "sc-basic-authority 0.8.0",
+ "sc-basic-authorship 0.8.0",
  "sc-chain-spec 2.0.0",
  "sc-cli 0.8.0",
  "sc-client 0.8.0",
@@ -3223,7 +3223,7 @@ dependencies = [
  "node-template-runtime 2.0.0",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sc-basic-authority 0.8.0",
+ "sc-basic-authorship 0.8.0",
  "sc-cli 0.8.0",
  "sc-client 0.8.0",
  "sc-consensus-aura 0.8.0",
@@ -5037,7 +5037,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "sc-basic-authority"
+name = "sc-basic-authorship"
 version = "0.8.0"
 dependencies = [
  "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/bin/node-template/Cargo.toml b/bin/node-template/Cargo.toml
index e18bbd3e1d46a..f956bbb22193a 100644
--- a/bin/node-template/Cargo.toml
+++ b/bin/node-template/Cargo.toml
@@ -34,7 +34,7 @@ grandpa-primitives = { version = "2.0.0", package = "sp-finality-grandpa", path
 sc-client = { version = "0.8", path = "../../client/" }
 node-template-runtime = { version = "2.0.0", path = "runtime" }
 sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
-sc-basic-authority = { path  = "../../client/basic-authorship" }
+sc-basic-authorship = { path  = "../../client/basic-authorship" }
 
 [build-dependencies]
 vergen = "3.0.4"
diff --git a/bin/node-template/src/service.rs b/bin/node-template/src/service.rs
index 7f6ff67d282d1..ed2299e30f73e 100644
--- a/bin/node-template/src/service.rs
+++ b/bin/node-template/src/service.rs
@@ -11,7 +11,6 @@ use sc_executor::native_executor_instance;
 pub use sc_executor::NativeExecutor;
 use sp_consensus_aura::sr25519::{AuthorityPair as AuraPair};
 use grandpa::{self, FinalityProofProvider as GrandpaFinalityProofProvider};
-use sc_basic_authority;
 use futures::{FutureExt, compat::Future01CompatExt};
 
 // Our native executor instance.
@@ -107,7 +106,7 @@ pub fn new_full<C: Send + Default + 'static>(config: Configuration<C, GenesisCon
 		.build()?;
 
 	if participates_in_consensus {
-		let proposer = sc_basic_authority::ProposerFactory {
+		let proposer = sc_basic_authorship::ProposerFactory {
 			client: service.client(),
 			transaction_pool: service.transaction_pool(),
 		};
diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
index 6c2ccb49b09f2..c81cf38a9c2ff 100644
--- a/bin/node/cli/Cargo.toml
+++ b/bin/node/cli/Cargo.toml
@@ -57,7 +57,7 @@ grandpa = { version = "0.8", package = "sc-finality-grandpa", path = "../../../c
 sc-client-db = { version = "0.8", default-features = false, path = "../../../client/db" }
 sc-offchain = { version = "2.0.0", path = "../../../client/offchain" }
 sc-rpc = { version = "2.0.0", path = "../../../client/rpc" }
-sc-basic-authority = { version = "0.8", path = "../../../client/basic-authorship" }
+sc-basic-authorship = { version = "0.8", path = "../../../client/basic-authorship" }
 sc-service = { version = "0.8", default-features = false, path = "../../../client/service" }
 sc-telemetry = { version = "2.0.0", path = "../../../client/telemetry" }
 sc-authority-discovery = { version = "0.8",  path = "../../../client/authority-discovery" }
diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index b1c1759ae8f19..b12dfcdc515f5 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -151,7 +151,7 @@ macro_rules! new_full {
 		($with_startup_data)(&block_import, &babe_link);
 
 		if participates_in_consensus {
-			let proposer = sc_basic_authority::ProposerFactory {
+			let proposer = sc_basic_authorship::ProposerFactory {
 				client: service.client(),
 				transaction_pool: service.transaction_pool(),
 			};
@@ -509,7 +509,7 @@ mod tests {
 
 				let parent_id = BlockId::number(service.client().chain_info().best_number);
 				let parent_header = service.client().header(&parent_id).unwrap().unwrap();
-				let mut proposer_factory = sc_basic_authority::ProposerFactory {
+				let mut proposer_factory = sc_basic_authorship::ProposerFactory {
 					client: service.client(),
 					transaction_pool: service.transaction_pool(),
 				};
diff --git a/client/basic-authorship/Cargo.toml b/client/basic-authorship/Cargo.toml
index eedf6d12613d7..8fa0b9f5cc20e 100644
--- a/client/basic-authorship/Cargo.toml
+++ b/client/basic-authorship/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "sc-basic-authority"
+name = "sc-basic-authorship"
 version = "0.8.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
diff --git a/client/basic-authorship/src/lib.rs b/client/basic-authorship/src/lib.rs
index 5465768e83ce0..f62134ce42aa7 100644
--- a/client/basic-authorship/src/lib.rs
+++ b/client/basic-authorship/src/lib.rs
@@ -19,7 +19,7 @@
 //! # Example
 //!
 //! ```
-//! # use sc_basic_authority::ProposerFactory;
+//! # use sc_basic_authorship::ProposerFactory;
 //! # use sp_consensus::{Environment, Proposer, RecordProof};
 //! # use sp_runtime::generic::BlockId;
 //! # use std::{sync::Arc, time::Duration};