[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/primitives/core/Cargo.toml

@@ -26,8 +26,8 @@ zeroize = { version = "1.0.0", default-features = false }
 lazy_static = { version = "1.4.0", default-features = false, optional = true }
 parking_lot = { version = "0.9.0", optional = true }
 sp-debug-derive = { version = "2.0.0", path = "../debug-derive" }
-externalities = { package = "sp-externalities", path = "../externalities", optional = true }
-primitives-storage = { package = "sp-storage", path = "../storage", default-features = false }
+sp-externalities = { path = "../externalities", optional = true }
+sp-storage = { path = "../storage", default-features = false }
 
 # full crypto
 ed25519-dalek = { version = "1.0.0-pre.3", default-features = false, features = ["u64_backend", "alloc"], optional = true }
@@ -39,7 +39,7 @@ sha2 = { version = "0.8.0", default-features = false, optional = true }
 hex = { version = "0.4", default-features = false, optional = true }
 twox-hash = { version = "1.5.0", default-features = false, optional = true }
 
-runtime-interface = { package = "sp-runtime-interface", path = "../runtime-interface", default-features = false }
+sp-runtime-interface = { path = "../runtime-interface", default-features = false }
 
 [dev-dependencies]
 sp-serializer = { path = "../serializer" }
@@ -93,9 +93,9 @@ std = [
 	"libsecp256k1",
 	"tiny-keccak",
 	"sp-debug-derive/std",
-	"externalities",
-	"primitives-storage/std",
-	"runtime-interface/std",
+	"sp-externalities",
+	"sp-storage/std",
+	"sp-runtime-interface/std",
 	"zeroize/alloc"
 ]
 
@@ -111,5 +111,5 @@ full_crypto = [
 	"hex",
 	"sha2",
 	"twox-hash",
-	"runtime-interface/disable_target_static_assertions",
+	"sp-runtime-interface/disable_target_static_assertions",
 ]

substrate/primitives/core/benches/bench.rs

@@ -16,11 +16,10 @@
 #[macro_use]
 extern crate criterion;
 
-use sp_core as primitives;
 use criterion::{Criterion, black_box, Bencher, Fun};
 use std::time::Duration;
-use primitives::crypto::Pair as _;
-use primitives::hashing::{twox_128, blake2_128};
+use sp_core::crypto::Pair as _;
+use sp_core::hashing::{twox_128, blake2_128};
 
 const MAX_KEY_SIZE: u32 = 32;
 
@@ -72,7 +71,7 @@ fn bench_ed25519(c: &mut Criterion) {
 		let msg = (0..msg_size)
 			.map(|_| rand::random::<u8>())
 			.collect::<Vec<_>>();
-		let key = primitives::ed25519::Pair::generate().0;
+		let key = sp_core::ed25519::Pair::generate().0;
 		b.iter(|| key.sign(&msg))
 	}, vec![32, 1024, 1024 * 1024]);
 
@@ -80,10 +79,10 @@ fn bench_ed25519(c: &mut Criterion) {
 		let msg = (0..msg_size)
 			.map(|_| rand::random::<u8>())
 			.collect::<Vec<_>>();
-		let key = primitives::ed25519::Pair::generate().0;
+		let key = sp_core::ed25519::Pair::generate().0;
 		let sig = key.sign(&msg);
 		let public = key.public();
-		b.iter(|| primitives::ed25519::Pair::verify(&sig, &msg, &public))
+		b.iter(|| sp_core::ed25519::Pair::verify(&sig, &msg, &public))
 	}, vec![32, 1024, 1024 * 1024]);
 }
 

substrate/primitives/core/src/crypto.rs

@@ -37,7 +37,7 @@ use base58::{FromBase58, ToBase58};
 use zeroize::Zeroize;
 #[doc(hidden)]
 pub use sp_std::ops::Deref;
-use runtime_interface::pass_by::PassByInner;
+use sp_runtime_interface::pass_by::PassByInner;
 
 /// The root phrase for our publicly known keys.
 pub const DEV_PHRASE: &str = "bottom drive obey lake curtain smoke basket hold race lonely fit walk";

substrate/primitives/core/src/ed25519.rs

@@ -39,7 +39,7 @@ use crate::crypto::Ss58Codec;
 #[cfg(feature = "std")]
 use serde::{de, Serializer, Serialize, Deserializer, Deserialize};
 use crate::{crypto::{Public as TraitPublic, UncheckedFrom, CryptoType, Derive}};
-use runtime_interface::pass_by::PassByInner;
+use sp_runtime_interface::pass_by::PassByInner;
 use sp_std::ops::Deref;
 
 /// A secret seed. It's not called a "secret key" because ring doesn't expose the secret keys

substrate/primitives/core/src/lib.rs

@@ -84,7 +84,7 @@ pub use hash_db::Hasher;
 // pub use self::hasher::blake::BlakeHasher;
 pub use self::hasher::blake2::Blake2Hasher;
 
-pub use primitives_storage as storage;
+pub use sp_storage as storage;
 
 #[doc(hidden)]
 pub use sp_std;
@@ -236,7 +236,7 @@ pub trait TypeId {
 /// A log level matching the one from `log` crate.
 ///
 /// Used internally by `sp_io::log` method.
-#[derive(Encode, Decode, runtime_interface::pass_by::PassByEnum, Copy, Clone)]
+#[derive(Encode, Decode, sp_runtime_interface::pass_by::PassByEnum, Copy, Clone)]
 pub enum LogLevel {
 	/// `Error` log level.
 	Error = 1,

substrate/primitives/core/src/offchain/mod.rs

@@ -19,7 +19,7 @@
 use codec::{Encode, Decode};
 use sp_std::{prelude::{Vec, Box}, convert::TryFrom};
 use crate::RuntimeDebug;
-use runtime_interface::pass_by::{PassByCodec, PassByInner, PassByEnum};
+use sp_runtime_interface::pass_by::{PassByCodec, PassByInner, PassByEnum};
 
 pub use crate::crypto::KeyTypeId;
 
@@ -669,7 +669,7 @@ impl<T: Externalities> Externalities for LimitedExternalities<T> {
 }
 
 #[cfg(feature = "std")]
-externalities::decl_extension! {
+sp_externalities::decl_extension! {
 	/// The offchain extension that will be registered at the Substrate externalities.
 	pub struct OffchainExt(Box<dyn Externalities>);
 }
@@ -696,7 +696,7 @@ pub trait TransactionPool {
 }
 
 #[cfg(feature = "std")]
-externalities::decl_extension! {
+sp_externalities::decl_extension! {
 	/// An externalities extension to submit transactions to the pool.
 	pub struct TransactionPoolExt(Box<dyn TransactionPool + Send>);
 }

substrate/primitives/core/src/sr25519.rs

@@ -48,7 +48,7 @@ use sp_std::ops::Deref;
 use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
 #[cfg(feature = "full_crypto")]
 use schnorrkel::keys::{MINI_SECRET_KEY_LENGTH, SECRET_KEY_LENGTH};
-use runtime_interface::pass_by::PassByInner;
+use sp_runtime_interface::pass_by::PassByInner;
 
 // signing context
 #[cfg(feature = "full_crypto")]

substrate/primitives/core/src/traits.rs

@@ -24,7 +24,7 @@ use std::{
 	sync::Arc,
 };
 
-pub use externalities::{Externalities, ExternalitiesExt};
+pub use sp_externalities::{Externalities, ExternalitiesExt};
 
 /// Something that generates, stores and provides access to keys.
 pub trait BareCryptoStore: Send + Sync {
@@ -74,7 +74,7 @@ pub trait BareCryptoStore: Send + Sync {
 /// A pointer to the key store.
 pub type BareCryptoStorePtr = Arc<parking_lot::RwLock<dyn BareCryptoStore>>;
 
-externalities::decl_extension! {
+sp_externalities::decl_extension! {
 	/// The keystore extension to register/retrieve from the externalities.
 	pub struct KeystoreExt(BareCryptoStorePtr);
 }