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
@@ -8,10 +8,10 @@ edition = "2018"
serde = { version = "1.0", optional = true }
safe-mix = { version = "1.0", default-features = false}
parity-codec = { version = "4.1.1", default-features = false, features = ["derive"] }
substrate-primitives = { path = "../../core/primitives", default-features = false }
primitives = { package = "substrate-primitives", path = "../../core/primitives", default-features = false }
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 }
srml-support = { path = "../support", default-features = false }
system = { package = "srml-system", path = "../system", default-features = false }
@@ -24,11 +24,11 @@ default = ["std"]
std = [
"safe-mix/std",
"parity-codec/std",
"substrate-primitives/std",
"primitives/std",
"rstd/std",
"serde",
"runtime_io/std",
"srml-support/std",
"primitives/std",
"sr-primitives/std",
"system/std",
]
+6 -6
View File
@@ -24,8 +24,8 @@
#![recursion_limit="128"]
use rstd::prelude::*;
use primitives::traits::{Zero, One, StaticLookup, Bounded, Saturating};
use primitives::weights::SimpleDispatchInfo;
use sr_primitives::traits::{Zero, One, StaticLookup, Bounded, Saturating};
use sr_primitives::weights::SimpleDispatchInfo;
use runtime_io::print;
use srml_support::{
StorageValue, StorageMap,
@@ -1116,8 +1116,8 @@ mod tests {
use std::cell::RefCell;
use srml_support::{assert_ok, assert_err, assert_noop, parameter_types};
use runtime_io::with_externalities;
use substrate_primitives::{H256, Blake2Hasher};
use primitives::{
use primitives::{H256, Blake2Hasher};
use sr_primitives::{
Perbill, traits::{BlakeTwo256, IdentityLookup, Block as BlockT}, testing::Header, BuildStorage
};
use crate as elections;
@@ -1234,8 +1234,8 @@ mod tests {
type DecayRatio = DecayRatio;
}
pub type Block = primitives::generic::Block<Header, UncheckedExtrinsic>;
pub type UncheckedExtrinsic = primitives::generic::UncheckedExtrinsic<u32, u64, Call, ()>;
pub type Block = sr_primitives::generic::Block<Header, UncheckedExtrinsic>;
pub type UncheckedExtrinsic = sr_primitives::generic::UncheckedExtrinsic<u32, u64, Call, ()>;
srml_support::construct_runtime!(
pub enum Test where