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
@@ -8,14 +8,14 @@ edition = "2018"
serde = { version = "1.0", optional = true, features = ["derive"] }
parity-codec = { version = "4.1.1", default-features = false, features = ["derive"] }
rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }
runtime_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 }
balances = { package = "srml-balances", path = "../balances", default-features = false }
[dev-dependencies]
runtime_io = { package = "sr-io", path = "../../core/sr-io" }
substrate-primitives = { path = "../../core/primitives" }
primitives = { package = "substrate-primitives", path = "../../core/primitives" }
[features]
default = ["std"]
@@ -23,7 +23,7 @@ std = [
"serde",
"parity-codec/std",
"rstd/std",
"runtime_primitives/std",
"sr-primitives/std",
"srml-support/std",
"system/std",
"balances/std",
+5 -5
View File
@@ -75,11 +75,11 @@ use srml_support::traits::{
Currency, ExistenceRequirement, Get, Imbalance, OnDilution, OnUnbalanced,
ReservableCurrency, WithdrawReason
};
use runtime_primitives::{Permill, ModuleId};
use runtime_primitives::traits::{
use sr_primitives::{Permill, ModuleId};
use sr_primitives::traits::{
Zero, EnsureOrigin, StaticLookup, CheckedSub, CheckedMul, AccountIdConversion
};
use runtime_primitives::weights::SimpleDispatchInfo;
use sr_primitives::weights::SimpleDispatchInfo;
use parity_codec::{Encode, Decode};
use system::ensure_signed;
@@ -363,8 +363,8 @@ mod tests {
use runtime_io::with_externalities;
use srml_support::{assert_noop, assert_ok, impl_outer_origin, parameter_types};
use substrate_primitives::{H256, Blake2Hasher};
use runtime_primitives::{Perbill, traits::{BlakeTwo256, OnFinalize, IdentityLookup}, testing::Header};
use primitives::{H256, Blake2Hasher};
use sr_primitives::{Perbill, traits::{BlakeTwo256, OnFinalize, IdentityLookup}, testing::Header};
impl_outer_origin! {
pub enum Origin for Test {}