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
+4 -4
View File
@@ -11,10 +11,10 @@ parity-codec = { version = "4.1.1", default-features = false, features = ["deriv
substrate-keyring = { path = "../../core/keyring", optional = true }
rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }
runtime-io = { package = "sr-io", path = "../../core/sr-io", default-features = false }
primitives = { package = "sr-primitives", path = "../../core/sr-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 }
substrate-primitives = { path = "../../core/primitives", default-features = false }
[dev-dependencies]
ref_thread_local = "0.0"
@@ -26,10 +26,10 @@ std = [
"safe-mix/std",
"substrate-keyring",
"parity-codec/std",
"substrate-primitives/std",
"primitives/std",
"rstd/std",
"runtime-io/std",
"srml-support/std",
"primitives/std",
"sr-primitives/std",
"system/std",
]
+1 -1
View File
@@ -22,7 +22,7 @@
use rstd::{prelude::*, result, marker::PhantomData, convert::TryInto};
use parity_codec::{Encode, Decode, Codec, Input, Output};
use srml_support::{StorageValue, StorageMap, Parameter, decl_module, decl_event, decl_storage};
use primitives::traits::{One, SimpleArithmetic, StaticLookup, Member};
use sr_primitives::traits::{One, SimpleArithmetic, StaticLookup, Member};
use system::{IsDeadAccount, OnNewAccount};
use self::address::Address as RawAddress;
+4 -4
View File
@@ -20,9 +20,9 @@
use std::collections::HashSet;
use ref_thread_local::{ref_thread_local, RefThreadLocal};
use primitives::testing::Header;
use primitives::Perbill;
use substrate_primitives::{H256, Blake2Hasher};
use sr_primitives::testing::Header;
use sr_primitives::Perbill;
use primitives::{H256, Blake2Hasher};
use srml_support::{impl_outer_origin, parameter_types};
use {runtime_io, system};
use crate::{GenesisConfig, Module, Trait, IsDeadAccount, OnNewAccount, ResolveHint};
@@ -76,7 +76,7 @@ impl system::Trait for Runtime {
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 = Indices;
type Header = Header;