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

@@ -25,7 +25,7 @@ serde_json = "1.0"
 panic-handler = { package = "substrate-panic-handler", path = "../../core/panic-handler" }
 client = { package = "substrate-client", path = "../../core/client" }
 network = { package = "substrate-network", path = "../../core/network" }
-runtime_primitives = { package = "sr-primitives", path = "../../core/sr-primitives" }
+sr-primitives = { path = "../../core/sr-primitives" }
 primitives = { package = "substrate-primitives", path = "../../core/primitives" }
 service = { package = "substrate-service", path = "../../core/service" }
 state-machine = { package = "substrate-state-machine", path = "../../core/state-machine" }

substrate/core/cli/src/informant.rs

@@ -20,8 +20,7 @@ use client::{backend::Backend, BlockchainEvents};
 use futures::{Future, Stream};
 use futures03::{StreamExt as _, TryStreamExt as _};
 use log::{info, warn};
-use runtime_primitives::generic::BlockId;
-use runtime_primitives::traits::Header;
+use sr_primitives::{generic::BlockId, traits::Header};
 use service::{Service, Components};
 use tokio::runtime::TaskExecutor;
 

substrate/core/cli/src/informant/display.rs

@@ -18,7 +18,7 @@ use ansi_term::Colour;
 use client::ClientInfo;
 use log::info;
 use network::SyncState;
-use runtime_primitives::traits::{Block as BlockT, CheckedDiv, NumberFor, Zero, Saturating};
+use sr_primitives::traits::{Block as BlockT, CheckedDiv, NumberFor, Zero, Saturating};
 use service::NetworkStatus;
 use std::{convert::{TryFrom, TryInto}, fmt, time};