Clean up crate names and locations (#4361)

* rename crate: sp-transaction-pool-api -> sp-transaction-pool

* move primitives/core/derive-debug -> primitives/derive-debug; primitives/core/storage -> primitives/storage

* rename crate sp-core-storage -> sp-storage

* rename and move: test/utils/transaction-factory -> client/transaction-factory

* move transaction-factory -> node/transaction-factory

* fix missing rename

* Move chain-spec-builder into bin/utils

* move subkey into bin/utils

* Update new subkey location

* Update docs to reflect new location for utils

* fixing import name

substrate/bin/node/cli/Cargo.toml

@@ -51,7 +51,7 @@ client-api = { package = "sc-client-api", path = "../../../client/api" }
 client = { package = "sc-client", path = "../../../client/" }
 chain-spec = { package = "sc-chain-spec", path = "../../../client/chain-spec" }
 txpool = { package = "sc-transaction-pool", path = "../../../client/transaction-pool" }
-txpool-api = { package = "sp-transaction-pool-api", path = "../../../primitives/transaction-pool" }
+txpool-api = { package = "sp-transaction-pool", path = "../../../primitives/transaction-pool" }
 network = { package = "sc-network", path = "../../../client/network" }
 babe = { package = "sc-consensus-babe", path = "../../../client/consensus/babe" }
 grandpa = { package = "sc-finality-grandpa", path = "../../../client/finality-grandpa" }
@@ -83,8 +83,8 @@ node-executor = { path = "../executor" }
 # CLI-specific dependencies
 tokio = { version = "0.1.22", optional = true }
 sc-cli = { path = "../../../client/cli", optional = true }
-transaction-factory = { path = "../../../test/utils/transaction-factory", optional = true }
 ctrlc = { version = "3.1.3", features = ["termination"], optional = true }
+node-transaction-factory = { path = "../transaction-factory", optional = true }
 
 # WASM-specific dependencies
 libp2p = { version = "0.13.0", default-features = false, optional = true }
@@ -126,7 +126,7 @@ browser = [
 ]
 cli = [
 	"sc-cli",
-	"transaction-factory",
+	"node-transaction-factory",
 	"tokio",
 	"ctrlc",
 	"sc-service/rocksdb",

substrate/bin/node/cli/src/cli.rs

@@ -24,7 +24,7 @@ use structopt::{StructOpt, clap::App};
 use sc_cli::{display_role, parse_and_prepare, AugmentClap, GetLogFilter, ParseAndPrepare};
 use crate::{service, ChainSpec, load_spec};
 use crate::factory_impl::FactoryState;
-use transaction_factory::RuntimeAdapter;
+use node_transaction_factory::RuntimeAdapter;
 
 /// Custom subcommands.
 #[derive(Clone, Debug, StructOpt)]
@@ -70,7 +70,7 @@ pub struct FactoryCmd {
 	///
 	/// These three modes control manufacturing.
 	#[structopt(long="mode", default_value = "MasterToN")]
-	pub mode: transaction_factory::Mode,
+	pub mode: node_transaction_factory::Mode,
 
 	/// Number of transactions to generate. In mode `MasterNToNToM` this is
 	/// the number of transactions per round.
@@ -155,7 +155,7 @@ pub fn run<I, T, E>(args: I, exit: E, version: sc_cli::VersionInfo) -> error::Re
 			);
 
 			let service_builder = new_full_start!(config).0;
-			transaction_factory::factory::<FactoryState<_>, _, _, _, _, _>(
+			node_transaction_factory::factory::<FactoryState<_>, _, _, _, _, _>(
 				factory_state,
 				service_builder.client(),
 				service_builder.select_chain()

substrate/bin/node/cli/src/factory_impl.rs

@@ -32,8 +32,8 @@ use primitives::{sr25519, crypto::Pair};
 use sp_runtime::{
 	generic::Era, traits::{Block as BlockT, Header as HeaderT, SignedExtension, Verify, IdentifyAccount}
 };
-use transaction_factory::RuntimeAdapter;
-use transaction_factory::modes::Mode;
+use node_transaction_factory::RuntimeAdapter;
+use node_transaction_factory::modes::Mode;
 use inherents::InherentData;
 use sp_timestamp;
 use sp_finality_tracker;