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
This commit is contained in:
Kian Paimani
2019-07-29 14:43:53 +02:00
committed by Bastian Köcher
parent cf80af9255
commit 79feb23a22
259 changed files with 667 additions and 665 deletions
+3 -3
View File
@@ -9,8 +9,8 @@ parity-codec = { version = "4.1.1", default-features = false, features = ["deriv
serde = { version = "1.0", optional = true }
inherents = { package = "substrate-inherents", path = "../../core/inherents", default-features = false }
rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }
primitives = { package = "sr-primitives", path = "../../core/sr-primitives", default-features = false }
substrate-primitives = { path = "../../core/primitives", default-features = false }
sr-primitives = { path = "../../core/sr-primitives", default-features = false }
primitives = { package = "substrate-primitives", path = "../../core/primitives", default-features = false }
srml-support = { path = "../support", default-features = false }
system = { package = "srml-system", path = "../system", default-features = false }
timestamp = { package = "srml-timestamp", path = "../timestamp", default-features = false }
@@ -30,8 +30,8 @@ std = [
"parity-codec/std",
"rstd/std",
"srml-support/std",
"sr-primitives/std",
"primitives/std",
"substrate-primitives/std",
"system/std",
"timestamp/std",
"staking/std",
+1 -1
View File
@@ -53,7 +53,7 @@ pub use timestamp;
use rstd::{result, prelude::*};
use parity_codec::Encode;
use srml_support::{decl_storage, decl_module, Parameter, storage::StorageValue, traits::Get};
use primitives::{
use sr_primitives::{
traits::{SaturatedConversion, Saturating, Zero, One, Member, IsMember, TypedKey},
generic::DigestItem,
};
+3 -3
View File
@@ -18,13 +18,13 @@
#![cfg(test)]
use primitives::{
use sr_primitives::{
traits::IdentityLookup, Perbill,
testing::{Header, UintAuthorityId},
};
use srml_support::{impl_outer_origin, parameter_types};
use runtime_io;
use substrate_primitives::{H256, Blake2Hasher};
use primitives::{H256, Blake2Hasher};
use crate::{Trait, Module, GenesisConfig};
impl_outer_origin!{
@@ -48,7 +48,7 @@ impl system::Trait for Test {
type Index = u64;
type BlockNumber = u64;
type Hash = H256;
type Hashing = ::primitives::traits::BlakeTwo256;
type Hashing = ::sr_primitives::traits::BlakeTwo256;
type AccountId = u64;
type Lookup = IdentityLookup<Self::AccountId>;
type Header = Header;
+1 -1
View File
@@ -20,7 +20,7 @@
use lazy_static::lazy_static;
use crate::mock::{System, Aura, new_test_ext};
use primitives::traits::Header;
use sr_primitives::traits::Header;
use runtime_io::with_externalities;
use parking_lot::Mutex;
use crate::{AuraReport, HandleReport};