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
@@ -10,12 +10,12 @@ safe-mix = { version = "1.0", default-features = false}
parity-codec = { version = "4.1.1", default-features = false, features = ["derive"] }
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 }
[dev-dependencies]
substrate-primitives = { path = "../../core/primitives" }
primitives = { package = "substrate-primitives", path = "../../core/primitives" }
balances = { package = "srml-balances", path = "../balances" }
[features]
@@ -27,6 +27,6 @@ std = [
"rstd/std",
"runtime_io/std",
"srml-support/std",
"primitives/std",
"sr-primitives/std",
"system/std",
]
+5 -5
View File
@@ -20,8 +20,8 @@
use rstd::prelude::*;
use rstd::{result, convert::TryFrom};
use primitives::traits::{Zero, Bounded, CheckedMul, CheckedDiv, EnsureOrigin, Hash};
use primitives::weights::SimpleDispatchInfo;
use sr_primitives::traits::{Zero, Bounded, CheckedMul, CheckedDiv, EnsureOrigin, Hash};
use sr_primitives::weights::SimpleDispatchInfo;
use parity_codec::{Encode, Decode, Input, Output};
use srml_support::{
decl_module, decl_storage, decl_event, ensure,
@@ -990,9 +990,9 @@ mod tests {
impl_outer_origin, impl_outer_dispatch, assert_noop, assert_ok, parameter_types,
traits::Contains
};
use substrate_primitives::{H256, Blake2Hasher};
use primitives::{traits::{BlakeTwo256, IdentityLookup, Bounded}, testing::Header};
use primitives::Perbill;
use primitives::{H256, Blake2Hasher};
use sr_primitives::{traits::{BlakeTwo256, IdentityLookup, Bounded}, testing::Header};
use sr_primitives::Perbill;
use balances::BalanceLock;
use system::EnsureSignedBy;
@@ -19,7 +19,7 @@
#[cfg(feature = "std")]
use serde::{Serialize, Deserialize};
use parity_codec::{Encode, Decode};
use primitives::traits::{Zero, IntegerSquareRoot};
use sr_primitives::traits::{Zero, IntegerSquareRoot};
use rstd::ops::{Add, Mul, Div, Rem};
/// A means of determining if a vote is past pass threshold.