pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-15 11:31:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor sr_primitives. (#3214)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
substrate/srml/balances/Cargo.toml
+3 -3
View File
@@ -10,13 +10,13 @@ safe-mix = { version = "1.0", default-features = false}
parity-codec = { version = "4.1.1", default-features = false, features = ["derive"] }
substrate-keyring = { path = "../../core/keyring", optional = true }
rstd = { package = "sr-std", path = "../../core/sr-std", 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]
runtime_io = { package = "sr-io", path = "../../core/sr-io", default-features = false }
substrate-primitives = { path = "../../core/primitives" }
primitives = { package = "substrate-primitives", path = "../../core/primitives" }
[features]
default = ["std"]
@@ -27,6 +27,6 @@ std = [
"parity-codec/std",
"rstd/std",
"srml-support/std",
"primitives/std",
"sr-primitives/std",
"system/std",
]
substrate/srml/balances/src/lib.rs
+5 -5
View File
@@ -112,7 +112,7 @@
//!
//! ```
//! use srml_support::traits::{WithdrawReasons, LockableCurrency};
//! use primitives::traits::Bounded;
//! use sr_primitives::traits::Bounded;
//! pub trait Trait: system::Trait {
//! type Currency: LockableCurrency<Self::AccountId, Moment=Self::BlockNumber>;
//! }
@@ -159,12 +159,12 @@ use srml_support::traits::{
Imbalance, SignedImbalance, ReservableCurrency, Get,
};
use srml_support::dispatch::Result;
use primitives::traits::{
use sr_primitives::traits::{
Zero, SimpleArithmetic, StaticLookup, Member, CheckedAdd, CheckedSub, MaybeSerializeDebug,
Saturating, Bounded, SignedExtension, SaturatedConversion, DispatchError, Convert,
};
use primitives::transaction_validity::{TransactionPriority, ValidTransaction};
use primitives::weights::{DispatchInfo, SimpleDispatchInfo, Weight};
use sr_primitives::transaction_validity::{TransactionPriority, ValidTransaction};
use sr_primitives::weights::{DispatchInfo, SimpleDispatchInfo, Weight};
use system::{IsDeadAccount, OnNewAccount, ensure_signed, ensure_root};
mod mock;
@@ -344,7 +344,7 @@ decl_storage! {
// Total genesis `balance` minus `liquid` equals funds locked for vesting
let locked = balance.saturating_sub(liquid);
// Number of units unlocked per block after `begin`
let per_block = locked / length.max(primitives::traits::One::one());
let per_block = locked / length.max(sr_primitives::traits::One::one());
(who.clone(), VestingSchedule {
locked: locked,
substrate/srml/balances/src/mock.rs
+3 -3
View File
@@ -18,8 +18,8 @@
#![cfg(test)]
use primitives::{Perbill, traits::{Convert, IdentityLookup}, testing::Header, weights::{DispatchInfo, Weight}};
use substrate_primitives::{H256, Blake2Hasher};
use sr_primitives::{Perbill, traits::{Convert, IdentityLookup}, testing::Header, weights::{DispatchInfo, Weight}};
use primitives::{H256, Blake2Hasher};
use runtime_io;
use srml_support::{impl_outer_origin, parameter_types};
use srml_support::traits::Get;
@@ -86,7 +86,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 = IdentityLookup<Self::AccountId>;
type Header = Header;
substrate/srml/balances/src/tests.rs
+1 -1
View File
@@ -774,7 +774,7 @@ fn signed_extension_take_fees_is_bounded() {
.monied(true)
.build(),
|| {
use primitives::weights::Weight;
use sr_primitives::weights::Weight;
// maximum weight possible
assert!(TakeFees::<Runtime>::from(0).pre_dispatch(&1, info_from_weight(Weight::max_value()), 10).is_ok());