Rename basic-authority to basic-authorship (#4640)

* Rename basic-authority to basic-authorship * Revert weird tab. * Fix rename.
paritytech · Jan 16, 2020 · 47c36e6 · 47c36e6
1 parent 3fa5f09
commit 47c36e6
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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};