Refactor sr_primitives. (#3214)

* refactor sr_primitives.

* Fix try build error.

* Line-width

* Ui test.

* Final fixes.

* Fix build again.

* bring back ui test.

* Fix unsigned import.

* Another ui fix.

* Also refactor substrate-primitives

* Fix benchmarks.

* Fix doc test.

* fix doc tests

substrate/srml/generic-asset/Cargo.toml

@@ -8,13 +8,13 @@ edition = "2018"
 serde = { version = "1.0", optional = true }
 parity-codec = { version = "4.1.1", default-features = false, features = ["derive"] }
 rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }
-primitives = { package = "sr-primitives", path = "../../core/sr-primitives", default-features = false }
+sr-primitives = { path = "../../core/sr-primitives", default-features = false }
 support = { package = "srml-support", path = "../support", default-features = false }
 system = { package = "srml-system", path = "../system", default-features = false }
 
 [dev-dependencies]
 runtime_io = { package = "sr-io", path = "../../core/sr-io" }
-substrate-primitives = { path = "../../core/primitives" }
+primitives = { package = "substrate-primitives",  path = "../../core/primitives" }
 
 [features]
 default = ["std"]
@@ -22,7 +22,7 @@ std =[
     "serde/std",
     "parity-codec/std",
     "rstd/std",
-    "primitives/std",
+    "sr-primitives/std",
     "support/std",
     "system/std",
 ]

substrate/srml/generic-asset/src/lib.rs

@@ -153,7 +153,7 @@
 
 use parity_codec::{Decode, Encode, HasCompact, Input, Output};
 
-use primitives::traits::{
+use sr_primitives::traits::{
 	CheckedAdd, CheckedSub, MaybeSerializeDebug, Member, One, Saturating, SimpleArithmetic, Zero, Bounded
 };
 
@@ -477,8 +477,8 @@ decl_storage! {
 		config(endowed_accounts): Vec<T::AccountId>;
 
 		build(|
-			storage: &mut primitives::StorageOverlay,
-			_: &mut primitives::ChildrenStorageOverlay,
+			storage: &mut sr_primitives::StorageOverlay,
+			_: &mut sr_primitives::ChildrenStorageOverlay,
 			config: &GenesisConfig<T>| {
 			config.assets.iter().for_each(|asset_id| {
 				config.endowed_accounts.iter().for_each(|account_id| {

substrate/srml/generic-asset/src/mock.rs

@@ -20,8 +20,8 @@
 
 #![cfg(test)]
 
-use primitives::{Perbill, testing::Header, traits::{BlakeTwo256, IdentityLookup}};
-use substrate_primitives::{Blake2Hasher, H256};
+use sr_primitives::{Perbill, testing::Header, traits::{BlakeTwo256, IdentityLookup}};
+use primitives::{Blake2Hasher, H256};
 use support::{parameter_types, impl_outer_event, impl_outer_origin};
 
 use super::*;