[big refactor] Remove crate aliasing. (#4395)

* Rename: Phase 1.

* Unify codec.

* Fixing: Phase 2

* Fixing: Phase 3.

* Fixing: Phase 4.

* Fixing: Phase 5.

* Fixing: Phase 6.

* Fixing: Phase 7.

* Fixing: Phase 8. Tests

* Fixing: Phase 9. Tests!!!

* Fixing: Phase 10. Moar tests!

* Finally done!

* More fixes.

* Rename primitives:: to sp_core::

* Apply renames in finality-grandpa.

* Fix benches.

* Fix benches 2.

* Revert node-template.

* Fix frame-system in our modules.

substrate/client/transaction-pool/graph/Cargo.toml

@@ -10,14 +10,14 @@ futures = "0.3.1"
 log = "0.4.8"
 parking_lot = "0.9.0"
 serde = { version = "1.0.101", features = ["derive"] }
-primitives = { package = "sp-core",  path = "../../../primitives/core" }
+sp-core = { path = "../../../primitives/core" }
 sp-runtime = { path = "../../../primitives/runtime" }
-txpool-api = { package = "sp-transaction-pool", path = "../../../primitives/transaction-pool" }
+sp-transaction-pool = { path = "../../../primitives/transaction-pool" }
 
 [dev-dependencies]
 assert_matches = "1.3.0"
 codec = { package = "parity-scale-codec", version = "1.0.0" }
-test_runtime = { package = "substrate-test-runtime", path = "../../../test-utils/runtime" }
+substrate-test-runtime = { path = "../../../test-utils/runtime" }
 criterion = "0.3"
 
 [[bench]]

substrate/client/transaction-pool/graph/benches/basics.rs

@@ -20,12 +20,12 @@ use futures::executor::block_on;
 use sc_transaction_graph::*;
 use sp_runtime::transaction_validity::{ValidTransaction, InvalidTransaction};
 use codec::Encode;
-use test_runtime::{Block, Extrinsic, Transfer, H256, AccountId};
+use substrate_test_runtime::{Block, Extrinsic, Transfer, H256, AccountId};
 use sp_runtime::{
 	generic::BlockId,
 	transaction_validity::{TransactionValidity, TransactionTag as Tag},
 };
-use primitives::blake2_256;
+use sp_core::blake2_256;
 
 #[derive(Clone, Debug, Default)]
 struct TestApi {
@@ -48,8 +48,8 @@ fn to_tag(nonce: u64, from: AccountId) -> Tag {
 impl ChainApi for TestApi {
 	type Block = Block;
 	type Hash = H256;
-	type Error = txpool_api::error::Error;
-	type ValidationFuture = futures::future::Ready<txpool_api::error::Result<TransactionValidity>>;
+	type Error = sp_transaction_pool::error::Error;
+	type ValidationFuture = futures::future::Ready<sp_transaction_pool::error::Result<TransactionValidity>>;
 
 	fn validate_transaction(
 		&self,

substrate/client/transaction-pool/graph/src/base_pool.rs

@@ -27,14 +27,14 @@ use std::{
 
 use log::{trace, debug, warn};
 use serde::Serialize;
-use primitives::hexdisplay::HexDisplay;
+use sp_core::hexdisplay::HexDisplay;
 use sp_runtime::traits::Member;
 use sp_runtime::transaction_validity::{
 	TransactionTag as Tag,
 	TransactionLongevity as Longevity,
 	TransactionPriority as Priority,
 };
-use txpool_api::{error, PoolStatus, InPoolTransaction};
+use sp_transaction_pool::{error, PoolStatus, InPoolTransaction};
 
 use crate::future::{FutureTransactions, WaitingTransaction};
 use crate::ready::ReadyTransactions;

substrate/client/transaction-pool/graph/src/future.rs

@@ -22,7 +22,7 @@ use std::{
 	time,
 };
 
-use primitives::hexdisplay::HexDisplay;
+use sp_core::hexdisplay::HexDisplay;
 use sp_runtime::transaction_validity::{
 	TransactionTag as Tag,
 };

substrate/client/transaction-pool/graph/src/pool.rs

@@ -34,7 +34,7 @@ use sp_runtime::{
 	traits::{self, SaturatedConversion},
 	transaction_validity::{TransactionValidity, TransactionTag as Tag, TransactionValidityError},
 };
-use txpool_api::{error, PoolStatus};
+use sp_transaction_pool::{error, PoolStatus};
 
 use crate::validated_pool::{ValidatedPool, ValidatedTransaction};
 
@@ -466,10 +466,10 @@ mod tests {
 	use parking_lot::Mutex;
 	use futures::executor::block_on;
 	use super::*;
-	use txpool_api::TransactionStatus;
+	use sp_transaction_pool::TransactionStatus;
 	use sp_runtime::transaction_validity::{ValidTransaction, InvalidTransaction};
 	use codec::Encode;
-	use test_runtime::{Block, Extrinsic, Transfer, H256, AccountId};
+	use substrate_test_runtime::{Block, Extrinsic, Transfer, H256, AccountId};
 	use assert_matches::assert_matches;
 	use crate::base_pool::Limit;
 

substrate/client/transaction-pool/graph/src/ready.rs

@@ -28,7 +28,7 @@ use sp_runtime::traits::Member;
 use sp_runtime::transaction_validity::{
 	TransactionTag as Tag,
 };
-use txpool_api::error;
+use sp_transaction_pool::error;
 
 use crate::future::WaitingTransaction;
 use crate::base_pool::Transaction;

substrate/client/transaction-pool/graph/src/validated_pool.rs

@@ -36,7 +36,7 @@ use sp_runtime::{
 	traits::{self, SaturatedConversion},
 	transaction_validity::TransactionTag as Tag,
 };
-use txpool_api::{error, PoolStatus};
+use sp_transaction_pool::{error, PoolStatus};
 
 use crate::base_pool::PruneStatus;
 use crate::pool::{EventStream, Options, ChainApi, BlockHash, ExHash, ExtrinsicFor, TransactionFor};

substrate/client/transaction-pool/graph/src/watcher.rs

@@ -20,7 +20,7 @@ use futures::{
 	Stream,
 	channel::mpsc,
 };
-use txpool_api::TransactionStatus;
+use sp_transaction_pool::TransactionStatus;
 
 /// Extrinsic watcher.
 ///