[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/utils/frame/rpc/system/src/lib.rs

@@ -19,7 +19,7 @@
 use std::sync::Arc;
 
 use codec::{self, Codec, Decode, Encode};
-use client::{
+use sc_client::{
 	light::blockchain::{future_header, RemoteBlockchain},
 	light::fetcher::{Fetcher, RemoteCallRequest},
 };
@@ -38,7 +38,7 @@ use sp_runtime::{
 	traits,
 };
 use sp_core::hexdisplay::HexDisplay;
-use txpool_api::{TransactionPool, InPoolTransaction};
+use sp_transaction_pool::{TransactionPool, InPoolTransaction};
 
 pub use frame_system_rpc_runtime_api::AccountNonceApi;
 pub use self::gen_client::Client as SystemClient;
@@ -224,17 +224,17 @@ mod tests {
 	use super::*;
 
 	use futures::executor::block_on;
-	use test_client::{
+	use substrate_test_runtime_client::{
 		runtime::Transfer,
 		AccountKeyring,
 	};
-	use txpool::{BasicPool, FullChainApi};
+	use sc_transaction_pool::{BasicPool, FullChainApi};
 
 	#[test]
 	fn should_return_next_nonce_for_some_account() {
 		// given
 		let _ = env_logger::try_init();
-		let client = Arc::new(test_client::new());
+		let client = Arc::new(substrate_test_runtime_client::new());
 		let pool = Arc::new(BasicPool::new(Default::default(), FullChainApi::new(client.clone())));
 
 		let new_transaction = |nonce: u64| {